* configure.ac (ALL_LINGUAS): Removed.

* Makefile.am (LDADD): Replaced INTLLIBS by LIBINTL. * Makefile.am (gpgkeys_hkp_LDADD): Replaced INTLLIBS by LIBINTL. * ca.po: Updated. * autogen.sh: Run aclocal with -I m4. * Makefile.am: Replaced INTLLIBS by LIBINTL. * Makefile.am (http-test): Replaced INTLLIBS by LIBINTL.
author: Werner Koch <[email protected]> 2004-08-09 19:47:08 +0000
committer: Werner Koch <[email protected]> 2004-08-09 19:47:08 +0000
commit: c6b88a12dddbca674133560b86928c997c87a188 (patch)
tree: 9cc3a817679939fc4b6d9a8cf566aed71ace2795
parent: * gpg.sgml: Note that --throw-keyid is --throw-keyids. (diff)
download: gnupg-c6b88a12dddbca674133560b86928c997c87a188.tar.gz
gnupg-c6b88a12dddbca674133560b86928c997c87a188.zip
42 files changed, 3541 insertions, 4853 deletions
diff --git a/ChangeLog b/ChangeLog
index 09ad844cc..db15c67a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* configure.ac (ALL_LINGUAS): Removed.
+
+2004-08-09  gettextize  <[email protected]>
+
+	* Makefile.am (SUBDIRS): Add m4.
+	(ACLOCAL_AMFLAGS): New variable.
+	* configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
+
 2004-08-03  David Shaw  <[email protected]>
 
 	* configure.ac: Give warning when using capabilities.
diff --git a/Makefile.am b/Makefile.am
index e562877b6..6d4493ddd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ else
 checks = checks
 endif
 
-SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
+SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
 EXTRA_DIST = PROJECTS BUGS config.h.in autogen.sh
 DISTCLEANFILES = g10defs.h 
 
@@ -53,3 +53,5 @@ dist-hook:
 
 
 
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index e1227ab26..9d1d88803 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,6 @@ AC_INIT(gnupg, 1.2.6-cvs, [email protected])
 # sufficient.
 development_version=no
 
-ALL_LINGUAS="be ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro ru sk sv tr zh_TW zh_CN"
-
 AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(g10/g10.c)
 AC_CANONICAL_TARGET()
@@ -1018,6 +1016,7 @@ DATADIRNAME=$DATADIRNAME
 
 AC_CONFIG_FILES([
 Makefile
+m4/Makefile 
 intl/Makefile
 po/Makefile.in
 util/Makefile
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 1827e8c36..2f1204475 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* Makefile.am (LDADD): Replaced INTLLIBS by LIBINTL.
+
+2004-08-02  Werner Koch  <[email protected]>
+
+	* g10.c (main): Extra paranoid check to make sure we are not
+	running setuid anymore.
+
 2004-07-30  Werner Koch  <[email protected]>
 
 	* g10.c: New alias --throw-keyid for --throw-keyids, so that it
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 6bfbea3f6..0bbe2768c 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -114,7 +114,7 @@ gpgv_SOURCES = gpgv.c           \
 #	       ks-db.h \
 #	       $(common_source)
 
-LDADD =  $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@
+LDADD =  $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@
 # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it
 gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@
 
diff --git a/g10/g10.c b/g10/g10.c
index 277a1fb4b..6960eaa98 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1426,6 +1426,13 @@ main( int argc, char **argv )
     maybe_setuid = 0;
     /* Okay, we are now working under our real uid */
 
+#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
+    /* There should be no way to get to this spot while still carrying
+       setuid privs.  Just in case, bomb out if we are. */
+    if(getuid()!=geteuid())
+      BUG();
+#endif
+
     set_native_charset (NULL); /* Try to auto set the character set */
 
     if( default_config )
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 4355c253b..e8bb0264f 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* Makefile.am (gpgkeys_hkp_LDADD): Replaced INTLLIBS by LIBINTL.
+
 2004-07-20  Werner Koch  <[email protected]>
 
 	* gpgkeys_ldap.c [_WIN32]: Include Windows specific header files.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 83243fefa..d98385603 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -28,4 +28,4 @@ libexec_SCRIPTS = @GPGKEYS_MAILTO@
 noinst_SCRIPTS = gpgkeys_test
 
 gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@
-gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@
+gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
diff --git a/po/ChangeLog b/po/ChangeLog
index 3d785fcac..03486d3b0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,22 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* ca.po: Updated.
+
+	* LINGUAS: New.
+
+	* Makevars: New.
+
+2004-08-09  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.1.
+	* Rules-quot: New file, from gettext-0.14.1.
+	* boldquot.sed: New file, from gettext-0.14.1.
+	* [email protected]: New file, from gettext-0.14.1.
+	* [email protected]: New file, from gettext-0.14.1.
+	* insert-header.sin: New file, from gettext-0.14.1.
+	* quot.sed: New file, from gettext-0.14.1.
+	* remove-potcdate.sin: New file, from gettext-0.14.1.
+
 2004-07-20  Werner Koch  <[email protected]>
 
 	* fr.po, cs.po, et.po, el.po, id.po, pl.po, ro.po, sk.po, tr.po
diff --git a/po/be.po b/po/be.po
index 6eda7fa5b..59360ee64 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -32,7 +32,6 @@ msgstr "дзеяньне немагчымае без распачатае бяс
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 #, fuzzy
 msgid "yes"
@@ -42,7 +41,6 @@ msgstr "yes [так]"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no [не]"
@@ -51,7 +49,6 @@ msgstr "no [не]"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit [выйсьці]"
@@ -256,7 +253,6 @@ msgstr ""
 msgid "not processed"
 msgstr ""
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr ""
@@ -723,19 +719,19 @@ msgstr ""
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -743,7 +739,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -763,15 +759,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -781,7 +777,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -789,386 +785,386 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr ""
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr ""
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:2623 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 "немагчыма адкрыць %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:2937 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 "немагчыма адкрыць \"%s\"\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
@@ -1293,7 +1289,6 @@ msgstr ""
 msgid "revocation comment: "
 msgstr ""
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr ""
@@ -1342,7 +1337,6 @@ msgstr ""
 msgid " %d = I trust ultimately\n"
 msgstr ""
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr ""
@@ -1640,14 +1634,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1716,7 +1702,6 @@ msgstr ""
 msgid "%s does not expire at all\n"
 msgstr ""
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2008,7 +1993,6 @@ msgstr ""
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2022,8 +2006,6 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr ""
@@ -2252,7 +2234,6 @@ msgstr ""
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2479,8 +2460,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2808,7 +2787,6 @@ msgstr ""
 msgid "delete user ID"
 msgstr ""
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr ""
@@ -3107,8 +3085,6 @@ msgstr ""
 msgid " (sensitive)"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3226,9 +3202,6 @@ msgstr ""
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3316,7 +3289,6 @@ msgstr ""
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr ""
@@ -3357,10 +3329,6 @@ msgstr ""
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3424,7 +3392,6 @@ msgstr ""
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr ""
@@ -3434,8 +3401,6 @@ msgstr ""
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3547,7 +3512,6 @@ msgstr "Палітыка:"
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr ""
@@ -3557,10 +3521,6 @@ msgstr ""
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4303,9 +4263,6 @@ msgstr ""
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4348,7 +4305,6 @@ msgid ""
 "signatures!\n"
 msgstr ""
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4810,7 +4766,6 @@ msgstr ""
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -4888,7 +4843,6 @@ msgstr ""
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr ""
@@ -4922,7 +4876,6 @@ msgstr "невядомы альгарытм сьцісканьня"
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -4995,7 +4948,6 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid "error: no ownertrust value\n"
 msgstr ""
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/ca.po b/po/ca.po
index 32fe56903..5e02f790a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,69 +1,68 @@
-# Missatges de gnupg en catal�.
-# Copyright � 2001, 2002, 2003 Free Software Foundation, Inc.
-# Carles Sadurn� Anguita <[email protected]>, 2001.
-# Jordi Mallach <[email protected]>, 2001, 2002, 2003.
+# Missatges de gnupg en català.
+# Copyright © 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Carles Sadurní Anguita <[email protected]>, 2001.
+# Jordi Mallach <[email protected]>, 2001, 2002, 2003, 2004.
 #
 # Coses (jm):
-# ID d'usuari �s mascul�? Hi ha una mescla...
-# (ivb:  ID == identificador -> mascul�)
+# ID d'usuari és masculí? Hi ha una mescla...
+# (ivb:  ID == identificador -> masculí)
 # Canviar ID -> ID d'usuari
 # Xifratge vs. Xifrat
-# (ivb:  xifratge -> acci�, xifrat -> adjectiu)
+# (ivb:  xifratge -> acció, xifrat -> adjectiu)
 # + coses (ivb):
-#   - Algunes frases incompletes �x desconegut� -> �x �s desconegut�.
-#   - �algoritme� o �algorisme�?  (ambd�s s�n correctes)
+#   - Algunes frases incompletes «x desconegut» -> «x és desconegut».
+#   - «algoritme» o «algorisme»?  (ambdós són correctes)
 #   - digest -> resum
-#   - �anell� o �clauer�?  (key ring -> clauer)
+#   - «anell» o «clauer»?  (key ring -> clauer)
 #   - bug -> error?  (del recull)
-#   - Crec q uses m�s �signatura� q �firma�; unifique.
-#   - Usar maj�scules x ressaltar (com original)?
+#   - Crec q uses més «signatura» q «firma»; unifique.
+#   - Usar majúscules x ressaltar (com original)?
 #   - Hi ha cert desordre en les cometes ;)
-#   - Frases �ndies completades.
-#   - Algunes incoher�ncies: error {en la lectura,en llegir,mentre es llegia}
+#   - Frases índies completades.
+#   - Algunes incoherències: error {en la lectura,en llegir,mentre es llegia}
 #   - Probablement he clavat la pota en tots els Photo ID :P
-#   - Nom�s es maneja amb les mans.
-#   - sapigueu -> sapieu? (x coher�ncia)
+#   - Només es maneja amb les mans.
+#   - sapigueu -> sapieu? (x coherència)
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.4rc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Project-Id-Version: gnupg 1.2.5\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-05 19:15+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
 msgid "WARNING: using insecure memory!\n"
-msgstr "AV�S: esteu usant mem�ria insegura!\n"
+msgstr "AVÍS: esteu usant memòria insegura!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
-"si us plau, visiteu http://www.gnupg.org/faq.html per a m�s informaci�\n"
+"si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
 
-# �ltimament pense si �iniciar� no ser� millor que �inicialitzar�?  ivb
-# Segons SC, hi ha difer�ncia. jm
+# Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
+# Segons SC, hi ha diferència. jm
 #: util/secmem.c:338
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n"
+msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
 
 #: util/secmem.c:339
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "s�|si"
+msgstr "sí|si"
 
 #: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
@@ -72,12 +71,11 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "ix"
 
-# �xX�?  ivb
+# «xX»?  ivb
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "xX"
@@ -88,47 +86,47 @@ msgstr "error general"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "el tipus de paquet �s desconegut"
+msgstr "el tipus de paquet és desconegut"
 
 #: util/errors.c:56
 msgid "unknown version"
-msgstr "la versi� �s desconeguda"
+msgstr "la versió és desconeguda"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "l'algoritme de clau p�blica �s desconegut"
+msgstr "l'algoritme de clau pública és desconegut"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "l'algoritme de resum �s desconegut"
+msgstr "l'algoritme de resum és desconegut"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "la clau p�blica �s err�nia"
+msgstr "la clau pública és errònia"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "la clau secreta �s err�nia"
+msgstr "la clau secreta és errònia"
 
 #: util/errors.c:61
 msgid "bad signature"
-msgstr "la signatura �s err�nia"
+msgstr "la signatura és errònia"
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "la suma de control �s err�nia"
+msgstr "la suma de control és errònia"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "la contrasenya �s err�nia"
+msgstr "la contrasenya és errònia"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "no s'ha trobat la clau p�blica"
+msgstr "no s'ha trobat la clau pública"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "l'algoritme de xifratge �s desconegut"
+msgstr "l'algoritme de xifratge és desconegut"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
@@ -136,11 +134,11 @@ msgstr "no s'ha pogut obrir l'anell"
 
 #: util/errors.c:67
 msgid "invalid packet"
-msgstr "el paquet �s inv�lid"
+msgstr "el paquet és invàlid"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "l'armadura �s inv�lida"
+msgstr "l'armadura és invàlida"
 
 #: util/errors.c:69
 msgid "no such user id"
@@ -148,22 +146,22 @@ msgstr "no s'ha trobat l'id de l'usuari"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "la clau secreta no est� disponible"
+msgstr "la clau secreta no està disponible"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
 msgstr "s'ha utilitzat una clau secreta incorrecta"
 
-# G�nere?  Nombre?  ivb
+# Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #: util/errors.c:72
 msgid "not supported"
-msgstr "no �s suportat"
+msgstr "no és suportat"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "la clau �s incorrecta"
+msgstr "la clau és incorrecta"
 
 #: util/errors.c:74
 msgid "file read error"
@@ -175,7 +173,7 @@ msgstr "error d'escriptura"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "l'algoritme de compressi� �s desconegut"
+msgstr "l'algoritme de compressió és desconegut"
 
 #: util/errors.c:77
 msgid "file open error"
@@ -183,47 +181,47 @@ msgstr "error en l'obertura del fitxer"
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "error en la creaci� del fitxer"
+msgstr "error en la creació del fitxer"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "la contrasenya �s inv�lida"
+msgstr "la contrasenya és invàlida"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "l'algoritme de clau p�blica no �s implementat"
+msgstr "l'algoritme de clau pública no és implementat"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "l'algoritme de xifratge no �s implementat"
+msgstr "l'algoritme de xifratge no és implementat"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "la classe de signatura �s desconeguda"
+msgstr "la classe de signatura és desconeguda"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "error de la base de dades de confian�a"
+msgstr "error de la base de dades de confiança"
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "l'MPI �s erroni"
+msgstr "l'MPI és erroni"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "l�mit de recursos"
+msgstr "límit de recursos"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "l'anell no �s v�lid"
+msgstr "l'anell no és vàlid"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "el certificat �s incorrecte"
+msgstr "el certificat és incorrecte"
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "l'id d'usuari �s malformat"
+msgstr "l'id d'usuari és malformat"
 
 #: util/errors.c:89
 msgid "file close error"
@@ -235,7 +233,7 @@ msgstr "error en el reanomenament del fitxer"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "error en l'eliminaci� del fitxer"
+msgstr "error en l'eliminació del fitxer"
 
 #: util/errors.c:92
 msgid "unexpected data"
@@ -245,63 +243,62 @@ msgstr "dades inesperades"
 msgid "timestamp conflict"
 msgstr "conflicte de data"
 
-# Ac� veus pq jo pose �no �s v�lid� en comptes de ��s inv�lid�.  ivb
+# Ací veus pq jo pose «no és vàlid» en comptes de «és invàlid».  ivb
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "l'algoritme de clau p�blica �s inusable"
+msgstr "l'algoritme de clau pública és inusable"
 
 #: util/errors.c:95
 msgid "file exists"
 msgstr "el fitxer existeix"
 
-# Segons context: la clau �s feble?  ivb
+# Segons context: la clau és feble?  ivb
 #: util/errors.c:96
 msgid "weak key"
 msgstr "clau feble"
 
 #: util/errors.c:97
 msgid "invalid argument"
-msgstr "l'argument �s inv�lid"
+msgstr "l'argument és invàlid"
 
-# La �U� �s masculina o femenina?  ivb
+# La «U» és masculina o femenina?  ivb
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "l'URI �s err�nia"
+msgstr "l'URI és errònia"
 
-# �dem.  ivb
+# Ídem.  ivb
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "l'URI no �s suportada"
+msgstr "l'URI no és suportada"
 
 #: util/errors.c:100
 msgid "network error"
 msgstr "error de la xarxa"
 
-# G�nere?  Nombre?  ivb
+# Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "no �s xifrat"
+msgstr "no és xifrat"
 
-# G�nere?  Nombre?  Passat, futur?  ivb
-# Probablement �s una clau, femen�. jm
+# Gènere?  Nombre?  Passat, futur?  ivb
+# Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #: util/errors.c:103
 msgid "not processed"
 msgstr "no processat"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "ls clau p�blica �s inusable"
+msgstr "ls clau pública és inusable"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "la clau secreta �s inusable"
+msgstr "la clau secreta és inusable"
 
-# �del servidor�, �en el servidor�?  ivb
+# «del servidor», «en el servidor»?  ivb
 #: util/errors.c:107
 msgid "keyserver error"
 msgstr "error de servidor de claus"
@@ -309,7 +306,7 @@ msgstr "error de servidor de claus"
 #: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... a�� �s un bug (%s:%d:%s)\n"
+msgstr "... açò és un bug (%s:%d:%s)\n"
 
 #: util/logger.c:255
 #, c-format
@@ -318,37 +315,36 @@ msgstr "heu trobat un bug... (%s:%d)\n"
 
 #: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
+msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
 
 #: cipher/random.c:387 g10/keygen.c:1931 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "no s'ha pogut obrir �%s�: %s\n"
+msgstr "no s'ha pogut obrir «%s»: %s\n"
 
 #: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "no es pot fer stat de �%s�: %s\n"
+msgstr "no es pot fer stat de «%s»: %s\n"
 
-# Descartar, deixar passar...  ignorar �s un anglicisme.  ivb
+# Descartar, deixar passar...  ignorar és un anglicisme.  ivb
 #: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "�%s� no �s un fitxer regular: es descarta\n"
+msgstr "«%s» no és un fitxer regular: es descarta\n"
 
 #: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "nota: el fitxer random_seed �s buit\n"
+msgstr "nota: el fitxer random_seed és buit\n"
 
 #: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr ""
-"AV�S: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n"
+msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
 #: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "no s'ha pogut llegir �%s�: %s\n"
+msgstr "no s'ha pogut llegir «%s»: %s\n"
 
 #: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
@@ -357,22 +353,22 @@ msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 #: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "no s'ha pogut crear �%s�: %s\n"
+msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "no s'ha pogut escriure �%s�: %s\n"
+msgstr "no s'ha pogut escriure «%s»: %s\n"
 
 # No em passe! ;)  ivb
 #: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "no s'ha pogut tancar �%s�: %s\n"
+msgstr "no s'ha pogut tancar «%s»: %s\n"
 
 #: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "AV�S: esteu usant un generador de nombres aleatoris insegur!!\n"
+msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
 
 #: cipher/random.c:729
 msgid ""
@@ -382,8 +378,8 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"El generador de nombres aleatoris �s nom�s un peda�\n"
-"per a que funcioni - de cap manera �s un GNA fort!\n"
+"El generador de nombres aleatoris és només un pedaç\n"
+"per a que funcioni - de cap manera és un GNA fort!\n"
 "\n"
 "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
 "\n"
@@ -397,21 +393,18 @@ msgid ""
 msgstr ""
 "\n"
 "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n"
-"sistema tinga oportunitat de recollir m�s entropia. (Calen %d bytes "
-"m�s)\n"
+"sistema tinga oportunitat de recollir més entropia. (Calen %d bytes més)\n"
 
 #: cipher/md.c:140
 #, c-format
 msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-"l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n"
+msgstr "l'algorisme de resum «%s» es de només lectura en aquesta versió\n"
 
 #: cipher/md.c:147
 #, c-format
 msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 msgstr ""
-"AV�S: el resum �%s� no �s part d'OpenPGP. Utilitzeu-lo assumint el "
-"risc!\n"
+"AVÍS: el resum «%s» no és part d'OpenPGP. Utilitzeu-lo assumint el risc!\n"
 
 #: cipher/rndegd.c:204
 msgid ""
@@ -420,7 +413,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n"
-"vos ajuda no avorrir-vos, ja que ajudar� a la qualitat de la entropia.\n"
+"vos ajuda no avorrir-vos, ja que ajudarà a la qualitat de la entropia.\n"
 
 #: cipher/primegen.c:310
 #, c-format
@@ -457,11 +450,11 @@ msgstr "|[fitxers]|xifra fitxers"
 
 #: g10/g10.c:330
 msgid "encryption only with symmetric cipher"
-msgstr "xifra nom�s amb xifratge sim�tric"
+msgstr "xifra només amb xifratge simètric"
 
 #: g10/g10.c:331
 msgid "store only"
-msgstr "nom�s emmagatzema"
+msgstr "només emmagatzema"
 
 #: g10/g10.c:332
 msgid "decrypt data (default)"
@@ -483,12 +476,12 @@ msgstr "llista claus"
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
-# �de les claus� o �de la clau�?  ivb
+# «de les claus» o «de la clau»?  ivb
 #: g10/g10.c:339
 msgid "check key signatures"
 msgstr "comprova les signatures de la claus"
 
-# �dactilars� o �digitals�?  ivb
+# «dactilars» o «digitals»?  ivb
 #: g10/g10.c:340
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
@@ -503,7 +496,7 @@ msgstr "genera un nou parell de claus"
 
 #: g10/g10.c:343
 msgid "remove keys from the public keyring"
-msgstr "elimina claus de l'anell p�blic"
+msgstr "elimina claus de l'anell públic"
 
 #: g10/g10.c:345
 msgid "remove keys from the secret keyring"
@@ -521,7 +514,7 @@ msgstr "signa una clau localment"
 msgid "sign a key non-revocably"
 msgstr "signa una clau irrevocablement"
 
-# D'altres formes o no queda clar o �s massa literari :P  ivb
+# D'altres formes o no queda clar o és massa literari :P  ivb
 #: g10/g10.c:349
 msgid "sign a key locally and non-revocably"
 msgstr "signa una clau de forma local i irrevocable"
@@ -532,7 +525,7 @@ msgstr "signa o edita una clau"
 
 #: g10/g10.c:351
 msgid "generate a revocation certificate"
-msgstr "genera un certificat de revocaci�"
+msgstr "genera un certificat de revocació"
 
 #: g10/g10.c:353
 msgid "export keys"
@@ -560,27 +553,27 @@ msgstr "importa/fon claus"
 
 #: g10/g10.c:367
 msgid "list only the sequence of packets"
-msgstr "llista nom�s la seq��ncia de paquets"
+msgstr "llista només la seqüència de paquets"
 
 #: g10/g10.c:369
 msgid "export the ownertrust values"
-msgstr "exporta els valors de confian�a"
+msgstr "exporta els valors de confiança"
 
 #: g10/g10.c:371
 msgid "import ownertrust values"
-msgstr "importa els valors de confian�a"
+msgstr "importa els valors de confiança"
 
 #: g10/g10.c:373
 msgid "update the trust database"
-msgstr "actualitza la base de dades de confian�a"
+msgstr "actualitza la base de dades de confiança"
 
 #: g10/g10.c:375
 msgid "unattended trust database update"
-msgstr "actualitzaci� no atesa de la base de dades de confian�a"
+msgstr "actualització no atesa de la base de dades de confiança"
 
 #: g10/g10.c:376
 msgid "fix a corrupted trust database"
-msgstr "arregla una base de dades de confian�a corrompuda"
+msgstr "arregla una base de dades de confiança corrompuda"
 
 #: g10/g10.c:377
 msgid "De-Armor a file or stdin"
@@ -626,24 +619,24 @@ msgstr "usa aquest id per a signar o desxifrar"
 
 #: g10/g10.c:401
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|nivell de compressi� N (0 no comprimeix)"
+msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
 #: g10/g10.c:404
 msgid "use canonical text mode"
-msgstr "usa el mode de text can�nic"
+msgstr "usa el mode de text canònic"
 
 #: g10/g10.c:414
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-# Un dels dos �s en la llista d'opcions amb --help. Urgh. jm
+# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
 #: g10/g10.c:416 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detall"
 
 #: g10/g10.c:417 g10/gpgv.c:67
 msgid "be somewhat more quiet"
-msgstr "una mica m�s silenci�s"
+msgstr "una mica més silenciós"
 
 #: g10/g10.c:418
 msgid "don't use the terminal at all"
@@ -651,19 +644,19 @@ msgstr "no usa el terminal en absolut"
 
 #: g10/g10.c:419
 msgid "force v3 signatures"
-msgstr "for�a signatures v3"
+msgstr "força signatures v3"
 
 #: g10/g10.c:420
 msgid "do not force v3 signatures"
-msgstr "no for�a signatures v3"
+msgstr "no força signatures v3"
 
 #: g10/g10.c:421
 msgid "force v4 key signatures"
-msgstr "for�a signatures de clau v4"
+msgstr "força signatures de clau v4"
 
 #: g10/g10.c:422
 msgid "do not force v4 key signatures"
-msgstr "no for�a signatures de clau v4"
+msgstr "no força signatures de clau v4"
 
 #: g10/g10.c:423
 msgid "always use a MDC for encryption"
@@ -685,18 +678,18 @@ msgstr "pregunta abans de sobreescriure"
 msgid "use the gpg-agent"
 msgstr "utilitza el gpg-agent"
 
-# Mode desat�s (SC)  ivb
+# Mode desatès (SC)  ivb
 #: g10/g10.c:432
 msgid "batch mode: never ask"
-msgstr "mode desat�s: no pregunta mai"
+msgstr "mode desatès: no pregunta mai"
 
 #: g10/g10.c:433
 msgid "assume yes on most questions"
-msgstr "suposa �s�� en la majoria de les preguntes"
+msgstr "suposa «sí» en la majoria de les preguntes"
 
 #: g10/g10.c:434
 msgid "assume no on most questions"
-msgstr "suposa �no� en la majoria de les preguntes"
+msgstr "suposa «no» en la majoria de les preguntes"
 
 #: g10/g10.c:435
 msgid "add this keyring to the list of keyrings"
@@ -708,7 +701,7 @@ msgstr "afegeix aquest anell secret a la llista"
 
 #: g10/g10.c:437
 msgid "show which keyring a listed key is on"
-msgstr "mostra en quin anell de claus est� una clau llistada"
+msgstr "mostra en quin anell de claus està una clau llistada"
 
 #: g10/g10.c:438
 msgid "|NAME|use NAME as default secret key"
@@ -720,7 +713,7 @@ msgstr "|HOST|usa aquest servidor per a cercar claus"
 
 #: g10/g10.c:443
 msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOM|el joc de car�cters ser� NOM"
+msgstr "|NOM|el joc de caràcters serà NOM"
 
 #: g10/g10.c:445
 msgid "read options from file"
@@ -728,11 +721,11 @@ msgstr "llig opcions del fitxer"
 
 #: g10/g10.c:449 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
-msgstr "|FD|escriu informaci� d'estat en aquest FD"
+msgstr "|FD|escriu informació d'estat en aquest FD"
 
 #: g10/g10.c:451
 msgid "|[file]|write status info to file"
-msgstr "|fitxer|escriu informaci� d'estat en un fitxer"
+msgstr "|fitxer|escriu informació d'estat en un fitxer"
 
 #: g10/g10.c:463
 msgid "|KEYID|ultimately trust this key"
@@ -740,7 +733,7 @@ msgstr "|IDCLAU|confia absolutament en aquesta clau"
 
 #: g10/g10.c:464
 msgid "|FILE|load extension module FILE"
-msgstr "|FITXER|carrega el m�dul d'extensi� especificat"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
 #: g10/g10.c:470
 msgid "emulate the mode described in RFC1991"
@@ -780,7 +773,7 @@ msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
 #: g10/g10.c:486
 msgid "|N|use compress algorithm N"
-msgstr "|N|usa l'algoritme de compressi� N"
+msgstr "|N|usa l'algoritme de compressió N"
 
 # elimina o descarta? jm
 #: g10/g10.c:487
@@ -788,32 +781,32 @@ msgid "throw keyid field of encrypted packets"
 msgstr "descarta el camp keyid dels paquets xifrats"
 
 # Werner FIXME: uncapitalize
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "mostra els Photo ID"
 
 # Werner FIXME: uncapitalize
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "no mostra els Photo ID"
 
 # Werner FIXME: uncapitalize
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "fixa l'ordre per a veure Photo ID"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(En la p�gina del man hi ha una llista completa d'ordres i d'opcions)\n"
+"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-# Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman
+# Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
-# En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm
-#: g10/g10.c:500
+# En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -833,15 +826,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -849,14 +842,14 @@ msgid ""
 msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "signa, comprova, xifra o desxifra\n"
-"l'operaci� predeterminada dep�n de les dades introdu�des\n"
+"l'operació predeterminada depén de les dades introduïdes\n"
 
 # Suportats? ivb
-# A Softcatal� diuen molt �implementat?. jm
-# Precissament acabem de parlar d'�implementat a la llista del GNOME
-# i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives
+# A Softcatalà diuen molt «implementat». jm
+# Precissament acabem de parlar d'«implementat a la llista del GNOME
+# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -864,407 +857,398 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
-msgstr "Clau p�blica: "
+msgstr "Clau pública: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
-msgstr "Dispersi�: "
+msgstr "Dispersió: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
-msgstr "Compressi�: "
+msgstr "Compressió: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
-msgstr "forma d'�s: gpg [opcions] "
+msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n"
+msgstr "no s'ha trobat cap signe = en la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
+msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
+msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr ""
-"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
+msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr ""
-"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
+msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1223
-#, fuzzy, c-format
+#: g10/g10.c:1224
+#, c-format
 msgid "unknown configuration item \"%s\"\n"
-msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
+msgstr "l'element de configuració «%s» és desconegut\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n"
+msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
+msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "fitxer d'opcions �%s�: %s\n"
+msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "s'estan llegint opcions de �%s�\n"
+msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
-"la extensi� de xifrat �%s� no s'ha carregat per tindre permissos "
-"insegurs\n"
+"la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
-msgstr "%s no �s un joc de car�cters v�lid\n"
+msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
-msgstr ""
-"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
+msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: opcions d'importanci� no v�lides\n"
+msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
-msgstr "opcions d'importaci� no v�lides\n"
+msgstr "opcions d'importació no vàlides\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d opcions d'exportaci� no v�lides\n"
+msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
-msgstr "opcions d'exportaci� no v�lides\n"
+msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
-msgstr "AV�S: el programa podria crear un fitxer core!\n"
+msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
-# FIXME: prefer�ncia? jm
-# Ho discut�rem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/g10.c:2036
+# FIXME: preferència? jm
+# Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
+msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: %s no �s per a �s normal!\n"
+msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s no �s perm�s amb %s!\n"
+msgstr "%s no és permés amb %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s no t� sentit amb %s!\n"
+msgstr "%s no té sentit amb %s!\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n"
+msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
-msgstr "l'algorisme de xifratge triat no �s v�lid\n"
+msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
-msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
+msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
+msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
-msgstr ""
-"l'algorisme de compressi� �%s� es de nom�s lectura en aquesta "
-"versi�\n"
+msgstr "l'algorisme de compressió «%s» es de només lectura en aquesta versió\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
-msgstr "l'algoritme de compressi� ha d'estar en l'interval %d..%d\n"
+msgstr "l'algoritme de compressió ha d'estar en l'interval %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/g10.c:2201
-#, fuzzy
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
+msgstr "default-cert-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2203
-#, fuzzy
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
+msgstr "min-cert-level és invàlid; ha de ser 1, 2 o 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
+msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n"
+msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
-msgstr "les prefer�ncies per defecte s�n inv�lides\n"
+msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
-msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
+msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
-msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
+msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
-msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
+msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
-msgstr ""
-"no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n"
+msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n"
+msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
-"AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n"
+"AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:2623 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 "no s'ha pogut obrir %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
+msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "l'exportaci� de la clau ha fallat: %s\n"
+msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:2937 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 "no s'ha pogut obrir �%s�\n"
+msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
-"acabar amb el signe �=�\n"
+"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
+"amb el signe «=»\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
-msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
+msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
-msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
+msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
-msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
+msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
-msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
+msgstr "la URL de política de signatura donada no és vàlida\n"
 
 #: g10/gpgv.c:68
 msgid "take the keys from this keyring"
@@ -1272,20 +1256,20 @@ msgstr "pren les claus d'aquest anell"
 
 #: g10/gpgv.c:70
 msgid "make timestamp conflicts only a warning"
-msgstr "fes els conflictes de marques de temps nom�s un av�s"
+msgstr "fes els conflictes de marques de temps només un avís"
 
 #: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "Forma d'�s: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
+msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-# Werner FIXME: should it use �Usage�?
+# Werner FIXME: should it use «Usage»?
 #: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
-"Comprova signatures amb claus conegudes amb confian�a\n"
+"Comprova signatures amb claus conegudes amb confiança\n"
 
 #: g10/armor.c:321
 #, c-format
@@ -1294,25 +1278,25 @@ msgstr "armadura: %s\n"
 
 #: g10/armor.c:350
 msgid "invalid armor header: "
-msgstr "la cap�alera d'armadura �s inv�lida: "
+msgstr "la capçalera d'armadura és invàlida: "
 
 #: g10/armor.c:357
 msgid "armor header: "
-msgstr "cap�alera d'armadura: "
+msgstr "capçalera d'armadura: "
 
 #: g10/armor.c:368
 msgid "invalid clearsig header\n"
-msgstr "la cap�alera de signatura clara �s inv�lida\n"
+msgstr "la capçalera de signatura clara és invàlida\n"
 
-# �s un missatge d'error?  ivb
-# �Anidada� �s un castellanisme.  Niuades?  Imbricades (SC)??  ivb
+# És un missatge d'error?  ivb
+# «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
 #: g10/armor.c:420
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 #: g10/armor.c:544
 msgid "invalid dash escaped line: "
-msgstr "la l�nia escapada amb gui� �s inv�lida: "
+msgstr "la línia escapada amb guió és invàlida: "
 
 # FIXME: un-indiar. jm
 #: g10/armor.c:556
@@ -1322,7 +1306,7 @@ msgstr "armadura inesperada:"
 #: g10/armor.c:682 g10/armor.c:1258
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "el car�cter radix64 %02x inv�lid s'ha om�s\n"
+msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
 #: g10/armor.c:725
 msgid "premature eof (no CRC)\n"
@@ -1343,36 +1327,35 @@ msgstr "error de CRC; %06lx - %06lx\n"
 
 #: g10/armor.c:787
 msgid "premature eof (in Trailer)\n"
-msgstr "f� de fitxer prematur (al final)\n"
+msgstr "fí de fitxer prematur (al final)\n"
 
 #: g10/armor.c:791
 msgid "error in trailer line\n"
-msgstr "error en l'�ltima l�nia\n"
+msgstr "error en l'última línia\n"
 
 #: g10/armor.c:1073
 msgid "no valid OpenPGP data found.\n"
-msgstr "no s'han trobat dades OpenPGP v�lides.\n"
+msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
 #: g10/armor.c:1078
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr ""
-"l'armadura �s inv�lida: la l�nia �s m�s llarga que %d car�cters\n"
+msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
 #: g10/armor.c:1082
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"hi ha un car�cter �quoted printable� en l'armadura - probablement s'ha "
+"hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
 #: g10/pkclist.c:63 g10/revoke.c:603
 msgid "No reason specified"
-msgstr "No s'ha especificat cap ra�"
+msgstr "No s'ha especificat cap raó"
 
 #: g10/pkclist.c:65 g10/revoke.c:605
 msgid "Key is superseded"
-msgstr "La clau ha estat substitu�da"
+msgstr "La clau ha estat substituïda"
 
 #: g10/pkclist.c:67 g10/revoke.c:604
 msgid "Key has been compromised"
@@ -1384,17 +1367,16 @@ msgstr "La clau ja no s'usa"
 
 #: g10/pkclist.c:71 g10/revoke.c:607
 msgid "User ID is no longer valid"
-msgstr "L'ID d'usuari ja no �s v�lid"
+msgstr "L'ID d'usuari ja no és vàlid"
 
 #: g10/pkclist.c:75
 msgid "reason for revocation: "
-msgstr "ra� de la revocaci�: "
+msgstr "raó de la revocació: "
 
 #: g10/pkclist.c:92
 msgid "revocation comment: "
-msgstr "comentari de la revocaci�: "
+msgstr "comentari de la revocació: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMxXoO"
@@ -1405,7 +1387,7 @@ msgid ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"No hi ha cap valor de confian�a assignat a:\n"
+"No hi ha cap valor de confiança assignat a:\n"
 "%4u%c/%08lX %s \""
 
 #: g10/pkclist.c:290 g10/mainproc.c:1503
@@ -1426,7 +1408,7 @@ msgstr ""
 #: g10/pkclist.c:305
 #, c-format
 msgid " %d = Don't know\n"
-msgstr " %d = No ho s�\n"
+msgstr " %d = No ho sé\n"
 
 #: g10/pkclist.c:306
 #, c-format
@@ -1448,14 +1430,13 @@ msgstr " %d = Hi confie plenament\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Hi confie absolutament\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
-msgstr " i = mostra m�s informaci�\n"
+msgstr " i = mostra més informació\n"
 
 #: g10/pkclist.c:316
 msgid " m = back to the main menu\n"
-msgstr " m = torna al men� principal\n"
+msgstr " m = torna al menú principal\n"
 
 #: g10/pkclist.c:319
 msgid " s = skip this key\n"
@@ -1467,15 +1448,15 @@ msgstr " x = ix\n"
 
 #: g10/pkclist.c:327 g10/revoke.c:632
 msgid "Your decision? "
-msgstr "La vostra decisi�? "
+msgstr "La vostra decisió? "
 
 #: g10/pkclist.c:348
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Realment voleu assignar confian�a absoluta a aquesta clau? "
+msgstr "Realment voleu assignar confiança absoluta a aquesta clau? "
 
 #: g10/pkclist.c:362
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Certificats que duen a una clau de confian�a absoluta:\n"
+msgstr "Certificats que duen a una clau de confiança absoluta:\n"
 
 #: g10/pkclist.c:437
 #, c-format
@@ -1506,7 +1487,7 @@ msgstr ""
 #: g10/pkclist.c:486
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
-msgstr "%08lX: La clau NO �s de confian�a\n"
+msgstr "%08lX: La clau NO és de confiança\n"
 
 #: g10/pkclist.c:492
 #, c-format
@@ -1515,7 +1496,7 @@ msgid ""
 "but it is accepted anyway\n"
 msgstr ""
 "%08lX: No hi ha garanties que aquesta clau pertanya realment al seu\n"
-"propietari per� s'accepta de tota manera\n"
+"propietari però s'accepta de tota manera\n"
 
 #: g10/pkclist.c:498
 msgid "This key probably belongs to the owner\n"
@@ -1523,7 +1504,7 @@ msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
 #: g10/pkclist.c:503
 msgid "This key belongs to us\n"
-msgstr "Aquesta clau �s nostra\n"
+msgstr "Aquesta clau és nostra\n"
 
 #: g10/pkclist.c:551
 msgid ""
@@ -1532,38 +1513,36 @@ msgid ""
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"NO �s segur que la clau pertanya a la persona esmentada en\n"
-"l'ID d'usuari. Si *realment* sabeu qu� feu, podeu respondre\n"
-"�s�� a la seg�ent pregunta\n"
+"NO és segur que la clau pertanya a la persona esmentada en\n"
+"l'ID d'usuari. Si *realment* sabeu què feu, podeu respondre\n"
+"«sí» a la següent pregunta\n"
 "\n"
 
 #: g10/pkclist.c:565 g10/pkclist.c:595
 msgid "WARNING: Using untrusted key!\n"
-msgstr "AV�S: S'est� usant una clau no fiable!\n"
+msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
 #: g10/pkclist.c:602
-#, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
-"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no "
-"est� present.\n"
+"AVÍS: aquesta clau pot estar revocada (la clau de revocació no està "
+"present)\n"
 
 #: g10/pkclist.c:611
-#, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
+msgstr "AVÍS: Aquesta clau ha estat revocada pel revocador designat!\n"
 
 #: g10/pkclist.c:614
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
+msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
 #: g10/pkclist.c:615
 msgid "         This could mean that the signature is forgery.\n"
-msgstr "      A�� podria significar que la signatura �s falsificada.\n"
+msgstr "      Açò podria significar que la signatura és falsificada.\n"
 
 #: g10/pkclist.c:621
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "AV�S: Aquesta subclau ha estat revocada pel propietari!\n"
+msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
 #: g10/pkclist.c:626
 msgid "Note: This key has been disabled.\n"
@@ -1575,8 +1554,7 @@ msgstr "Nota: La clau ha caducat!\n"
 
 #: g10/pkclist.c:642
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr ""
-"AV�S: Aquesta clau no ve certificada per una signatura de confian�a!\n"
+msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
 #: g10/pkclist.c:644
 msgid ""
@@ -1586,20 +1564,20 @@ msgstr ""
 
 #: g10/pkclist.c:652
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "AV�S: La clau NO �s de confian�a!\n"
+msgstr "AVÍS: La clau NO és de confiança!\n"
 
 #: g10/pkclist.c:653
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "          Probablement la signatura �s FALSA.\n"
+msgstr "          Probablement la signatura és FALSA.\n"
 
 #: g10/pkclist.c:661
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "AV�S: Aquesta clau no ve certificada per signatures prou fiables!\n"
+msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
 #: g10/pkclist.c:663
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "No �s segur que la signatura pertanya al seu propietari.\n"
+msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
 #: g10/pkclist.c:817 g10/pkclist.c:841 g10/pkclist.c:999 g10/pkclist.c:1059
 #, c-format
@@ -1609,11 +1587,11 @@ msgstr "%s: es descarta: %s\n"
 #: g10/pkclist.c:827 g10/pkclist.c:1031
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: es descarta: la clau p�blica ja est� present\n"
+msgstr "%s: es descarta: la clau pública ja està present\n"
 
 #: g10/pkclist.c:858
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "No heu especificat un ID d'usuari. (podeu usar �-r�)\n"
+msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
 #: g10/pkclist.c:871
 msgid ""
@@ -1621,7 +1599,7 @@ msgid ""
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"Introdu�u l'ID d'usuari. Finalitzeu amb una l�nia en blanc: "
+"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
 #: g10/pkclist.c:887
 msgid "No such user ID.\n"
@@ -1629,65 +1607,65 @@ msgstr "Usuari inexistent.\n"
 
 #: g10/pkclist.c:892 g10/pkclist.c:974
 msgid "skipped: public key already set as default recipient\n"
-msgstr "es descarta: la clau p�blica ja s'ha especificat com a destinatari\n"
+msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
 #: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
-msgstr "La clau p�blica est� desactivada.\n"
+msgstr "La clau pública està desactivada.\n"
 
 #: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "es descarta: la clau p�blica ja est� establida\n"
+msgstr "es descarta: la clau pública ja està establida\n"
 
 #: g10/pkclist.c:966
 #, c-format
 msgid "unknown default recipient `%s'\n"
-msgstr "el destinatari predeterminat �s desconegut �%s�\n"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
 #: g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: es descarta: la clau p�blica est� desactivada\n"
+msgstr "%s: es descarta: la clau pública està desactivada\n"
 
 #: g10/pkclist.c:1066
 msgid "no valid addressees\n"
-msgstr "no hi ha adreces v�lides\n"
+msgstr "no hi ha adreces vàlides\n"
 
 #: g10/keygen.c:198
 #, c-format
 msgid "preference %c%lu is not valid\n"
-msgstr "la prefer�ncia %c%lu no �s v�lida\n"
+msgstr "la preferència %c%lu no és vàlida\n"
 
 #: g10/keygen.c:205
 #, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "la prefer�ncia %c%lu �s duplicada\n"
+msgstr "la preferència %c%lu és duplicada\n"
 
 #: g10/keygen.c:210
 #, c-format
 msgid "too many `%c' preferences\n"
-msgstr "hi ha massa prefer�ncies �%c�\n"
+msgstr "hi ha massa preferències «%c»\n"
 
 #: g10/keygen.c:280
 msgid "invalid character in preference string\n"
-msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n"
+msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
 #: g10/keygen.c:638
 msgid "writing direct signature\n"
-msgstr "s'est� escrivint una signatura directa\n"
+msgstr "s'està escrivint una signatura directa\n"
 
 #: g10/keygen.c:677
 msgid "writing self signature\n"
-msgstr "s'est� escrivint l'autosignatura\n"
+msgstr "s'està escrivint l'autosignatura\n"
 
 #: g10/keygen.c:723
 msgid "writing key binding signature\n"
-msgstr "s'est� escrivint la signatura de comprovaci� de la clau\n"
+msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
 #: g10/keygen.c:785 g10/keygen.c:869 g10/keygen.c:960
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "la mida de la clau �s inv�lida; s'hi usaran %u bits\n"
+msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
 #: g10/keygen.c:790 g10/keygen.c:874 g10/keygen.c:965
 #, c-format
@@ -1706,22 +1684,22 @@ msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 #: g10/keygen.c:1068
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (nom�s signar)\n"
+msgstr "   (%d) DSA (només signar)\n"
 
 #: g10/keygen.c:1070
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (nom�s xifrar)\n"
+msgstr "   (%d) ElGamal (només xifrar)\n"
 
 #: g10/keygen.c:1071
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (nom�s signar)\n"
+msgstr "   (%d) RSA (només signar)\n"
 
 #: g10/keygen.c:1073
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (nom�s xifrar)\n"
+msgstr "   (%d) RSA (només xifrar)\n"
 
 #: g10/keygen.c:1075
 #, c-format
@@ -1734,7 +1712,7 @@ msgstr "Seleccioneu: "
 
 #: g10/keygen.c:1112 g10/keyedit.c:682 g10/revoke.c:665
 msgid "Invalid selection.\n"
-msgstr "La selecci� �s inv�lida.\n"
+msgstr "La selecció és invàlida.\n"
 
 #: g10/keygen.c:1125
 #, c-format
@@ -1745,66 +1723,57 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 "Preparat per a generar un nou parell de claus %s.\n"
-"              grand�ria m�nima:  768 bits\n"
-"      grand�ria predeterminada: 1024 bits\n"
-"  grand�ria m�xima aconsellada: 2048 bits\n"
+"              grandària mínima:  768 bits\n"
+"      grandària predeterminada: 1024 bits\n"
+"  grandària màxima aconsellada: 2048 bits\n"
 
 #: g10/keygen.c:1134
 msgid "What keysize do you want? (1024) "
-msgstr "Quina grand�ria voleu? (1024) "
+msgstr "Quina grandària voleu? (1024) "
 
 #: g10/keygen.c:1139
 msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n"
+msgstr "DSA només permet claus entre 512 i 1024 bits\n"
 
 #: g10/keygen.c:1141
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
-"la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus "
-"RSA.\n"
+"la clau és massa petita; 1024 bits és el mínim permés per a claus RSA.\n"
 
 #: g10/keygen.c:1144
 msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n"
+msgstr "la clau és massa petita; 768 bits és el mínim permés.\n"
 
 # Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons.  ivb
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n"
+msgstr "la clau és massa llarga; %d és el màxim permés.\n"
 
 #: g10/keygen.c:1160
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"No es recomanen claus m�s llargues de 2048 bits perqu�\n"
-"els c�lculs s�n VERITABLEMENT llargs!\n"
+"No es recomanen claus més llargues de 2048 bits perquè\n"
+"els càlculs són VERITABLEMENT llargs!\n"
 
 #: g10/keygen.c:1163
 msgid "Are you sure that you want this keysize? "
-msgstr "Segur que voleu aquesta grand�ria? "
+msgstr "Segur que voleu aquesta grandària? "
 
 #: g10/keygen.c:1164
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
-"D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� "
-"son molt vulnerables als atacs!\n"
+"D'acord, però sapieu que la radiació del monitor i del teclat també son molt "
+"vulnerables als atacs!\n"
 
 #: g10/keygen.c:1173
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "La grand�ria sol�licitada �s %u bits\n"
+msgstr "La grandària sol·licitada és %u bits\n"
 
 #: g10/keygen.c:1176 g10/keygen.c:1180
 #, c-format
@@ -1853,32 +1822,31 @@ msgstr "Indiqueu la validesa de la signatura (0) "
 
 #: g10/keygen.c:1269
 msgid "invalid value\n"
-msgstr "el valor no �s v�lid\n"
+msgstr "el valor no és vàlid\n"
 
 #: g10/keygen.c:1274
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-# Amb �it� es refereix a les dates?  ivb
-# Aix� vaig entendre jo. jm
+# Amb «it» es refereix a les dates?  ivb
+# Això vaig entendre jo. jm
 #: g10/keygen.c:1287
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
-"Tanmateix, les tractar� b� fins l'any 2106.\n"
+"Tanmateix, les tractarà bé fins l'any 2106.\n"
 
 #: g10/keygen.c:1292
 msgid "Is this correct (y/n)? "
-msgstr "�s correcte? (s/n)"
+msgstr "És correcte? (s/n)"
 
 #: g10/keygen.c:1335
 msgid ""
@@ -1891,7 +1859,7 @@ msgid ""
 msgstr ""
 "\n"
 "Necessiteu un ID d'usuari per a identificar la vostra clau; el programa\n"
-"construeix l'id de l'usuari amb el Nom, Comentari i Adre�a electr�nica\n"
+"construeix l'id de l'usuari amb el Nom, Comentari i Adreça electrònica\n"
 "d'aquesta forma:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1902,23 +1870,23 @@ msgstr "Nom i cognoms: "
 
 #: g10/keygen.c:1355
 msgid "Invalid character in name\n"
-msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n"
+msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
 #: g10/keygen.c:1357
 msgid "Name may not start with a digit\n"
-msgstr "El nom no pot comen�ar amb un d�git\n"
+msgstr "El nom no pot començar amb un dígit\n"
 
 #: g10/keygen.c:1359
 msgid "Name must be at least 5 characters long\n"
-msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n"
+msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
 #: g10/keygen.c:1367
 msgid "Email address: "
-msgstr "Adre�a electr�nica: "
+msgstr "Adreça electrònica: "
 
 #: g10/keygen.c:1378
 msgid "Not a valid email address\n"
-msgstr "No �s una adre�a v�lida\n"
+msgstr "No és una adreça vàlida\n"
 
 #: g10/keygen.c:1386
 msgid "Comment: "
@@ -1926,12 +1894,12 @@ msgstr "Comentari: "
 
 #: g10/keygen.c:1392
 msgid "Invalid character in comment\n"
-msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n"
+msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
 #: g10/keygen.c:1415
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "Esteu usant el joc de car�cters `%s'.\n"
+msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
 #: g10/keygen.c:1421
 #, c-format
@@ -1946,11 +1914,10 @@ msgstr ""
 
 #: g10/keygen.c:1427
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr ""
-"No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n"
+msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
 # xX? ivb
-# Hmm... s�. jm
+# Hmm... sí. jm
 #: g10/keygen.c:1432
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
@@ -1991,9 +1958,9 @@ msgid ""
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"No voleu contrasenya: �s una mala idea!\n"
-"B�. Si voleu canviar-la m�s endavant,\n"
-"useu aquest programa amb l'opci� \"--edit-key\".\n"
+"No voleu contrasenya: és una mala idea!\n"
+"Bé. Si voleu canviar-la més endavant,\n"
+"useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
 #: g10/keygen.c:1539
@@ -2003,10 +1970,9 @@ msgid ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Cal generar molts bits aleat?riament. �s bona idea fer alguna altra cosa\n"
-"(teclejar, moure el ratol�, usar els discos) durant la generaci� de\n"
-"nombres primers; a�� d�na oportunitat al generador de nombres "
-"aleatoris\n"
+"Cal generar molts bits aleatòriament. És bona idea fer alguna altra cosa\n"
+"(teclejar, moure el ratolí, usar els discos) durant la generació de\n"
+"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
 #: g10/keygen.c:2114
@@ -2015,23 +1981,23 @@ msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
 #: g10/keygen.c:2178
 msgid "Key generation canceled.\n"
-msgstr "La generaci� de claus ha estat cancel�lada.\n"
+msgstr "La generació de claus ha estat cancel·lada.\n"
 
 #: g10/keygen.c:2293 g10/keygen.c:2381
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "s'est� escrivint la clau p�blica a �%s�\n"
+msgstr "s'està escrivint la clau pública a «%s»\n"
 
 #: g10/keygen.c:2294 g10/keygen.c:2383
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "s'est� escrivint la clau secreta a �%s�\n"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
 #: g10/keygen.c:2370
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n"
+msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
 #: g10/keygen.c:2376
 #, c-format
@@ -2043,22 +2009,20 @@ msgstr ""
 #: g10/keygen.c:2390
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr ""
-"s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n"
+msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
 #: g10/keygen.c:2397
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr ""
-"s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n"
+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
 #: g10/keygen.c:2417
 msgid "public and secret key created and signed.\n"
-msgstr "s'han creat i signat les claus p�blica i secreta.\n"
+msgstr "s'han creat i signat les claus pública i secreta.\n"
 
 #: g10/keygen.c:2418
 msgid "key marked as ultimately trusted.\n"
-msgstr "s'ha marcat la clau com a de confian�a absoluta.\n"
+msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
 #: g10/keygen.c:2429
 msgid ""
@@ -2066,12 +2030,12 @@ msgid ""
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
-"\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n"
+"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
 #: g10/keygen.c:2441 g10/keygen.c:2563
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "La generaci� de claus ha fallat: %s\n"
+msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
 #: g10/keygen.c:2491 g10/sign.c:261
@@ -2093,7 +2057,7 @@ msgstr ""
 
 #: g10/keygen.c:2502
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n"
+msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
 #: g10/keygen.c:2530
 msgid "Really create? "
@@ -2112,36 +2076,36 @@ msgstr "%s: no s'ha pogut obrir: %s\n"
 #: g10/encode.c:207 g10/sign.c:1063
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "error en la creaci� de la contrasenya: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
 
 #: g10/encode.c:212
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "no es pot usar un paquet asim�tric ESK al estar en mode S2K\n"
+msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
 #: g10/encode.c:223
-#, fuzzy, c-format
+#, c-format
 msgid "using cipher %s\n"
-msgstr "Ha fallat el proc�s de signatura: %s\n"
+msgstr "s'està utilitzant el xifratge %s\n"
 
 #: g10/encode.c:233 g10/encode.c:494
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "�%s� ja est� comprimida\n"
+msgstr "«%s» ja està comprimida\n"
 
 #: g10/encode.c:302 g10/encode.c:531
 #, c-format
 msgid "%s: WARNING: empty file\n"
-msgstr "%s: AV�S: el fitxer �s buit\n"
+msgstr "%s: AVÍS: el fitxer és buit\n"
 
 #: g10/encode.c:414
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
-"nom�s podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
+"només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
 
 #: g10/encode.c:429
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "s'est� llegint des de �%s�\n"
+msgstr "s'està llegint des de «%s»\n"
 
 #: g10/encode.c:465
 msgid ""
@@ -2154,14 +2118,13 @@ msgstr ""
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del "
-"destinatari\n"
+"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
 #: g10/encode.c:573 g10/sign.c:781
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"for�ar l'algoritme de compressi� %s (%d) viola les prefer�ncies del "
+"forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
 #: g10/encode.c:717
@@ -2172,51 +2135,47 @@ msgstr "no podeu usar %s mentre esteu en mode %s\n"
 #: g10/encode.c:744
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s xifrat per a: �%s�\n"
+msgstr "%s/%s xifrat per a: «%s»\n"
 
 #: 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 "no s'ha trobat la clau �%s�: %s\n"
+msgstr "no s'ha trobat la clau «%s»: %s\n"
 
 #: 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 "s'ha produ�t un error en llegir el bloc de claus: %s\n"
+msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
 #: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "clau %08lX: no �s una clau rfc2440 - es descarta\n"
+msgstr "clau %08lX: no és una clau rfc2440 - es descarta\n"
 
 #: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "clau %08lX: no est� protegida - es descarta\n"
+msgstr "clau %08lX: no està protegida - es descarta\n"
 
 #: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr ""
-"AV�S: la clau secreta %08lX no te una simple suma de comprovaci� SK\n"
+msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 
 #: g10/export.c:310
 msgid "WARNING: nothing exported\n"
-msgstr "AV�S: no s'ha exportat res\n"
+msgstr "AVÍS: no s'ha exportat res\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
-"hi ha massa entrades en la mem�ria cau de claus p�bliques - desactivada\n"
+"hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
@@ -2225,23 +2184,23 @@ msgstr "[No s'ha trobat l'id d'usuari]"
 #, 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"
+"La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
 #: g10/getkey.c:2160
 #, 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"
+"no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
 #: g10/getkey.c:2388
 #, 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"
+msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
 #: g10/getkey.c:2435
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "clau %08lX: clau secreta sense clau p�blica - es descarta\n"
+msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
 #: g10/import.c:227
 #, c-format
@@ -2256,7 +2215,7 @@ msgstr "fins ara s'han processat %lu claus\n"
 #: g10/import.c:241
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "error en la lectura de �%s�: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
 
 #: g10/import.c:253
 #, c-format
@@ -2327,8 +2286,8 @@ msgstr "              importades: %lu\n"
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
-"NOTA: s'ha detectat una clau prim�ria Elgamal - a�� pot trigar un "
-"temps en importar-se\n"
+"NOTA: s'ha detectat una clau primària Elgamal - açò pot trigar un temps en "
+"importar-se\n"
 
 #: g10/import.c:565 g10/import.c:832
 #, c-format
@@ -2338,26 +2297,26 @@ msgstr "clau %08lX: sense ID\n"
 #: g10/import.c:587
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n"
+msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
 #: g10/import.c:602
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n"
+msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
 #: g10/import.c:608
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
-msgstr "clau %08lX: l'ID no �s v�lid\n"
+msgstr "clau %08lX: l'ID no és vàlid\n"
 
 #: g10/import.c:610
 msgid "this may be caused by a missing self-signature\n"
-msgstr "a�� pot ser causat per l'abs�ncia d'autosignatura\n"
+msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
 #: g10/import.c:619 g10/import.c:912
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
-msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
+msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
 #: g10/import.c:624
 #, c-format
@@ -2372,22 +2331,22 @@ msgstr "no s'ha trobat cap anell escrivible: %s\n"
 #: g10/import.c:639 g10/sign.c:688 g10/sign.c:924 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "s'est� escrivint en �%s�\n"
+msgstr "s'està escrivint en «%s»\n"
 
 #: 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 "error mentre s'escrivia l'anell �%s�: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
 #: g10/import.c:662
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "clau %08lX: s'ha importat la clau p�blica �%s�\n"
+msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
 #: g10/import.c:684
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
-msgstr "clau %08lX: no correspon a la nostra c�pia\n"
+msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
 #: g10/import.c:701 g10/import.c:929
 #, c-format
@@ -2402,42 +2361,42 @@ msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 #: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "clau %08lX: �%s� 1 ID d'usuari nou\n"
+msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
 #: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "clau %08lX: �%s� %d ID d'usuari nous\n"
+msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
 #: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "clau %08lX: �%s� 1 signatura nova\n"
+msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
 #: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "clau %08lX: �%s� %d signatures noves\n"
+msgstr "clau %08lX: «%s» %d signatures noves\n"
 
 #: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "clau %08lX: �%s� 1 subclau nova\n"
+msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
 #: g10/import.c:754
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "clau %08lX: �%s� %d subclaus noves\n"
+msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
 #: g10/import.c:773
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
-msgstr "clau %08lX: �%s� no ha estat modificada\n"
+msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
 #: g10/import.c:838
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
-msgstr "clau %08lX: clau secreta amb xifrat %d no v�lid - es descarta\n"
+msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
 #: g10/import.c:853
 #, c-format
@@ -2449,7 +2408,6 @@ msgstr "no hi ha anell secret predeterminat: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2464,22 +2422,21 @@ msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
-"clau %08lX: falta la clau p�blica: no es pot aplicar el certificat\n"
-"de revocaci�\n"
+"clau %08lX: falta la clau pública: no es pot aplicar el certificat\n"
+"de revocació\n"
 
-# O �rebutjara�? ivb
-# Per tots els canvis d'anglicisme �ignorat� -> �es descarta�,
-# �es rebutja� est� b�. jm
+# O «rebutjara»? ivb
+# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
+# «es rebutja» està bé. jm
 #: g10/import.c:946
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr ""
-"clau %08lX: el certificat de revocaci� �s inv�lid: %s: es rebutja\n"
+msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
 #: g10/import.c:978
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "clau %08lX: s'ha importat el certificat de revocaci� �%s�\n"
+msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
 #: g10/import.c:1041
 #, c-format
@@ -2490,50 +2447,49 @@ msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
-"clau %08lX: l'algoritme de clau p�blica no es suporta sobre l'id d'usuari "
-"�%s�\n"
+"clau %08lX: l'algoritme de clau pública no es suporta sobre l'id d'usuari «%"
+"s»\n"
 "\n"
 
 #: g10/import.c:1058
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr ""
-"clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n"
+msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
 #: g10/import.c:1075
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
-msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
+msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
 #: g10/import.c:1084 g10/import.c:1128
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "clau %08lX: l'algoritme de clau p�blica no �s suportat\n"
+msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
 #: g10/import.c:1085
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
-msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n"
+msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
 #: g10/import.c:1098
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "clau %08lX: s'ha eliminat un enlla� de subclau m�ltiple\n"
+msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
 #: g10/import.c:1119
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
-msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci�\n"
+msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
 #: g10/import.c:1129
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
-msgstr "clau %08lX: Subclau de revocaci� no v�lida\n"
+msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
 #: g10/import.c:1142
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n"
+msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
 #: g10/import.c:1179
 #, c-format
@@ -2548,34 +2504,32 @@ msgstr "clau %08lX: es descarta la subclau\n"
 #: g10/import.c:1229
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr ""
-"clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n"
+msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
 #: g10/import.c:1238
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
-"clau %08lX: el certificat de revocaci� �s en el lloc equivocat - es "
+"clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
 #: g10/import.c:1255
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr ""
-"clau %08lX: el certificat de revocaci� �s inv�lid: %s - es descarta\n"
+msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
 #: g10/import.c:1268
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr ""
-"clau %08lX: la signatura de la subclau �s en el lloc equivocat - es "
+"clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
 #: g10/import.c:1276
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
-"clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n"
+"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
 #: g10/import.c:1375
 #, c-format
@@ -2586,20 +2540,20 @@ msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
-"AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� "
-"%08lX\n"
+"AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
+"08lX\n"
 
 #: g10/import.c:1448
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
-"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no "
-"est� present.\n"
+"AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
+"present.\n"
 
 #: g10/import.c:1506
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n"
+msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
 #: g10/import.c:1539
 #, c-format
@@ -2608,7 +2562,7 @@ msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
 #: g10/keyedit.c:149
 msgid "[revocation]"
-msgstr "[revocaci�]"
+msgstr "[revocació]"
 
 #: g10/keyedit.c:150
 msgid "[self-signature]"
@@ -2616,12 +2570,12 @@ msgstr "[autosignatura]"
 
 #: g10/keyedit.c:221 g10/keylist.c:169
 msgid "1 bad signature\n"
-msgstr "1 signatura err�nia\n"
+msgstr "1 signatura errònia\n"
 
 #: g10/keyedit.c:223 g10/keylist.c:171
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d signatures err�nies\n"
+msgstr "%d signatures errònies\n"
 
 #: g10/keyedit.c:225 g10/keylist.c:173
 msgid "1 signature not checked due to a missing key\n"
@@ -2643,17 +2597,17 @@ msgstr "%d signatures no comprovades a causa d'errors\n"
 
 #: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n"
+msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
 #: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
+msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
 #: g10/keyedit.c:362
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "L'ID d'usuari �%s� est� revocat."
+msgstr "L'ID d'usuari «%s» està revocat."
 
 #: g10/keyedit.c:371 g10/keyedit.c:397 g10/keyedit.c:422 g10/keyedit.c:576
 #: g10/keyedit.c:634 g10/keyedit.c:1237
@@ -2670,12 +2624,12 @@ msgstr "  No es pot signar.\n"
 #: g10/keyedit.c:388
 #, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "L'ID d'usuari �%s� ha caducat."
+msgstr "L'ID d'usuari «%s» ha caducat."
 
 #: g10/keyedit.c:414
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "L'ID d'usuari �%s� no est� autosignat."
+msgstr "L'ID d'usuari «%s» no està autosignat."
 
 #: g10/keyedit.c:453
 #, c-format
@@ -2683,8 +2637,8 @@ msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"La vostra signatura en �%s�\n"
-"�s una signatura d'estil PGP 2.x.\n"
+"La vostra signatura en «%s»\n"
+"és una signatura d'estil PGP 2.x.\n"
 
 #: g10/keyedit.c:462
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
@@ -2696,23 +2650,21 @@ msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"La vostra signatura actual en �%s�\n"
+"La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
 #: g10/keyedit.c:480
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Voleu crear una nova signatura per a reempla�ar la caducada? (s/N) "
+msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"La vostra signatura en �%s�\n"
-"�s una signatura local.\n"
+"La vostra signatura en «%s»\n"
+"és una signatura local.\n"
 
 #: g10/keyedit.c:505
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
@@ -2721,12 +2673,12 @@ msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 #: g10/keyedit.c:526
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "�%s� ja estava signada localment amb la clau %08lX\n"
+msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
 #: g10/keyedit.c:530
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "�%s� ja estava signada amb la clau %08lX\n"
+msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
 #: g10/keyedit.c:535
 msgid "Do you want to sign it again anyway? (y/N) "
@@ -2744,7 +2696,7 @@ msgstr "La clau ha caducat!"
 #: g10/keyedit.c:590
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Aquesta clau caducar� el %s.\n"
+msgstr "Aquesta clau caducarà el %s.\n"
 
 #: g10/keyedit.c:594
 msgid "Do you want your signature to expire at the same time? (Y/n) "
@@ -2759,7 +2711,7 @@ msgstr ""
 
 #: g10/keyedit.c:629
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "A�� inutilitzaria la clau en PGP 2.x.\n"
+msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
 #: g10/keyedit.c:652
 msgid ""
@@ -2768,8 +2720,8 @@ msgid ""
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Amb quanta cura heu verificat que la clau que esteu a punt de signar \n"
-"pertany realment a la persona esmentada anteriorment? Si no sabeu qu� \n"
-"contestar, entreu �0�.\n"
+"pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
+"contestar, entreu «0».\n"
 
 #: g10/keyedit.c:656
 #, c-format
@@ -2797,9 +2749,7 @@ msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
 #: g10/keyedit.c:668
 msgid "Your selection? (enter '?' for more information): "
-msgstr ""
-"Seleccioneu una opci� (introdu�u �?� per obtindre m�s "
-"informaci�):"
+msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
 #: g10/keyedit.c:688
 msgid ""
@@ -2815,7 +2765,7 @@ msgid ""
 "This will be a self-signature.\n"
 msgstr ""
 "\n"
-"A�� ser� una autosignatura.\n"
+"Açò serà una autosignatura.\n"
 
 #: g10/keyedit.c:701
 msgid ""
@@ -2823,7 +2773,7 @@ msgid ""
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"AV�S: la signatura no es marcar� com a inexportable.\n"
+"AVÍS: la signatura no es marcarà com a inexportable.\n"
 
 #: g10/keyedit.c:706
 msgid ""
@@ -2831,7 +2781,7 @@ msgid ""
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"AV�S: la signatura no es marcar� com a irrevocable.\n"
+"AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
 #: g10/keyedit.c:713
 msgid ""
@@ -2839,7 +2789,7 @@ msgid ""
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"La signatura es marcar� com a inexportable.\n"
+"La signatura es marcarà com a inexportable.\n"
 
 #: g10/keyedit.c:717
 msgid ""
@@ -2847,7 +2797,7 @@ msgid ""
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"La signatura es marcar� com a irrevocable.\n"
+"La signatura es marcarà com a irrevocable.\n"
 
 #: g10/keyedit.c:722
 msgid ""
@@ -2881,19 +2831,19 @@ msgstr "Signar realment? "
 #: g10/sign.c:318
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "Ha fallat el proc�s de signatura: %s\n"
+msgstr "Ha fallat el procés de signatura: %s\n"
 
 #: g10/keyedit.c:837
 msgid "This key is not protected.\n"
-msgstr "Aquesta clau no est� protegida.\n"
+msgstr "Aquesta clau no està protegida.\n"
 
 #: g10/keyedit.c:841
 msgid "Secret parts of primary key are not available.\n"
-msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
+msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
 #: g10/keyedit.c:845
 msgid "Key is protected.\n"
-msgstr "La clau est� protegida.\n"
+msgstr "La clau està protegida.\n"
 
 #: g10/keyedit.c:865
 #, c-format
@@ -2905,7 +2855,7 @@ msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Introdu�u la nova contrasenya per a la clau secreta.\n"
+"Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
 #: g10/keyedit.c:885
@@ -2913,21 +2863,21 @@ msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"No voleu contrasenya: a�� �s probablement una *mala* idea!\n"
+"No voleu contrasenya: açò és probablement una *mala* idea!\n"
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
 #: g10/keyedit.c:888
 msgid "Do you really want to do this? "
-msgstr "Esteu segur de voler fer a��? "
+msgstr "Esteu segur de voler fer açò? "
 
 #: g10/keyedit.c:954
 msgid "moving a key signature to the correct place\n"
-msgstr "s'est� posant la signatura al lloc correcte\n"
+msgstr "s'està posant la signatura al lloc correcte\n"
 
 #: g10/keyedit.c:996
 msgid "quit this menu"
-msgstr "ix del men�"
+msgstr "ix del menú"
 
 #: g10/keyedit.c:997
 msgid "q"
@@ -2945,8 +2895,8 @@ msgstr "desa i ix"
 msgid "help"
 msgstr "ajuda"
 
-# �pantalla� o �ajuda�?  ivb
-# �ajuda�, evidentment. jm
+# «pantalla» o «ajuda»?  ivb
+# «ajuda», evidentment. jm
 #: g10/keyedit.c:999
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
@@ -2976,7 +2926,7 @@ msgid "uid"
 msgstr "uid"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
-# Yeah, els vaig corregir abans de que enviares la teua correcci�. jm
+# Yeah, els vaig corregir abans de que enviares la teua correcció. jm
 #: g10/keyedit.c:1004
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
@@ -2987,7 +2937,7 @@ msgstr "clau"
 
 #: g10/keyedit.c:1005
 msgid "select secondary key N"
-msgstr "tria la clau secund�ria N"
+msgstr "tria la clau secundària N"
 
 #: g10/keyedit.c:1006
 msgid "check"
@@ -3054,9 +3004,9 @@ msgid "addphoto"
 msgstr "addphoto"
 
 # Com estava escrit abans.  ivb
-# Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot
-# el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids
-# i no hem unificat en catal�. Potser li ho dir� a Werner. jm.
+# Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
+# el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
+# i no hem unificat en català. Potser li ho diré a Werner. jm.
 #: g10/keyedit.c:1015
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
@@ -3069,7 +3019,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "esborra un ID d'usuari"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3080,7 +3029,7 @@ msgstr "addkey"
 
 #: g10/keyedit.c:1019
 msgid "add a secondary key"
-msgstr "afegeix una clau secund�ria"
+msgstr "afegeix una clau secundària"
 
 #: g10/keyedit.c:1020
 msgid "delkey"
@@ -3088,7 +3037,7 @@ msgstr "delkey"
 
 #: g10/keyedit.c:1020
 msgid "delete a secondary key"
-msgstr "esborra una clau secund�ria"
+msgstr "esborra una clau secundària"
 
 #: g10/keyedit.c:1021
 msgid "addrevoker"
@@ -3096,7 +3045,7 @@ msgstr "addrevoker"
 
 #: g10/keyedit.c:1021
 msgid "add a revocation key"
-msgstr "afegeix una clau de revocaci�"
+msgstr "afegeix una clau de revocació"
 
 #: g10/keyedit.c:1022
 msgid "delsig"
@@ -3128,7 +3077,7 @@ msgstr "toggle"
 
 #: g10/keyedit.c:1025
 msgid "toggle between secret and public key listing"
-msgstr "canvia entre el llistat de claus secretes i p�bliques"
+msgstr "canvia entre el llistat de claus secretes i públiques"
 
 #: g10/keyedit.c:1027
 msgid "t"
@@ -3140,7 +3089,7 @@ msgstr "pref"
 
 #: g10/keyedit.c:1028
 msgid "list preferences (expert)"
-msgstr "llista les prefer�ncies (expert)"
+msgstr "llista les preferències (expert)"
 
 #: g10/keyedit.c:1029
 msgid "showpref"
@@ -3148,7 +3097,7 @@ msgstr "showpref"
 
 #: g10/keyedit.c:1029
 msgid "list preferences (verbose)"
-msgstr "llista les prefer�ncies (detallat)"
+msgstr "llista les preferències (detallat)"
 
 #: g10/keyedit.c:1030
 msgid "setpref"
@@ -3156,7 +3105,7 @@ msgstr "setpref"
 
 #: g10/keyedit.c:1030
 msgid "set preference list"
-msgstr "estableix la llista de prefer�ncies"
+msgstr "estableix la llista de preferències"
 
 #: g10/keyedit.c:1031
 msgid "updpref"
@@ -3164,7 +3113,7 @@ msgstr "updpref"
 
 #: g10/keyedit.c:1031
 msgid "updated preferences"
-msgstr "prefer�ncies actualitzades"
+msgstr "preferències actualitzades"
 
 #: g10/keyedit.c:1032
 msgid "passwd"
@@ -3180,7 +3129,7 @@ msgstr "trust"
 
 #: g10/keyedit.c:1033
 msgid "change the ownertrust"
-msgstr "canvia la confian�a"
+msgstr "canvia la confiança"
 
 #: g10/keyedit.c:1034
 msgid "revsig"
@@ -3204,7 +3153,7 @@ msgstr "revkey"
 
 #: g10/keyedit.c:1036
 msgid "revoke a secondary key"
-msgstr "revoca una clau secund�ria"
+msgstr "revoca una clau secundària"
 
 #: g10/keyedit.c:1037
 msgid "disable"
@@ -3232,20 +3181,20 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "mostra el photo ID"
 
-# Dest�s? ivb
-# Desat�s, s�. jm
+# Destès? ivb
+# Desatès, sí. jm
 #: g10/keyedit.c:1059 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
-msgstr "no es pot fet aix� en mode desat�s\n"
+msgstr "no es pot fet això en mode desatès\n"
 
 #: g10/keyedit.c:1097
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "error en llegir el bloc de claus secretes �%s�: %s\n"
+msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
 #: g10/keyedit.c:1115
 msgid "Secret key is available.\n"
-msgstr "La clau secreta est� disponible.\n"
+msgstr "La clau secreta està disponible.\n"
 
 #: g10/keyedit.c:1146
 msgid "Command> "
@@ -3253,15 +3202,15 @@ msgstr "Ordre> "
 
 #: g10/keyedit.c:1178
 msgid "Need the secret key to do this.\n"
-msgstr "Cal la clau secreta per a fer a��.\n"
+msgstr "Cal la clau secreta per a fer açò.\n"
 
 #: g10/keyedit.c:1182
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "Useu l'ordre �toggle� abans.\n"
+msgstr "Useu l'ordre «toggle» abans.\n"
 
 #: g10/keyedit.c:1231
 msgid "Key is revoked."
-msgstr "La clau est� revocada."
+msgstr "La clau està revocada."
 
 #: g10/keyedit.c:1250
 msgid "Really sign all user IDs? "
@@ -3274,7 +3223,7 @@ msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 #: g10/keyedit.c:1276
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n"
+msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
 #: g10/keyedit.c:1298 g10/keyedit.c:1319 g10/keyedit.c:1379
 msgid "You must select at least one user ID.\n"
@@ -3282,7 +3231,7 @@ msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
 #: g10/keyedit.c:1300
 msgid "You can't delete the last user ID!\n"
-msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
+msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
 #: g10/keyedit.c:1303
 msgid "Really remove all selected user IDs? "
@@ -3294,7 +3243,7 @@ msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
 #: g10/keyedit.c:1342 g10/keyedit.c:1398
 msgid "You must select at least one key.\n"
-msgstr "Heu de seleccionar, si m�s no, una clau.\n"
+msgstr "Heu de seleccionar, si més no, una clau.\n"
 
 #: g10/keyedit.c:1346
 msgid "Do you really want to delete the selected keys? "
@@ -3323,11 +3272,11 @@ msgstr "Realment voleu revocar aquesta clau? "
 #: g10/keyedit.c:1472
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
-"Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
+"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
 #: g10/keyedit.c:1474
 msgid "Really update the preferences? "
-msgstr "Realment voleu actualitzar les prefer�ncies? "
+msgstr "Realment voleu actualitzar les preferències? "
 
 #: g10/keyedit.c:1512
 msgid "Save changes? "
@@ -3340,20 +3289,20 @@ msgstr "Voleu eixir sense desar? "
 #: g10/keyedit.c:1526
 #, c-format
 msgid "update failed: %s\n"
-msgstr "ha fallat l'actualitzaci�: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
 
 #: g10/keyedit.c:1533
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
+msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
 #: g10/keyedit.c:1540
 msgid "Key not changed so no update needed.\n"
-msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
+msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
 #: g10/keyedit.c:1552
 msgid "Invalid command  (try \"help\")\n"
-msgstr "L'ordre no �s v�lida (proveu �help�)\n"
+msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
 #: g10/keyedit.c:1611
 msgid "Digest: "
@@ -3363,8 +3312,8 @@ msgstr "Resum: "
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-# Potser %s haja d'anar darrere de �clau�.  ivb
-# �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
+# Potser %s haja d'anar darrere de «clau».  ivb
+# És cert. Nova funcionalitat de 1.2.0, IIRC. jm
 #: g10/keyedit.c:1897
 #, c-format
 msgid "This key may be revoked by %s key "
@@ -3374,8 +3323,6 @@ msgstr "Aquesta clau pot ser revocada per la clau %s "
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3384,7 +3331,7 @@ msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
 #: g10/keyedit.c:1916
 #, c-format
 msgid " trust: %c/%c"
-msgstr " confian�a: %c/%c"
+msgstr " confiança: %c/%c"
 
 #: g10/keyedit.c:1920
 msgid "This key has been disabled"
@@ -3397,12 +3344,12 @@ msgstr "rev! la subclau ha estat revocada: %s\n"
 
 #: g10/keyedit.c:1952
 msgid "rev- faked revocation found\n"
-msgstr "rev- s'ha trobat una revocaci� falsa\n"
+msgstr "rev- s'ha trobat una revocació falsa\n"
 
 #: g10/keyedit.c:1954
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n"
+msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 
 #: g10/keyedit.c:1974 g10/keyedit.c:2057 g10/keylist.c:492 g10/keylist.c:532
 #: g10/mainproc.c:946
@@ -3415,15 +3362,14 @@ msgstr "[caducada]"
 
 #: g10/keyedit.c:1984
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n"
+msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 #: g10/keyedit.c:1992
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
-"Teniu en compte que la validesa de la clau mostrada no �s "
-"necess�riament\n"
+"Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
 #: g10/keyedit.c:2121
@@ -3431,8 +3377,8 @@ msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
-"AV�S: no s'ha marcat cap ID d'usuari com prim�ria. Aquesta ordre pot\n"
-"      causar que una ID d'usuari diferent esdevinga en la prim�ria "
+"AVÍS: no s'ha marcat cap ID d'usuari com primària. Aquesta ordre pot\n"
+"      causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
 # Photo ID com abans.  ivb
@@ -3442,7 +3388,7 @@ msgid ""
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que "
+"AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
 #: g10/keyedit.c:2186 g10/keyedit.c:2459
@@ -3453,15 +3399,15 @@ msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
-# Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
-# Hmm. S�... (s/N/x) jm
+# Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
+# Hmm. Sí... (s/N/x) jm
 #: g10/keyedit.c:2327
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
 #: g10/keyedit.c:2337
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
+msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
 #: g10/keyedit.c:2341
 msgid "Delete this unknown signature? (y/N/q)"
@@ -3493,8 +3439,7 @@ msgid ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"AV�S: Aquesta �s una clau d'estil PGP 2.x. Afegir un revocador designat "
-"pot\n"
+"AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
 #: g10/keyedit.c:2465
@@ -3503,16 +3448,13 @@ msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
 #: g10/keyedit.c:2488
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Introdu�u l'ID d'usuari del revocador designat: "
+msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
 #: g10/keyedit.c:2511
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
@@ -3520,8 +3462,7 @@ msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 #: g10/keyedit.c:2540
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
-"AV�S: no es pot desfer la nominaci� d'una clau com a revocador "
-"designat!\n"
+"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
 #: g10/keyedit.c:2546
 msgid ""
@@ -3535,15 +3476,15 @@ msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
 #: g10/keyedit.c:2617
 msgid "Please select at most one secondary key.\n"
-msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
+msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
 #: g10/keyedit.c:2621
 msgid "Changing expiration time for a secondary key.\n"
-msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
+msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
 #: g10/keyedit.c:2624
 msgid "Changing expiration time for the primary key.\n"
-msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n"
+msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
 #: g10/keyedit.c:2670
 msgid "You can't change the expiration date of a v3 key\n"
@@ -3560,21 +3501,21 @@ msgstr "Heu de seleccionar exactament un ID.\n"
 #: g10/keyedit.c:2805 g10/keyedit.c:2915
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n"
+msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
 #: g10/keyedit.c:2975
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "No hi ha cap ID amb l'�ndex %d\n"
+msgstr "No hi ha cap ID amb l'índex %d\n"
 
 #: g10/keyedit.c:3021
 #, c-format
 msgid "No secondary key with index %d\n"
-msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
+msgstr "No hi ha cap clau secundària amb l'índex %d\n"
 
 #: g10/keyedit.c:3135
 msgid "user ID: \""
-msgstr "ID d'usuari: �"
+msgstr "ID d'usuari: «"
 
 #: g10/keyedit.c:3140
 #, c-format
@@ -3582,7 +3523,7 @@ msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
-"�\n"
+"»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
 #: g10/keyedit.c:3143
@@ -3591,7 +3532,7 @@ msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
-"�\n"
+"»\n"
 "signat localment amb la vostra clau %08lX el %s\n"
 
 #: g10/keyedit.c:3148
@@ -3607,13 +3548,11 @@ msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 # S! jm
 #: g10/keyedit.c:3156
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr ""
-"Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) "
+msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
-msgstr "Heu signat els seg�ents ID d'usuari:\n"
+msgstr "Heu signat els següents ID d'usuari:\n"
 
 #: g10/keyedit.c:3200
 #, c-format
@@ -3641,7 +3580,7 @@ msgstr " (no-exportable)"
 # (s/N)?  ivb
 #: g10/keyedit.c:3247
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
+msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
 #: g10/keyedit.c:3277
 msgid "no secret key\n"
@@ -3650,47 +3589,42 @@ msgstr "ho hi ha clau secreta\n"
 #: g10/keyedit.c:3347
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "l'ID d'usuari �%s� ja est� revocat\n"
+msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr ""
-"AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n"
+msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
 #: g10/keyedit.c:3537
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
-"S'est� mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
+"S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
 #: g10/keylist.c:112
 #, c-format
 msgid "Critical signature policy: "
-msgstr "Pol�tica de signatura cr�tica: "
+msgstr "Política de signatura crítica: "
 
 #: g10/keylist.c:114
 #, c-format
 msgid "Signature policy: "
-msgstr "Pol�tica de signatura: "
+msgstr "Política de signatura: "
 
 #: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:811 g10/mainproc.c:820
 msgid "WARNING: invalid notation data found\n"
-msgstr "AV�S: s'hi han trobat dades de notaci� inv�lides\n"
+msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 
 #: g10/keylist.c:148
 #, c-format
 msgid "Critical signature notation: "
-msgstr "Notaci� de signatura cr�tica: "
+msgstr "Notació de signatura crítica: "
 
 #: g10/keylist.c:150
 #, c-format
 msgid "Signature notation: "
-msgstr "Notaci� de signatura: "
+msgstr "Notació de signatura: "
 
 #: g10/keylist.c:157
 msgid "not human readable"
@@ -3707,7 +3641,7 @@ msgstr " [caduca: %s]"
 
 #: g10/keylist.c:1046
 msgid "Primary key fingerprint:"
-msgstr "Empremtes digital de la clau prim�ria:"
+msgstr "Empremtes digital de la clau primària:"
 
 #: g10/keylist.c:1048
 msgid "     Subkey fingerprint:"
@@ -3715,13 +3649,12 @@ msgstr "     Empremta digital de la subclau:"
 
 #: g10/keylist.c:1055
 msgid " Primary key fingerprint:"
-msgstr " Empremta digital de la clau prim�ria:"
+msgstr " Empremta digital de la clau primària:"
 
 #: g10/keylist.c:1057
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Empremta digital ="
@@ -3729,21 +3662,18 @@ msgstr "     Empremta digital ="
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr "mida extranya per a una clau de sessi� xifrada (%d)\n"
+msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 msgstr ""
-"la contrasenya �s incorrecta o l'algoritme de xifratge (%d) �s "
-"desconegut\n"
+"la contrasenya és incorrecta o l'algoritme de xifratge (%d) és desconegut\n"
 
 #: g10/mainproc.c:299
 #, c-format
 msgid "%s encrypted session key\n"
-msgstr "clau de sessi� xifrada amb %s\n"
+msgstr "clau de sessió xifrada amb %s\n"
 
 #: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
@@ -3756,18 +3686,19 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "xifrat amb l'algoritme %d (desconegut)\n"
+msgstr ""
+"la contrasenya ha estat generada amb l'algoritme de resum desconegut %d\n"
 
 #: g10/mainproc.c:358
 #, c-format
 msgid "public key is %08lX\n"
-msgstr "la clau p�blica �s %08lX\n"
+msgstr "la clau pública és %08lX\n"
 
 #: g10/mainproc.c:404
 msgid "public key encrypted data: good DEK\n"
-msgstr "dades xifrades amb clau p�blica: bona clau de xifratge (DEK)\n"
+msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
 #: g10/mainproc.c:456
 #, c-format
@@ -3782,7 +3713,7 @@ msgstr "xifrat amb una clau %s, ID %08lX\n"
 #: g10/mainproc.c:480
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "ha fallat el desxifratge amb la clau p�blica: %s\n"
+msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
 #: g10/mainproc.c:494
 #, c-format
@@ -3794,20 +3725,20 @@ msgstr "xifrat amb %lu contrasenyes\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
-# I no ser� �dades xifrades amb %s�?  ivb
-# Sembla que s�, ho marque per a mirar-ho m�s endavant. jm
+# I no serà «dades xifrades amb %s»?  ivb
+# Sembla que sí, ho marque per a mirar-ho més endavant. jm
 #: g10/mainproc.c:512 g10/mainproc.c:531
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
-# L'optim�stic �s aquell que t� una Fe Cega en que Tot Anir� B�!  ivb
+# L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
 #: g10/mainproc.c:519
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
-"El xifratge IDEA no est� disponible, s'intentar� utilitzar optimistament "
-"%s en el seu lloc\n"
+"El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
+"en el seu lloc\n"
 
 #: g10/mainproc.c:549
 msgid "decryption okay\n"
@@ -3815,11 +3746,11 @@ msgstr "desxifratge correcte\n"
 
 #: g10/mainproc.c:553
 msgid "WARNING: message was not integrity protected\n"
-msgstr "AV�S: el missatge no tenia protecci� d'integritat\n"
+msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
 #: g10/mainproc.c:556
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "AV�S: el missatge xifrat ha estat manipulat!\n"
+msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
 #: g10/mainproc.c:562
 #, c-format
@@ -3828,7 +3759,7 @@ msgstr "ha fallat el desxifratge: %s\n"
 
 #: g10/mainproc.c:581
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "NOTA: el remitent ha sol�licitat \"alt secret\"\n"
+msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
 #: g10/mainproc.c:583
 #, c-format
@@ -3837,38 +3768,33 @@ msgstr "nom del fitxer original='%.*s'\n"
 
 #: g10/mainproc.c:755
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "revocaci� aut�noma: useu \"gpg --import\" per a aplicar-la\n"
+msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
 #: g10/mainproc.c:823
 msgid "Notation: "
-msgstr "Notaci�: "
+msgstr "Notació: "
 
 #: g10/mainproc.c:835
 msgid "Policy: "
-msgstr "Pol�tica: "
+msgstr "Política: "
 
 #: g10/mainproc.c:1291
 msgid "signature verification suppressed\n"
-msgstr "s'ha eliminat la verificaci� de signatura\n"
+msgstr "s'ha eliminat la verificació de signatura\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
-msgstr "no es poden tractar aquestes signatures m�ltiples\n"
+msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-# �%.*s� no ser� una data?  Caldr� �el� al davant.  ivb
+# «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
 #: g10/mainproc.c:1352
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
-msgstr "La clau �s disponible en: "
+msgstr "La clau és disponible en: "
 
 #: g10/mainproc.c:1430 g10/mainproc.c:1463
 msgid "BAD signature from \""
@@ -3920,19 +3846,18 @@ msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
 #: g10/mainproc.c:1664 g10/mainproc.c:1680 g10/mainproc.c:1766
 msgid "not a detached signature\n"
-msgstr "no �s una signatura separada\n"
+msgstr "no és una signatura separada\n"
 
 #: g10/mainproc.c:1707
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
-"AV�S: s'han detectat m�ltiples signatures. Nom�s es comprovar� la "
-"primera.\n"
+"AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
 #: g10/mainproc.c:1715
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "signatura aut�noma de classe 0x%02x\n"
+msgstr "signatura autònoma de classe 0x%02x\n"
 
 #: g10/mainproc.c:1772
 msgid "old style (PGP 2.x) signature\n"
@@ -3940,50 +3865,49 @@ msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
 #: g10/mainproc.c:1782
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n"
+msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
-# bolcats de mem�ria?  ivb
+# bolcats de memòria?  ivb
 #: g10/misc.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "no s'han pogut desactivar els bolcats de mem�ria: %s\n"
+msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
 #: g10/misc.c:163
 msgid "Experimental algorithms should not be used!\n"
-msgstr "No haur�eu d'usar algoritmes experimentals!\n"
+msgstr "No hauríeu d'usar algoritmes experimentals!\n"
 
 #: g10/misc.c:193
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
-"aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s "
-"est�ndard!\n"
+"aquest algoritme de xifratge està desaconsellat; useu-ne un de més "
+"estàndard!\n"
 
 #: g10/misc.c:301
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "el m�dul de xifratge IDEA no est� present\n"
+msgstr "el mòdul de xifratge IDEA no està present\n"
 
 #: g10/misc.c:302
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr ""
-"vegeu http://www.gnupg.org/why-not-idea.html per a m�s informaci�\n"
+msgstr "vegeu http://www.gnupg.org/why-not-idea.html per a més informació\n"
 
 #: g10/misc.c:534
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: l'opci� �%s� est� desaconsellada.\n"
+msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
 #: g10/misc.c:538
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AV�S: %s �s una opci� desaconsellada.\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
 #: g10/misc.c:540
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
+msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-# G�nere?  Nombre?  Passat, futur?  ivb
+# Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #: g10/misc.c:551
@@ -3998,22 +3922,21 @@ msgstr "aquest missatge pot no ser usable per %s\n"
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n"
+msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
 #: g10/parse-packet.c:688
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
-"AV�S: la clau de sessi� pot estar xifrada sim�tricament de forma "
-"insegura\n"
+"AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
 #: g10/parse-packet.c:1106
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
+msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
 #: g10/passphrase.c:459 g10/passphrase.c:506
 msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
 #: g10/passphrase.c:467
 msgid "can't set client pid for the agent\n"
@@ -4030,25 +3953,25 @@ msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
 
 #: g10/passphrase.c:515
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n"
+msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
 #: g10/passphrase.c:528
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n"
+msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
 #: g10/passphrase.c:549 g10/hkp.c:155
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "no s'ha pogut connectar amb �%s�: %s\n"
+msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
 #: g10/passphrase.c:571
 msgid "communication problem with gpg-agent\n"
-msgstr "hi ha un problema de comunicaci� amb el 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
 msgid "problem with the agent - disabling agent use\n"
-msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n"
+msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n"
 
 #: g10/passphrase.c:680 g10/passphrase.c:1098
 #, c-format
@@ -4058,14 +3981,14 @@ msgstr " (ID de la clau principal %08lX)"
 # Com es canvia l'ordre dels arguments? jm
 # Ah, bingo! jm
 # Uh, ara torna a donar error. FIXME
-# La idea �s ficar:
+# La idea és ficar:
 # "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
-# "�%1$.*s�\n"
+# "«%1$.*s»\n"
 # "clau %3$s de %2$u bits, ID %4$08lX, creada en %5$s%6$s\n"
 # jm
-# Se't passava l'argument �*�.  printf(3), hieroglyph(7).  ivb
+# Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
-# Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm
+# Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
 #: g10/passphrase.c:690
 #, c-format
 msgid ""
@@ -4074,7 +3997,7 @@ msgid ""
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
-"�%2$.*1$s�\n"
+"«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
 #: g10/passphrase.c:712
@@ -4083,19 +4006,19 @@ msgstr "Repetiu la contrasenya\n"
 
 #: g10/passphrase.c:714
 msgid "Enter passphrase\n"
-msgstr "Introdu�u la contrasenya\n"
+msgstr "Introduïu la contrasenya\n"
 
 #: g10/passphrase.c:752
 msgid "passphrase too long\n"
-msgstr "la contrasenya �s massa llarga\n"
+msgstr "la contrasenya és massa llarga\n"
 
 #: g10/passphrase.c:765
 msgid "invalid response from agent\n"
-msgstr "la resposta de l'agent �s inv�lida\n"
+msgstr "la resposta de l'agent és invàlida\n"
 
 #: g10/passphrase.c:780 g10/passphrase.c:873
 msgid "cancelled by user\n"
-msgstr "s'ha cancel�lat per l'usuari\n"
+msgstr "s'ha cancel·lat per l'usuari\n"
 
 #: g10/passphrase.c:785 g10/passphrase.c:963
 #, c-format
@@ -4119,11 +4042,11 @@ msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
 #: g10/passphrase.c:1145
 msgid "can't query password in batchmode\n"
-msgstr "no es pot demanar la contrasenya en mode desat�s\n"
+msgstr "no es pot demanar la contrasenya en mode desatès\n"
 
 #: g10/passphrase.c:1149
 msgid "Enter passphrase: "
-msgstr "Introdu�u la contrasenya: "
+msgstr "Introduïu la contrasenya: "
 
 #: g10/passphrase.c:1153
 msgid "Repeat passphrase: "
@@ -4131,12 +4054,12 @@ msgstr "Repetiu la contrasenya: "
 
 #: g10/plaintext.c:87
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n"
+msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
 
 #: g10/plaintext.c:128
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "error en crear �%s�: %s\n"
+msgstr "error en crear «%s»: %s\n"
 
 # Indi? ivb
 # Em pense que no. jm
@@ -4146,11 +4069,11 @@ msgstr "Signatura separada.\n"
 
 #: g10/plaintext.c:409
 msgid "Please enter name of data file: "
-msgstr "Introdu�u el nom del fitxer de dades: "
+msgstr "Introduïu el nom del fitxer de dades: "
 
 #: g10/plaintext.c:430
 msgid "reading stdin ...\n"
-msgstr "s'est� llegint d'stdin...\n"
+msgstr "s'està llegint d'stdin...\n"
 
 #: g10/plaintext.c:464
 msgid "no signed data\n"
@@ -4166,26 +4089,25 @@ msgstr "no s'han pogut obrir les dades signades `%s'\n"
 #: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "el destinatari �s an�nim; es provar� la clau secreta %08lX ...\n"
+msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
 
 #: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "d'acord, som el destinatari an�nim.\n"
+msgstr "d'acord, som el destinatari anònim.\n"
 
 #: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
-msgstr "la codificaci� antiga del DEK no est� suportada\n"
+msgstr "la codificació antiga del DEK no està suportada\n"
 
 #: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "l'algoritme de xifratge %d%s �s desconegut o est� desactivat\n"
+msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
 #: g10/pubkey-enc.c:216
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr ""
-"NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
+msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
 
 #: g10/pubkey-enc.c:237
 #, c-format
@@ -4199,7 +4121,7 @@ msgstr "NOTA: aquesta clau ha estat revocada!"
 #: g10/hkp.c:71
 #, c-format
 msgid "requesting key %08lX from %s\n"
-msgstr "s'est� sol�licitant la clau %08lX de %s\n"
+msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
 #: g10/hkp.c:98
 #, c-format
@@ -4209,17 +4131,17 @@ msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
 #: g10/hkp.c:183
 #, c-format
 msgid "error sending to `%s': %s\n"
-msgstr "error mentre s'enviava a �%s�: %s\n"
+msgstr "error mentre s'enviava a «%s»: %s\n"
 
 #: g10/hkp.c:198
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
-msgstr "l'enviament a �%s� ha tingut �xit (status=%u)\n"
+msgstr "l'enviament a «%s» ha tingut èxit (status=%u)\n"
 
 #: g10/hkp.c:201
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
-msgstr "l'enviament a �%s� ha fallat: status=%u\n"
+msgstr "l'enviament a «%s» ha fallat: status=%u\n"
 
 #: g10/hkp.c:373
 msgid "this keyserver does not support --search-keys\n"
@@ -4228,7 +4150,7 @@ msgstr "aquest servidor de claus no suporta --search-keys\n"
 #: g10/hkp.c:523
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "s'est� cercant �%s� al servidor HKP %s\n"
+msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 #: g10/hkp.c:575
 #, c-format
@@ -4243,16 +4165,16 @@ msgstr "parts de la clau secreta no estan disponbles\n"
 #: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "l'algoritme de protecci� %d%s no est� suportat\n"
+msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
 #: g10/seckey-cert.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "l'algoritme de protecci� %d%s no est� suportat\n"
+msgstr "l'algoritme de protecció %d no està suportat\n"
 
 #: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again"
-msgstr "La contrasenya no �s v�lida; torneu a intentar-ho"
+msgstr "La contrasenya no és vàlida; torneu a intentar-ho"
 
 #: g10/seckey-cert.c:240
 #, c-format
@@ -4261,17 +4183,17 @@ msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:297
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "AV�S: la clau �s feble; per favor, canvieu la contrasenya.\n"
+msgstr "AVÍS: la clau és feble; per favor, canvieu la contrasenya.\n"
 
 #: g10/seckey-cert.c:335
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
-"s'est� generant la suma de comprovaci� desaconsellada de 16-bits per a "
-"la protecci� de la clau secreta\n"
+"s'està generant la suma de comprovació desaconsellada de 16-bits per a la "
+"protecció de la clau secreta\n"
 
 #: g10/sig-check.c:70
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "AV�S: conflicte de signatures digest en el missatge\n"
+msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
 #: g10/sig-check.c:93
 #, c-format
@@ -4290,18 +4212,17 @@ msgid ""
 "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
 "signatures!\n"
 msgstr ""
-"clau %08lX: aquesta �s una clau ElGamal que NO �s segura per a "
-"signatures!\n"
+"clau %08lX: aquesta és una clau ElGamal que NO és segura per a signatures!\n"
 
 #: g10/sig-check.c:242
 #, c-format
 msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "la clau p�blica %08lX �s %lu segons anterior a la signatura\n"
+msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 #: g10/sig-check.c:243
 #, c-format
 msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "la clau p�blica %08lX �s %lu segons anterior a la signatura\n"
+msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 #: g10/sig-check.c:252
 #, c-format
@@ -4332,58 +4253,58 @@ msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 #, c-format
 msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
 msgstr ""
-"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit "
-"cr�tic desconegut\n"
+"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
+"desconegut\n"
 
 #: g10/sig-check.c:614
 #, c-format
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr ""
-"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocaci�\n"
+"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
 #: g10/sig-check.c:640
 #, c-format
 msgid "key %08lX: no subkey for subkey binding signature\n"
 msgstr ""
-"clau %08lX: no hi ha una subclau per a la signatura de l'enlla� de la "
+"clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
 #: g10/sign.c:84
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
-"no es poden ficar dades de notaci� dins de signatures v3 (estil PGP 2.x)\n"
+"no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
 
 #: g10/sign.c:92
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
-"no es poden ficar dades de notaci� dins de signatures de clau v3 (estil "
-"PGP 2.x)\n"
+"no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP "
+"2.x)\n"
 
 #: g10/sign.c:111
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
-"AV�S: no s'ha pogut %%-expandir la notaci� (massa gran). S'utilitza no "
+"AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
 "expandida.\n"
 
 #: g10/sign.c:137
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
-"no es pot ficar una URL de pol�tica dins de signatures v3 (estil PGP 2.x)\n"
+"no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n"
 
 #: g10/sign.c:145
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
-"no es pot ficar una URL de pol�tica dins de signatures de clau v3 (estil "
-"PGP 2.x)\n"
+"no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP "
+"2.x)\n"
 
 #: g10/sign.c:158
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
-"AV�S: no s'ha pogut %%-expandir l'url de pol�tica (massa gran). "
-"S'utilitza no expandida.\n"
+"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
+"no expandida.\n"
 
 #: g10/sign.c:313
 #, c-format
@@ -4393,18 +4314,18 @@ msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 #: g10/sign.c:322
 #, c-format
 msgid "%s signature from: \"%s\"\n"
-msgstr "%s signatura de: �%s�\n"
+msgstr "%s signatura de: «%s»\n"
 
 #: g10/sign.c:473
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "AV�S: �%s� �s un fitxer buit\n"
+msgstr "AVÍS: «%s» és un fitxer buit\n"
 
 #: g10/sign.c:659
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
-"nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre "
-"esteu en mode --pgp2\n"
+"només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
+"en mode --pgp2\n"
 
 #: g10/sign.c:683 g10/sign.c:919
 #, c-format
@@ -4415,8 +4336,7 @@ msgstr "no s'ha pogut creat %s: %s\n"
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
-"destinatari\n"
+"forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
 #: g10/sign.c:804
 msgid "signing:"
@@ -4425,38 +4345,38 @@ msgstr "signatura:"
 #: g10/sign.c:903
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
-"nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
+"només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
 #: g10/sign.c:1057
 #, c-format
 msgid "%s encryption will be used\n"
-msgstr "s'utilitzar� xifratge %s\n"
+msgstr "s'utilitzarà xifratge %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "no es poden tractar l�nies m�s llargues de %d car�cters\n"
+msgstr "no es poden tractar línies més llargues de %d caràcters\n"
 
 #: g10/textfilter.c:231
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
+msgstr "la línia d'entrada és superior a %d caràcters\n"
 
 #: g10/tdbio.c:128 g10/tdbio.c:1410
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "reg de la base de dades de confian�a %lu: ha fallat lseek: %s\n"
+msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
 #: g10/tdbio.c:134 g10/tdbio.c:1417
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
-"reg de la base de dades de confian�a %lu: ha fallat la escriptura (n=%d): %"
+"reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): %"
 "s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
-msgstr "la transacci� de la base de dades de confian�a �s massa gran\n"
+msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
 #: g10/tdbio.c:471
 #, c-format
@@ -4488,72 +4408,72 @@ msgstr "%s: no s'ha pogut crear: %s\n"
 #: g10/tdbio.c:519
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: no s'ha pogut crear un registre de versi�: %s"
+msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
 #: g10/tdbio.c:523
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: s'ha creat una base de dades de confian�a inv�lida\n"
+msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
 #: g10/tdbio.c:526
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: s'ha creat la base de dades de confian�a\n"
+msgstr "%s: s'ha creat la base de dades de confiança\n"
 
 #: g10/tdbio.c:566
 msgid "NOTE: trustdb not writable\n"
-msgstr "NOTA: no es pot escriure en la base de dades de confian�a\n"
+msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
 #: g10/tdbio.c:582
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: la base de dades de confian�a �s inv�lida\n"
+msgstr "%s: la base de dades de confiança és invàlida\n"
 
 #: g10/tdbio.c:614
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: no s'ha pogut crear la taula de dispersi�: %s\n"
+msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
 #: g10/tdbio.c:622
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: error en actualitzar el registre de la versi�: %s\n"
+msgstr "%s: error en actualitzar el registre de la versió: %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
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: error en llegir el registre de la versi�: %s\n"
+msgstr "%s: error en llegir el registre de la versió: %s\n"
 
 #: g10/tdbio.c:651 g10/tdbio.c:703
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: error en escriure el registre de la versi?: %s\n"
+msgstr "%s: error en escriure el registre de la versió: %s\n"
 
 #: g10/tdbio.c:1141
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "base de dades de confian�a: ha fallat lseek: %s\n"
+msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
 #: g10/tdbio.c:1149
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n"
+msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
 #: g10/tdbio.c:1170
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s no �s un fitxer de base de dades de confian�a\n"
+msgstr "%s no és un fitxer de base de dades de confiança\n"
 
 #: g10/tdbio.c:1188
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: registre de versi� amb n�mero de registre %lu\n"
+msgstr "%s: registre de versió amb número de registre %lu\n"
 
 #: g10/tdbio.c:1193
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: la versi� de fitxer %d �s inv�lida\n"
+msgstr "%s: la versió de fitxer %d és invàlida\n"
 
 #: g10/tdbio.c:1376
 #, c-format
@@ -4578,13 +4498,13 @@ msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 #: g10/tdbio.c:1469
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"la base de dades de confian�a est� corrompuda; per favor, executeu "
-"�gpg --fix-trustdb�.\n"
+"la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
+"fix-trustdb».\n"
 
 #: g10/trustdb.c:201
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "�%s� no �s un ID de clau llarg v�lid\n"
+msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
 #: g10/trustdb.c:236
 #, c-format
@@ -4595,13 +4515,13 @@ msgstr "clau %08lX: s'accepta com a clau fiable\n"
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr ""
-"la clau %08lX apareix m�s d'una vegada en la base de dades de confian�a\n"
+"la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
 #: g10/trustdb.c:289
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
-"clau %08lX: no hi ha una clau p�blica per a la clau fiable - es descarta\n"
+"clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
 #: g10/trustdb.c:298
 #, c-format
@@ -4611,34 +4531,33 @@ msgstr "s'ha marcat la clau %08lX com confiada absolutament\n"
 #: g10/trustdb.c:324
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut llegir: %s\n"
+msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
 #: g10/trustdb.c:330
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "el registre de confian�a %lu no �s del tipus demanat %d\n"
+msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
 #: g10/trustdb.c:345 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
+msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
 #: g10/trustdb.c:360 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "base de dades de confian�a: no s'ha pogut sincronitzar: %s\n"
+msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
 #: g10/trustdb.c:459
 msgid "no need for a trustdb check\n"
 msgstr ""
-"no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
+"no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
 #: g10/trustdb.c:465 g10/trustdb.c:1814
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr ""
-"la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n"
+msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
 #: g10/trustdb.c:835
 msgid "please do a --check-trustdb\n"
@@ -4646,12 +4565,12 @@ msgstr "si us plau, feu un --check-trustdb\n"
 
 #: g10/trustdb.c:839
 msgid "checking the trustdb\n"
-msgstr "s'est� comprovant la base de dades de confian�a\n"
+msgstr "s'està comprovant la base de dades de confiança\n"
 
 #: g10/trustdb.c:1045
 #, c-format
 msgid "public key %08lX not found: %s\n"
-msgstr "no s'ha trobat la clau p�blica %08lX: %s\n"
+msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
 #: g10/trustdb.c:1203
 #, c-format
@@ -4670,23 +4589,20 @@ msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
 #: g10/trustdb.c:1666
 msgid "no ultimately trusted keys found\n"
-msgstr "no s'han trobat claus amb confian�a absoluta\n"
+msgstr "no s'han trobat claus amb confiança absoluta\n"
 
 #: g10/trustdb.c:1680
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
-"no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n"
+"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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 ""
-"s'est� comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%"
-"d/%d\n"
+"s'està comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/"
+"%d\n"
 
 #: g10/verify.c:110
 msgid ""
@@ -4696,34 +4612,33 @@ msgid ""
 msgstr ""
 "no s'ha pogut verificar la signatura.\n"
 "Recordeu que el fitxer de signatura (.sig o .asc)\n"
-"ha de ser el primer que figure en la l�nia d'ordres.\n"
+"ha de ser el primer que figure en la línia d'ordres.\n"
 
-# LF -> fi de l�nia?  ivb
+# LF -> fi de línia?  ivb
 #: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr ""
-"la l�nia d'entrada %u �s massa llarga o hi falta un f� de l�nia\n"
+msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
 #: 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 ""
-"la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA "
+"la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
 #: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "es descarta �%s�: duplicat\n"
+msgstr "es descarta «%s»: duplicat\n"
 
 #: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "es descarta �%s�: %s\n"
+msgstr "es descarta «%s»: %s\n"
 
 #: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
-msgstr "es descarta: la clau secreta ja �s present\n"
+msgstr "es descarta: la clau secreta ja és present\n"
 
 #: g10/skclist.c:179
 #, c-format
@@ -4731,14 +4646,13 @@ msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"es descarta �%s�: �s una clau ElGamal generada per PGP que no �s "
-"segura per a signatures!\n"
+"es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
+"a signatures!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "El fitxer �%s� existeix. "
+msgstr "El fitxer «%s» existeix. "
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
@@ -4747,33 +4661,32 @@ msgstr "Voleu sobreescriure? (s/N) "
 #: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: el sufix �s desconegut\n"
+msgstr "%s: el sufix és desconegut\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "Introdu�u el nou nom del fitxer"
+msgstr "Introduïu el nou nom del fitxer"
 
 # Indi?  ivb
 #: g10/openfile.c:184
 msgid "writing to stdout\n"
-msgstr "s'est� escrivint en stdout\n"
+msgstr "s'està escrivint en stdout\n"
 
 #: g10/openfile.c:284
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "s'asumeix que hi ha dades signades en �%s�\n"
+msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
 #: g10/openfile.c:352
 #, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
+msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
 #: g10/openfile.c:354
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
-"AV�S: les opcions en �%s� encara no estan actives durant aquesta "
-"execuci�\n"
+"AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
 #: g10/openfile.c:383
 #, c-format
@@ -4785,14 +4698,14 @@ msgstr "%s: no s'ha pogut crear el directori: %s\n"
 msgid "%s: directory created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-# �s no-wrap?  ivb
+# És no-wrap?  ivb
 # Com? jm
 #: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"ATENCI�: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
-"sim�tric.\n"
+"ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
+"simètric.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -4802,27 +4715,27 @@ msgstr "problema en tractar amb un paquet xifrat\n"
 msgid "weak key created - retrying\n"
 msgstr "s'hi ha creat una clau feble - reintent\n"
 
-# �s no-wrap?  ivb
+# És no-wrap?  ivb
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"no s'ha pogut evitar una clau feble per a xifratge sim�tric;\n"
+"no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
 "hi ha hagut %d intents!\n"
 
 #: g10/seskey.c:210
 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"
+msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
 #: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 
-# Ah�!  Abans �batch� est� tal qual.  Cal unificar.  ivb
+# Ahà!  Abans «batch» està tal qual.  Cal unificar.  ivb
 # Fet. jm
 #: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "no es pot fer aix� en el mode desat�s sense �--yes�\n"
+msgstr "no es pot fer això en el mode desatès sense «--yes»\n"
 
 #: g10/delkey.c:151
 msgid "Delete this key from the keyring? "
@@ -4830,7 +4743,7 @@ msgstr "Voleu esborrar aquesta clau de l'anell? "
 
 #: g10/delkey.c:159
 msgid "This is a secret key! - really delete? "
-msgstr "�s una clau secreta! Voleu esborrar-la? "
+msgstr "És una clau secreta! Voleu esborrar-la? "
 
 #: g10/delkey.c:169
 #, c-format
@@ -4839,17 +4752,16 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
 #: g10/delkey.c:179
 msgid "ownertrust information cleared\n"
-msgstr "s'ha netejat la informaci� de la confian�a\n"
+msgstr "s'ha netejat la informació de la confiança\n"
 
 #: g10/delkey.c:207
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "hi ha una clau secreta per a la clau p�blica �%s�!\n"
+msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 
 #: g10/delkey.c:209
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr ""
-"utilitzeu l'opci� �--delete-secret-keys� per a eliminar-la primer.\n"
+msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -4857,11 +4769,9 @@ msgid ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"L'assignaci� d'un valor ac� �s cosa vostra; aquest valor mai "
-"s'exportar�\n"
-"a cap tercer. Ho necessitem per a implementar la xarxa de confian�a; no "
-"t�\n"
-"res a veure amb la xarxa de certificats (creada impl�citament)."
+"L'assignació d'un valor ací és cosa vostra; aquest valor mai s'exportarà\n"
+"a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no té\n"
+"res a veure amb la xarxa de certificats (creada implícitament)."
 
 #: g10/helptext.c:53
 msgid ""
@@ -4870,31 +4780,26 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
-"Per a construir la xarxa de confian�a, GnuPG necessita saber quines claus\n"
-"tenen confian�a absoluta - aquestes s�n normalment les claus per a les "
-"que\n"
-"teniu acc�s a la clau secreta.  Contesteu �s�� per a donar a aquesta "
-"clau\n"
-"confian�a absoluta\n"
+"Per a construir la xarxa de confiança, GnuPG necessita saber quines claus\n"
+"tenen confiança absoluta - aquestes són normalment les claus per a les que\n"
+"teniu accés a la clau secreta.  Contesteu «sí» per a donar a aquesta clau\n"
+"confiança absoluta\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr ""
-"Si voleu utilitzar aquesta clau revocada de totes maneres, dieu �s��."
+msgstr "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu «sí»."
 
 # "clau no confiable"? jm
-# No fiable, no de confian�a, no de fiar...  ivb
+# No fiable, no de confiança, no de fiar...  ivb
 #: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
-"Si voleu utilitzar aquesta clau no de confian�a de totes maneres, dieu "
-"�s��."
+"Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»."
 
 #: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Introdu�u l'ID d'usuari de la persona a qui voleu enviar el missatge."
+msgstr "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge."
 
 #: g10/helptext.c:72
 msgid ""
@@ -4918,27 +4823,24 @@ msgid ""
 msgstr ""
 "Seleccioneu l'algoritme a utilitzar.\n"
 "\n"
-"DSA (tamb� conegut com a DSS) �s el algorisme de signatura digital que "
-"nom�s\n"
-"pot ser utilitzat per a signatures. Aquest �s el algoritme suggerit "
-"perqu�\n"
-"la comprovaci� de signatures DSA �s molt m�s r�pida que les "
-"d'ElGamal.\n"
+"DSA (també conegut com a DSS) és el algorisme de signatura digital que "
+"només\n"
+"pot ser utilitzat per a signatures. Aquest és el algoritme suggerit perquè\n"
+"la comprovació de signatures DSA és molt més ràpida que les d'ElGamal.\n"
 "\n"
-"ElGamal �s un algorisme que es pot utilitzar per a signatures i xifratge.\n"
-"OpenPGP distingueix entre 2 variants d'aquest algorisme: una de nom�s "
+"ElGamal és un algorisme que es pot utilitzar per a signatures i xifratge.\n"
+"OpenPGP distingueix entre 2 variants d'aquest algorisme: una de només "
 "xifratge\n"
-"i una de signatura+xifratge; en veritat �s el mateix, per� alguns "
-"par�metres\n"
-"han de seleccionar-se d'una manera especial per a crear claus m�s segures\n"
-"per a signatures: aquest programa fa a��, per� altres implementacions\n"
+"i una de signatura+xifratge; en veritat és el mateix, però alguns "
+"paràmetres\n"
+"han de seleccionar-se d'una manera especial per a crear claus més segures\n"
+"per a signatures: aquest programa fa açò, però altres implementacions\n"
 "d'OpenPGP no estan obligades a entendre la variant signatura+xifratge.\n"
 "\n"
-"La primera clau (prim�ria) ha de ser sempre una clau que siga capa� de "
+"La primera clau (primària) ha de ser sempre una clau que siga capaç de "
 "signar;\n"
-"aquesta �s la ra� per la qual la clau de nom�s xifratge ElGamal no "
-"est�\n"
-"disponible en aquest men�."
+"aquesta és la raó per la qual la clau de només xifratge ElGamal no està\n"
+"disponible en aquest menú."
 
 #: g10/helptext.c:92
 msgid ""
@@ -4947,8 +4849,8 @@ msgid ""
 "with them are quite large and very slow to verify."
 msgstr ""
 "Encara que aquestes claus estan definides en RFC2440, no es recomanen\n"
-"perqu� no tots els programes hi poden treballar i perqu� les\n"
-"signatures que generen s�n molt llargues i lentes de verificar."
+"perquè no tots els programes hi poden treballar i perquè les\n"
+"signatures que generen són molt llargues i lentes de verificar."
 
 #: g10/helptext.c:98
 msgid ""
@@ -4956,18 +4858,18 @@ msgid ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
-"En general no �s bona idea utilitzar la mateixa clau per a signar i\n"
-"xifrar. Aquest algoritme nom�s s'hauria d'usar en tasques concretes.\n"
+"En general no és bona idea utilitzar la mateixa clau per a signar i\n"
+"xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n"
 "Si us plau, consulteu al vostre expert en seguretat primer."
 
 #: g10/helptext.c:105
 msgid "Enter the size of the key"
-msgstr "Introdu�u la grand�ria de la clau"
+msgstr "Introduïu la grandària de la clau"
 
 #: 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 "Contesteu �s�� o �no�"
+msgstr "Contesteu «sí» o «no»"
 
 #: g10/helptext.c:119
 msgid ""
@@ -4976,22 +4878,22 @@ msgid ""
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"Introdu�u el valor requerit tal i com es mostra en l'indicatiu.\n"
-"�s possible introduir una data ISO (AAAA-MM-DD) per� no rebreu\n"
-"una bona resposta d'error - en canvi, el sistema tractar� d'interpretar\n"
+"Introduïu el valor requerit tal i com es mostra en l'indicatiu.\n"
+"És possible introduir una data ISO (AAAA-MM-DD) però no rebreu\n"
+"una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
 "el valor donat com un interval."
 
 #: g10/helptext.c:131
 msgid "Enter the name of the key holder"
-msgstr "Introdu�u el nom del propietari de la clau"
+msgstr "Introduïu el nom del propietari de la clau"
 
 #: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
-msgstr "introdu�u una adre�a de correu (opcional per� molt recomanable)"
+msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
 
 #: g10/helptext.c:140
 msgid "Please enter an optional comment"
-msgstr "Introdu�u un comentari opcional"
+msgstr "Introduïu un comentari opcional"
 
 #: g10/helptext.c:145
 msgid ""
@@ -5003,14 +4905,13 @@ msgid ""
 msgstr ""
 "N  canvia el nom.\n"
 "C  canvia el comentari.\n"
-"E  canvia l'adre�a de correu electr�nic.\n"
-"O  continua la generaci� de les claus.\n"
+"E  canvia l'adreça de correu electrònic.\n"
+"O  continua la generació de les claus.\n"
 "Q  ix."
 
 #: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-"Contesteu �s�� (o nom�s �s�) si �s correcte generar la subclau."
+msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau."
 
 #: g10/helptext.c:162
 msgid ""
@@ -5052,65 +4953,60 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"Quan signeu un ID d'usuari d'una clau, primer haur?eu de verificar que la "
+"Quan signeu un ID d'usuari d'una clau, primer hauríeu de verificar que la "
 "clau\n"
-"pertany a la persona esmentada en l'ID d'usuari.  �s �til per a altres "
+"pertany a la persona esmentada en l'ID d'usuari.  És útil per a altres "
 "saber\n"
-"amb quanta cura heu verificat a��.\n"
+"amb quanta cura heu verificat açò.\n"
 "\n"
-"�0� significa que no feu cap declaraci� de amb quanta cura heu "
-"verificat\n"
+"«0» significa que no feu cap declaració de amb quanta cura heu verificat\n"
 "    la clau.\n"
 "\n"
-"�1� significa que creieu que la clau �s de la persona que diu que �s "
-"la\n"
-"    propiet�ria, per� no heu pogut, o no heu verificat la clau de cap "
+"«1» significa que creieu que la clau és de la persona que diu que és la\n"
+"    propietària, però no heu pogut, o no heu verificat la clau de cap "
 "manera.\n"
-"    A�� �s �til per a la verificaci� d'un �rol�, quan signeu "
-"la clau d'un\n"
-"    usuari amb pseud�nim.\n"
+"    Açò és útil per a la verificació d'un «rol», quan signeu la clau d'un\n"
+"    usuari amb pseudònim.\n"
 "\n"
-"�2� significa que heu fet algunes comprovacions de la clau. Per exemple, "
-"a��\n"
+"«2» significa que heu fet algunes comprovacions de la clau. Per exemple, "
+"açò\n"
 "    pot significar que heu verificat la emprenta digital de la clau i "
 "verificat\n"
 "    l'ID d'usuari en la clau amb el photo ID.\n"
 "\n"
-"�3� significa que heu fet una verificaci� exhaustiva de la clau. Per "
+"«3» significa que heu fet una verificació exhaustiva de la clau. Per "
 "exemple,\n"
-"    a�� pot significar que heu verificat la emprenta digital amb el "
+"    açò pot significar que heu verificat la emprenta digital amb el "
 "propietari\n"
-"    de la clau en persona, i que heu comprovat, mitjan�ant un document "
-"dif�cil\n"
+"    de la clau en persona, i que heu comprovat, mitjançant un document "
+"difícil\n"
 "    de falsificar amb photo ID (com un passaport) que el nom del propietari\n"
 "    coincideix amb el nom de l'ID d'usuari en la clau, i finalment que heu\n"
-"    verificat (per intercanvi de correu) que l'adre�a de correu en la "
-"clau\n"
+"    verificat (per intercanvi de correu) que l'adreça de correu en la clau\n"
 "    pertany al propietari de la clau.\n"
 "\n"
 "Teniu en compte que els exemples donats anteriorment per als nivels 2 i 3 "
-"s�n\n"
-"*nom�s* exemples. Al final, �s cosa vostra decidir qu� significa "
-"�alguna� i\n"
-"�exhaustiva� per a vosaltres quan voleu signar altres claus.\n"
+"són\n"
+"*només* exemples. Al final, és cosa vostra decidir què significa «alguna» i\n"
+"«exhaustiva» per a vosaltres quan voleu signar altres claus.\n"
 "\n"
-"Si no sabeu quina �s la resposta correcta, contesteu �0�."
+"Si no sabeu quina és la resposta correcta, contesteu «0»."
 
 #: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
-msgstr "Contesteu �s�� si voleu signar TOTS els ID d'usuari"
+msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
 
 #: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"Contesteu �s�� si realment voleu eliminar aquest ID d'usuari.\n"
-"Tots els certificats tamb� es perdran!"
+"Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
+"Tots els certificats també es perdran!"
 
 #: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Contesteu �s�� si �s correcte eliminar la subclau"
+msgstr "Contesteu «sí» si és correcte eliminar la subclau"
 
 #: g10/helptext.c:214
 msgid ""
@@ -5118,9 +5014,9 @@ msgid ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"Aquesta �s una signatura v�lida en la clau; normalment no voldreu\n"
-"eliminar aquesta signatura perqu� pot ser important per a establir\n"
-"una connexi� de confian�a a la clau o a un altra clau certificada\n"
+"Aquesta és una signatura vàlida en la clau; normalment no voldreu\n"
+"eliminar aquesta signatura perquè pot ser important per a establir\n"
+"una connexió de confiança a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
 #: g10/helptext.c:219
@@ -5130,11 +5026,10 @@ msgid ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Aquesta signatura no es pot comprovar perqu� no teniu la clau\n"
-"corresponent. Haur�eu de posposar la seua eliminaci� fins que\n"
+"Aquesta signatura no es pot comprovar perquè no teniu la clau\n"
+"corresponent. Hauríeu de posposar la seua eliminació fins que\n"
 "sapieu quina clau es va utilitzar ja que aquesta clau de signatura\n"
-"podria establir una connexi� de confian�a a trav�s d'una altra clau "
-"ja\n"
+"podria establir una connexió de confiança a través d'una altra clau ja\n"
 "certificada."
 
 #: g10/helptext.c:225
@@ -5142,7 +5037,7 @@ msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
-"La signatura no �s v�lida. T� sentit que l'elimineu de l'anell\n"
+"La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
 "de claus."
 
 #: g10/helptext.c:229
@@ -5153,11 +5048,10 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"Aquesta �s una signatura que enlla�a l'ID de l'usuari amb la clau.\n"
-"Normalment no �s una bona idea eliminar una signatura com aquesta.\n"
-"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, aix�\n"
-"que feu a�� nom�s si l'autosignatura no �s v�lida per alguna ra� "
-"i\n"
+"Aquesta és una signatura que enllaça l'ID de l'usuari amb la clau.\n"
+"Normalment no és una bona idea eliminar una signatura com aquesta.\n"
+"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, així\n"
+"que feu açò només si l'autosignatura no és vàlida per alguna raó i\n"
 "hi ha una segona disponible."
 
 #: g10/helptext.c:237
@@ -5166,18 +5060,18 @@ msgid ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"Canvia les prefer�ncies de tots els ID d'usuari (o nom�s els dels "
+"Canvia les preferències de tots els ID d'usuari (o només els dels "
 "seleccionats)\n"
-"a la llista actual de prefer�ncies. Les marques de temps de totes les\n"
-"autosignatures afectades s'avan�aran un segon.\n"
+"a la llista actual de preferències. Les marques de temps de totes les\n"
+"autosignatures afectades s'avançaran un segon.\n"
 
 #: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Introdu�u la contrasenya; aquesta ha de ser una frase secreta \n"
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
 #: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Per favor, repetiu l'�ltima contrasenya per confirmar-la."
+msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
 
 #: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
@@ -5185,15 +5079,15 @@ msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
 
 #: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Contesteu �s�� si �s correcte sobreescriure el fitxer"
+msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
 
 #: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"Introdu�u un nom de fitxer. Si premeu RETORN s'hi usar� el fitxer\n"
-"predeterminat (apareix entre claud�tors)."
+"Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
+"predeterminat (apareix entre claudàtors)."
 
 #: g10/helptext.c:270
 msgid ""
@@ -5210,21 +5104,19 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-"Haur�eu d'especificar una ra� per a la certificaci�. Depenent del\n"
+"Hauríeu d'especificar una raó per a la certificació. Depenent del\n"
 "context teniu l'habilitat de triar d'aquesta llista:\n"
-"  �La clau ha estat compromesa�\n"
-"      Utilitzeu a�� si teniu alguna ra� per creure que persones no\n"
-"      autoritzades han tingut acc�s a la vostra clau secreta.\n"
-"  �La clau ha estat reempla�ada�\n"
-"      Utilitzeu a�� si heu reempla�at aquesta clau amb una m�s "
-"nova.\n"
-"  �La clau ja no est� en �s�\n"
-"      Utilitzeu a�� si heu retirat aquesta clau.\n"
-"  �L'ID de l'usuari ja no �s v�lid�\n"
-"      Utilitzeu a�� per a constatar que l'ID de l'usuari no s'hauria\n"
-"      d'utilitzar m�s; a�� s'utilitza normalment per a marcar una "
-"adre�a\n"
-"      de correu com a inv�lida.\n"
+"  «La clau ha estat compromesa»\n"
+"      Utilitzeu açò si teniu alguna raó per creure que persones no\n"
+"      autoritzades han tingut accés a la vostra clau secreta.\n"
+"  «La clau ha estat reemplaçada»\n"
+"      Utilitzeu açò si heu reemplaçat aquesta clau amb una més nova.\n"
+"  «La clau ja no està en ús»\n"
+"      Utilitzeu açò si heu retirat aquesta clau.\n"
+"  «L'ID de l'usuari ja no és vàlid»\n"
+"      Utilitzeu açò per a constatar que l'ID de l'usuari no s'hauria\n"
+"      d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n"
+"      de correu com a invàlida.\n"
 
 #: g10/helptext.c:286
 msgid ""
@@ -5232,9 +5124,9 @@ msgid ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
-"Si voleu podeu introduir un text que descriga per qu� expediu aquest\n"
-"certificat de revocaci�. Per favor, sigueu concisos.\n"
-"Una l�nia buida indica el final del text.\n"
+"Si voleu podeu introduir un text que descriga per què expediu aquest\n"
+"certificat de revocació. Per favor, sigueu concisos.\n"
+"Una línia buida indica el final del text.\n"
 
 #: g10/helptext.c:301
 msgid "No help available"
@@ -5248,31 +5140,31 @@ msgstr "No hi ha ajuda disponible per a `%s'"
 #: g10/keydb.c:185
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "error en crear l'anell �%s�: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
 
 #: g10/keydb.c:192
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "s'ha creat l'anell �%s?\n"
+msgstr "s'ha creat l'anell «%s»\n"
 
 #: g10/keydb.c:582
 #, 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"
+msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
 #: g10/keyring.c:1226
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "AV�S: hi ha 2 fitxers amb informaci� confidencial.\n"
+msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
 #: g10/keyring.c:1228
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s �s el que no ha canviat\n"
+msgstr "%s és el que no ha canviat\n"
 
 #: g10/keyring.c:1229
 #, c-format
 msgid "%s is the new one\n"
-msgstr "%s �s el nou\n"
+msgstr "%s és el nou\n"
 
 #: g10/keyring.c:1230
 msgid "Please fix this possible security flaw\n"
@@ -5281,7 +5173,7 @@ msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 #: g10/keyring.c:1350
 #, c-format
 msgid "checking keyring `%s'\n"
-msgstr "s'est� comprovant l'anell �%s�\n"
+msgstr "s'està comprovant l'anell «%s»\n"
 
 #: g10/keyring.c:1388
 #, c-format
@@ -5312,19 +5204,18 @@ msgstr ""
 "\n"
 "Seleccioneu una imatge per a utilitzarla en el vostre photo ID. La imatge\n"
 "ha de ser un fitxer JPEG. Recordeu que la imatge es desa dins de la vostra\n"
-"clau p�blica. Si utilitzeu una foto molt gran, la vostra clau tamb� es "
-"far�\n"
+"clau pública. Si utilitzeu una foto molt gran, la vostra clau també es farà\n"
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
 #: g10/photoid.c:79
 msgid "Enter JPEG filename for photo ID: "
-msgstr "Introdu�u el nom del fitxer JPEG per al photo ID: "
+msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
 #: g10/photoid.c:87
 #, c-format
 msgid "Unable to open photo \"%s\": %s\n"
-msgstr "No s'ha pogut obrir la foto �%s�: %s\n"
+msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
 #: g10/photoid.c:97
 msgid "Are you sure you want to use it (y/N)? "
@@ -5333,25 +5224,25 @@ msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 #: g10/photoid.c:112
 #, c-format
 msgid "\"%s\" is not a JPEG file\n"
-msgstr "�%s� no �s un fitxer JPEG\n"
+msgstr "«%s» no és un fitxer JPEG\n"
 
 #: g10/photoid.c:129
 msgid "Is this photo correct (y/N/q)? "
-msgstr "�s aquesta foto correcta (s/N/x)? "
+msgstr "És aquesta foto correcta (s/N/x)? "
 
 #: g10/photoid.c:331
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-# Execuci� de programes remots, o execuci� remota de programes? jm
+# Execució de programes remots, o execució remota de programes? jm
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
-msgstr "no hi ha suport per a l'execuci� remota de programes\n"
+msgstr "no hi ha suport per a l'execució remota de programes\n"
 
 #: g10/exec.c:184
 #, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "no es pot crear el directori �%s�: %s\n"
+msgstr "no es pot crear el directori «%s»: %s\n"
 
 #: g10/exec.c:325
 msgid ""
@@ -5366,20 +5257,19 @@ msgstr ""
 "aquesta plataforma necessita fitxers temporals quan es crida a programes "
 "externs\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
-msgstr "no s'ha pogut executar %s �%s�: %s\n"
+msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
 #: g10/exec.c:513
 #, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "s'ha produ�t un error del sistema en cridar el programa extern: %s\n"
+msgstr "s'ha produït un error del sistema en cridar el programa extern: %s\n"
 
 #: g10/exec.c:524 g10/exec.c:583
 msgid "unnatural exit of external program\n"
-msgstr "s'ha produ�t una eixida no natural del programa extern\n"
+msgstr "s'ha produït una eixida no natural del programa extern\n"
 
 #: g10/exec.c:539
 msgid "unable to execute external program\n"
@@ -5393,12 +5283,12 @@ msgstr "no s'ha pogut llegir la resposta del programa extern: %s\n"
 #: g10/exec.c:594 g10/exec.c:601
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
-msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n"
+msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
 #: g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr "AV�S: no s'ha pogut eliminar el directori temporal �%s�: %s\n"
+msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
 #: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341
 msgid "never     "
@@ -5417,11 +5307,11 @@ msgstr "ha fallat build_packet: %s\n"
 #: g10/revoke.c:145
 #, c-format
 msgid "key %08lX incomplete\n"
-msgstr "la clau %08lX �s incompleta\n"
+msgstr "la clau %08lX és incompleta\n"
 
 #: g10/revoke.c:214 g10/revoke.c:433
 msgid "sorry, can't do this in batch mode\n"
-msgstr "no es pot fet aix� en mode desat�s\n"
+msgstr "no es pot fet això en mode desatès\n"
 
 #: g10/revoke.c:281
 msgid "To be revoked by:\n"
@@ -5429,54 +5319,52 @@ msgstr "A ser revocada per:\n"
 
 #: g10/revoke.c:293
 msgid "(This is a sensitive revocation key)\n"
-msgstr "(Aquesta �s una clau de revocaci� sensible)\n"
+msgstr "(Aquesta és una clau de revocació sensible)\n"
 
 #: g10/revoke.c:297 g10/revoke.c:503
 msgid "Create a revocation certificate for this key? "
-msgstr "Voleu crear un certificat de revocaci� per a aquesta clau? "
+msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
 #: g10/revoke.c:310 g10/revoke.c:534
 msgid "ASCII armored output forced.\n"
-msgstr "s'ha for�at l'eixida d'armadura ASCII.\n"
+msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
 #: g10/revoke.c:324 g10/revoke.c:548
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
-msgstr "S'ha creat el certificat de revocaci�.\n"
+msgstr "S'ha creat el certificat de revocació.\n"
 
 #: g10/revoke.c:393
 #, c-format
 msgid "no revocation keys found for `%s'\n"
-msgstr "no s'han ttrobat claus de revocaci� per a �%s�\n"
+msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
 #: g10/revoke.c:447
 #, c-format
 msgid "secret key `%s' not found: %s\n"
-msgstr "no s'ha trobat la clau secreta �%s�: %s\n"
+msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
 #: g10/revoke.c:485
 #, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "no hi ha cap clau p�blica corresponent: %s\n"
+msgstr "no hi ha cap clau pública corresponent: %s\n"
 
 #: g10/revoke.c:496
 msgid "public key does not match secret key!\n"
-msgstr "la clau p�blica no coincideix amb la clau secreta!\n"
+msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
 #: g10/revoke.c:519
 msgid "unknown protection algorithm\n"
-msgstr "l'algorisme de protecci� �s desconegut\n"
+msgstr "l'algorisme de protecció és desconegut\n"
 
 #: g10/revoke.c:523
 msgid "NOTE: This key is not protected!\n"
-msgstr "NOTA: Aquesta clau no est� protegida!\n"
+msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5487,46 +5375,45 @@ msgid ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 msgstr ""
-"S'ha creat un certificat de revocaci�.\n"
+"S'ha creat un certificat de revocació.\n"
 "\n"
 "Si us plau, mogueu-lo a un medi que pugueu amagar; si Mallory aconsegueix\n"
-"acc�s a aquest certificat pot utilitzar-lo per a fer la vostra clau\n"
-"inservible. �s intel�ligent imprimir aquest certificat i amagar-lo, per\n"
-"si el vostre medi es torna illegible. Per� aneu amb compte: el sistema\n"
-"d'impressi� de la vostra m�quina podria emmagatzemar les dades i fer-"
-"les\n"
+"accés a aquest certificat pot utilitzar-lo per a fer la vostra clau\n"
+"inservible. És intel·ligent imprimir aquest certificat i amagar-lo, per\n"
+"si el vostre medi es torna illegible. Però aneu amb compte: el sistema\n"
+"d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
 #: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
-msgstr "Seleccioneu la ra� de la revocaci�:\n"
+msgstr "Seleccioneu la raó de la revocació:\n"
 
 #: g10/revoke.c:625
 msgid "Cancel"
-msgstr "Cancel�la"
+msgstr "Cancel·la"
 
 #: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "(Segurament voleu seleccionar %d ac�)\n"
+msgstr "(Segurament voleu seleccionar %d ací)\n"
 
 #: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
-"Introdu�u una descripci� opcional; finalitzeu amb una l�nia en blanc:\n"
+"Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
 #: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "Ra� de la revocaci�: %s\n"
+msgstr "Raó de la revocació: %s\n"
 
 #: g10/revoke.c:698
 msgid "(No description given)\n"
-msgstr "(No es va donar una descripci�)\n"
+msgstr "(No es va donar una descripció)\n"
 
 #: g10/revoke.c:703
 msgid "Is this okay? "
-msgstr "�s a�� correcte? "
+msgstr "És açò correcte? "
 
 #: g10/tdbdump.c:104
 #, c-format
@@ -5534,8 +5421,8 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# Llista de valors de confian�a assignats, creat el %s\n"
-"# (Utilitzeu �gpg --import-ownertrust� per a restaurar-les)\n"
+"# Llista de valors de confiança assignats, creat el %s\n"
+"# (Utilitzeu «gpg --import-ownertrust» per a restaurar-les)\n"
 
 #: g10/tdbdump.c:140
 #, c-format
@@ -5544,7 +5431,7 @@ msgstr "no es pot obrir el fitxer: %s\n"
 
 #: g10/tdbdump.c:151
 msgid "line too long\n"
-msgstr "la l�nia �s massa llarga\n"
+msgstr "la línia és massa llarga\n"
 
 #: g10/tdbdump.c:159
 msgid "error: missing colon\n"
@@ -5552,17 +5439,16 @@ msgstr "error: falten dos punts\n"
 
 #: g10/tdbdump.c:164
 msgid "error: invalid fingerprint\n"
-msgstr "error: l'empremta digital �s inv�lida\n"
+msgstr "error: l'empremta digital és invàlida\n"
 
 #: g10/tdbdump.c:168
 msgid "error: no ownertrust value\n"
-msgstr "error: no hi ha cap valor de confian�a\n"
+msgstr "error: no hi ha cap valor de confiança\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
-msgstr "error en trobar el registre de confian�a: %s\n"
+msgstr "error en trobar el registre de confiança: %s\n"
 
 #: g10/tdbdump.c:208
 #, c-format
@@ -5578,46 +5464,44 @@ msgstr "error de lectura: %s\n"
 #~ "also\n"
 #~ "very slow, and may not be as secure as the other choices.\n"
 #~ msgstr ""
-#~ "L'�s d'aquest algorisme nom�s est� suportat per GnuPG. No podreu "
+#~ "L'ús d'aquest algorisme només està suportat per GnuPG. No podreu "
 #~ "utilitzar aquesta clau per a comunicar-vos amb usuaris de PGP. Aquest "
-#~ "algorisme tamb� �s molt lent, i potser no �s tan segur com les "
-#~ "altres alternatives.\n"
+#~ "algorisme també és molt lent, i potser no és tan segur com les altres "
+#~ "alternatives.\n"
 
 #~ msgid "Create anyway? "
 #~ msgstr "Voleu crear la clau de tota manera? "
 
 #~ msgid "invalid symkey algorithm detected (%d)\n"
-#~ msgstr "algoritme de clau sim�tric inv�lid detectat (%d)\n"
+#~ msgstr "algoritme de clau simètric invàlid detectat (%d)\n"
 
 #~ msgid "this keyserver is not fully HKP compatible\n"
-#~ msgstr "aquest servidor de clau no �s completament compatible amb HKP\n"
+#~ msgstr "aquest servidor de clau no és completament compatible amb HKP\n"
 
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr ""
-#~ "L'�s d'aquest algoritme est� desaconsellat - el voleu crear "
-#~ "igualment? "
+#~ "L'ús d'aquest algoritme està desaconsellat - el voleu crear igualment? "
 
 #~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NOM=VALOR|usa aquesta notaci� de dades"
+#~ msgstr "|NOM=VALOR|usa aquesta notació de dades"
 
 #~ msgid ""
 #~ "the first character of a notation name must be a letter or an underscore\n"
 #~ msgstr ""
-#~ "el primer car�cter de la notaci� ha de ser una lletra o un "
-#~ "subratllat\n"
+#~ "el primer caràcter de la notació ha de ser una lletra o un subratllat\n"
 
 #~ msgid "dots in a notation name must be surrounded by other characters\n"
-#~ msgstr "els punts han d'estar envoltats per altres car�cters\n"
+#~ msgstr "els punts han d'estar envoltats per altres caràcters\n"
 
 #~ msgid ""
 #~ "WARNING: This key already has a photo ID.\n"
 #~ "         Adding another photo ID may confuse some versions of PGP.\n"
 #~ msgstr ""
-#~ "AV�S: Aquesta clau ja te un photo ID.\n"
+#~ "AVÍS: Aquesta clau ja te un photo ID.\n"
 #~ "        Afegir un altre photo ID pot confondre algunes versions de PGP.\n"
 
 #~ msgid "You may only have one photo ID on a key.\n"
-#~ msgstr "Nom�s podeu tenir un photo ID en una clau.\n"
+#~ msgstr "Només podeu tenir un photo ID en una clau.\n"
 
 #~ msgid "Fingerprint:"
 #~ msgstr "Empremta digital:"
@@ -5630,13 +5514,13 @@ msgstr "error de lectura: %s\n"
 #~ "heu d'executar GnuPG de nou per que puga llegir el nou fitxer d'opcions\n"
 
 #~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "no s'han pogut canviar els permissos de �%s�: %s\n"
+#~ msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
 
 #~ msgid "too many random bits requested; the limit is %d\n"
-#~ msgstr "massa bits aleatoris sol�licitats; el l�mit �s %d\n"
+#~ msgstr "massa bits aleatoris sol·licitats; el límit és %d\n"
 
 #~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NOMS]|comprova la base de dades de confian�a"
+#~ msgstr "|[NOMS]|comprova la base de dades de confiança"
 
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key user-id"
@@ -5648,7 +5532,7 @@ msgstr "error de lectura: %s\n"
 #~ msgstr "--delete-secret-and-public-key user-id"
 
 #~ msgid "For info see http://www.gnupg.org"
-#~ msgstr "Si voleu m�s informaci� vegeu http://www.gnupg.org"
+#~ msgstr "Si voleu més informació vegeu http://www.gnupg.org"
 
 #~ msgid "sSmMqQ"
 #~ msgstr "sSmMqQ"
@@ -5658,46 +5542,43 @@ msgstr "error de lectura: %s\n"
 #~ "can assign some missing owner trust values.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'ha trobat un cam� de confian�a v�lid a la clau. Vegem si "
-#~ "podem\n"
-#~ "assignar valors de confian�a no assignats.\n"
+#~ "No s'ha trobat un camí de confiança vàlid a la clau. Vegem si podem\n"
+#~ "assignar valors de confiança no assignats.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "No path leading to one of our keys found.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'ha trobat un cam� que condueixe a una de les nostres claus.\n"
+#~ "No s'ha trobat un camí que condueixe a una de les nostres claus.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "No certificates with undefined trust found.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'han trobat certificats amb confian�a no definida.\n"
+#~ "No s'han trobat certificats amb confiança no definida.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'ha canviat cap valor de confian�a.\n"
+#~ "No s'ha canviat cap valor de confiança.\n"
 #~ "\n"
 
 #~ msgid "%08lX: no info to calculate a trust probability\n"
 #~ msgstr ""
-#~ "%08lX: no hi ha informaci� per a calcular una probabilitat de "
-#~ "confian�a\n"
+#~ "%08lX: no hi ha informació per a calcular una probabilitat de confiança\n"
 
 #~ msgid "Enter the user ID: "
-#~ msgstr "Introdu�u el nom d'usuari: "
+#~ msgstr "Introduïu el nom d'usuari: "
 
 #~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr ""
-#~ "es descarta: la clau p�blica ja s'ha especificat amb --encrypt-to\n"
+#~ msgstr "es descarta: la clau pública ja s'ha especificat amb --encrypt-to\n"
 
 #~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: error en la comprovaci� de la clau: %s\n"
+#~ msgstr "%s: error en la comprovació de la clau: %s\n"
 
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Segur que voleu crear una clau de signatura i xifratge? "
@@ -5713,30 +5594,28 @@ msgstr "error de lectura: %s\n"
 
 #~ msgid "too many entries in unk cache - disabled\n"
 #~ msgstr ""
-#~ "massa entrades en la mem�ria cau de claus desconegudes - desactivada\n"
+#~ "massa entrades en la memòria cau de claus desconegudes - desactivada\n"
 
 #~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
 #~ msgstr "clau secreta %08lX no importada (utilitzeu %s per a permitir-ho)\n"
 
 #~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "clau %08lX: la nostra c�pia no t� autosignatura\n"
+#~ msgstr "clau %08lX: la nostra còpia no té autosignatura\n"
 
 #~ msgid "%s: user not found\n"
 #~ msgstr "%s: no s'ha trobat l'usuari\n"
 
 #~ msgid "update of trustdb failed: %s\n"
-#~ msgstr ""
-#~ "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n"
+#~ msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
 #~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr ""
-#~ "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
+#~ msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
 #~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: no �s un ID v�lid\n"
+#~ msgstr "%s: no és un ID vàlid\n"
 
 #~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr "es suposa MDC erroni a causa d'un bit cr�tic desconegut\n"
+#~ msgstr "es suposa MDC erroni a causa d'un bit crític desconegut\n"
 
 #~ msgid "error reading dir record for LID %lu: %s\n"
 #~ msgstr "error al llegir el registre de directori per al LID %lu: %s\n"
@@ -5745,63 +5624,63 @@ msgstr "error de lectura: %s\n"
 #~ msgstr "lid %lu: s'esperava registre de directori, s'ha obtingut %d\n"
 
 #~ msgid "no primary key for LID %lu\n"
-#~ msgstr "no hi ha una clau prim�ria per al LID %lu\n"
+#~ msgstr "no hi ha una clau primària per al LID %lu\n"
 
 #~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr "error al llegir clau prim�ria per al LID %lu: %s\n"
+#~ msgstr "error al llegir clau primària per al LID %lu: %s\n"
 
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "clau %08lX: la consulta del registre ha fallat\n"
 
 #~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian�a\n"
+#~ msgstr "clau %08lX: ja es troba en la taula de claus de confiança\n"
 
 #~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "NOTE: la clau secreta %08lX no est� protegida.\n"
+#~ msgstr "NOTE: la clau secreta %08lX no està protegida.\n"
 
 #~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n"
+#~ msgstr "clau %08lX: les claus pública i secreta no coincideixen\n"
 
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n"
+#~ msgstr "clau %08lX.%lu: Enllaç de subclau correcta\n"
 
 #~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "clau %08lX.%lu: Enlla� de subclau inv�lid: %s\n"
+#~ msgstr "clau %08lX.%lu: Enllaç de subclau invàlid: %s\n"
 
 #~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "clau %08lX.%lu: Revocaci� de clau v�lida\n"
+#~ msgstr "clau %08lX.%lu: Revocació de clau vàlida\n"
 
 #~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "clau %08lX.%lu: Revocaci� de clau inv�lida: %s\n"
+#~ msgstr "clau %08lX.%lu: Revocació de clau invàlida: %s\n"
 
 #~ msgid "Good self-signature"
 #~ msgstr "Auto-signatura correcta"
 
 #~ msgid "Invalid self-signature"
-#~ msgstr "Auto-signatura inv�lida"
+#~ msgstr "Auto-signatura invàlida"
 
 #~ msgid "Valid user ID revocation skipped due to a newer self signature"
 #~ msgstr ""
-#~ "Es descarta una revocaci� d'ID d'usuari v�lida degut a una "
-#~ "autosignatura m�s recent"
+#~ "Es descarta una revocació d'ID d'usuari vàlida degut a una autosignatura "
+#~ "més recent"
 
 #~ msgid "Valid user ID revocation"
-#~ msgstr "Revocaci� d'ID d'usuari v�lida"
+#~ msgstr "Revocació d'ID d'usuari vàlida"
 
 #~ msgid "Invalid user ID revocation"
-#~ msgstr "Revocaci� d'ID d'usuari inv�lida"
+#~ msgstr "Revocació d'ID d'usuari invàlida"
 
 #~ msgid "Valid certificate revocation"
-#~ msgstr "Certificat de revocaci� v�lid"
+#~ msgstr "Certificat de revocació vàlid"
 
 #~ msgid "Good certificate"
 #~ msgstr "Certificat correcte"
 
 #~ msgid "Invalid certificate revocation"
-#~ msgstr "Certificat de revocaci� inv�lid"
+#~ msgstr "Certificat de revocació invàlid"
 
 #~ msgid "Invalid certificate"
-#~ msgstr "Certificat inv�lid"
+#~ msgstr "Certificat invàlid"
 
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n"
@@ -5813,10 +5692,10 @@ msgstr "error de lectura: %s\n"
 #~ msgstr "tdbio_search_dir ha fallat: %s\n"
 
 #~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: la inserci� ha fallat: %s\n"
+#~ msgstr "lid ?: la inserció ha fallat: %s\n"
 
 #~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: la inserci� ha fallat: %s\n"
+#~ msgstr "lid %lu: la inserció ha fallat: %s\n"
 
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: inserit\n"
@@ -5831,7 +5710,7 @@ msgstr "error de lectura: %s\n"
 #~ msgstr "lid %lu: registre de directori sense clau - es descarta\n"
 
 #~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\\t%lu degut a noves claus p�bliques\n"
+#~ msgstr "\\t%lu degut a noves claus públiques\n"
 
 #~ msgid "\t%lu keys skipped\n"
 #~ msgstr "\t%lu claus es descarta\n"
@@ -5850,11 +5729,10 @@ msgstr "error de lectura: %s\n"
 
 #~ msgid "key %08lX: insert trust record failed: %s\n"
 #~ msgstr ""
-#~ "clau %08lX: ha fallat la inserci� en la base de dades de confian�a: %"
-#~ "s\n"
+#~ "clau %08lX: ha fallat la inserció en la base de dades de confiança: %s\n"
 
 #~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian�a\n"
+#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confiança\n"
 
 #~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 #~ msgstr ""
@@ -5865,30 +5743,26 @@ msgstr "error de lectura: %s\n"
 #~ msgstr "clau %08lX.%lu: caducada el %s\n"
 
 #~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "clau %08lX.%lu: ha fallat la verificaci� de confian�a: %s\n"
+#~ msgstr "clau %08lX.%lu: ha fallat la verificació de confiança: %s\n"
 
 #~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr ""
-#~ "problema al cercar �%s� en la base de dades de confian�a: %s\n"
+#~ msgstr "problema al cercar «%s» en la base de dades de confiança: %s\n"
 
 #~ msgid "user '%s' not in trustdb - inserting\n"
 #~ msgstr ""
-#~ "l'usuari �%s� no est� en la base de dades de confian�a - inserint-"
-#~ "lo\n"
+#~ "l'usuari «%s» no està en la base de dades de confiança - inserint-lo\n"
 
 #~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr ""
-#~ "no s'ha pogut posar �%s� en la base de dades de confian�a - %s\n"
+#~ msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
 
 #~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr ""
-#~ "AV�S: encara no es poden manejar registres de pref�ncies llargs\n"
+#~ msgstr "AVÍS: encara no es poden manejar registres de prefències llargs\n"
 
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: no s'ha creat l'anell: %s\n"
 
 #~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "No es poden usar claus RSA en aquesta versi�\n"
+#~ msgstr "No es poden usar claus RSA en aquesta versió\n"
 
 #~ msgid "No key for user ID\n"
 #~ msgstr "No hi ha clau per a l'usuari\n"
@@ -5897,7 +5771,7 @@ msgstr "error de lectura: %s\n"
 #~ msgstr "No hi ha usuari per a la clau\n"
 
 #~ msgid "invalid"
-#~ msgstr "inv�lida"
+#~ msgstr "invàlida"
 
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "no hi ha clau secreta disponible per al desxifratge\n"
diff --git a/po/cs.po b/po/cs.po
index c41ff4955..a2d342de8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-07 16:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -29,7 +29,6 @@ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ano"
@@ -38,7 +37,6 @@ msgstr "ano"
 msgid "yY"
 msgstr "aAyY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ne"
@@ -47,7 +45,6 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "ukon�it"
@@ -252,7 +249,6 @@ msgstr "neza�ifrov�no"
 msgid "not processed"
 msgstr "nezpracov�no"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "nepou�iteln� ve�ejn� kl��"
@@ -751,19 +747,19 @@ msgstr "|N|pou��t komprima�n� algoritmus N"
 msgid "throw keyid field of encrypted packets"
 msgstr "zahodit identifik�tor kl��e z �ifrovan�ch paket�"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Zobrazit fotografick� ID"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazovat fotografick� ID"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Nastavit p��kazov� ��dek k prohl��en� fotografick�ho ID"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -771,7 +767,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -789,17 +785,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -809,7 +805,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -817,379 +813,379 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = podpis nalezen v definici skupiny \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
 
 # c-format
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nen� platn� znakov� sada\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "komprima�n� algoritmus `%s' je v tomto release read-only\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "komprima�n� algoritmus mus� b�t v rozmez� %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u�ivatele"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u�ivatele"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:2623 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 "nelze otev��t %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:2937 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 "nelze otev��t `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1197,19 +1193,19 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
@@ -1336,7 +1332,6 @@ msgstr "d�vod pro revokaci: "
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
@@ -1391,7 +1386,6 @@ msgstr " %d = D�v��uji �pln�\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = pros�m o v�ce informac�\n"
@@ -1707,14 +1701,6 @@ msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost je 768 bit�.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1799,7 +1785,6 @@ msgstr "neplatn� hodnota\n"
 msgid "%s does not expire at all\n"
 msgstr "platnost %s neskon��\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2123,7 +2108,6 @@ msgstr "kl�� %08lX: nen� chr�n�n� - p�esko�eno\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kl�� %08lX: PGP 2.x kl�� - p�esko�eno\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2137,8 +2121,6 @@ msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User ID not found]"
@@ -2371,7 +2353,6 @@ msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "kl�� %08lX: tajn� kl�� importov�n\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2611,8 +2592,6 @@ msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2967,7 +2946,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "smazat identifik�tor u�ivatele"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3265,8 +3243,6 @@ msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 msgid " (sensitive)"
 msgstr "(citliv� informace)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3392,9 +3368,6 @@ msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
@@ -3487,7 +3460,6 @@ msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
@@ -3528,10 +3500,6 @@ msgstr "neexistuje tajn� kl��\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3596,7 +3564,6 @@ msgstr " Prim�rn� fingerprint kl��e:"
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "   Fingerprint kl��e ="
@@ -3606,8 +3573,6 @@ msgstr "   Fingerprint kl��e ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3724,7 +3689,6 @@ msgstr "Politika: "
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
@@ -3735,10 +3699,6 @@ msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpis vytvo�en %.*s pomoc� kl��e %s s ID u�ivatele %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
@@ -4504,9 +4464,6 @@ msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i  %08lX nebyl nalezen\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4556,7 +4513,6 @@ msgstr ""
 "p�esko�en `%s': toto je vygenerovan� PGP kl�� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5140,7 +5096,6 @@ msgstr ""
 "na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
 "do�asn� soubory (temp files)\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5218,7 +5173,6 @@ msgstr "na��zen v�stup do form�tu ASCII.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
@@ -5250,7 +5204,6 @@ msgstr "nezn�m� kompresn� algoritmus\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5330,7 +5283,6 @@ msgstr "chyba: neplatn� fingerprint\n"
 msgid "error: no ownertrust value\n"
 msgstr "chyba: sch�z� hodnota d�v�ryhodnosti\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/da.po b/po/da.po
index 3a0086c62..4d4f21ddb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -33,7 +33,6 @@ msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
@@ -42,7 +41,6 @@ msgstr "ja"
 msgid "yY"
 msgstr "jJ"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n"
@@ -51,7 +49,6 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "afslut"
@@ -256,7 +253,6 @@ msgstr "ikke krypteret"
 msgid "not processed"
 msgstr "ikke bearbejdet"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 #, fuzzy
 msgid "unusable public key"
@@ -747,25 +743,25 @@ msgstr "|N|brug kompresalgoritme N"
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -785,16 +781,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -804,7 +800,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -812,402 +808,402 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr ""
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:2623 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 ikke �bne %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:2937 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 ikke �bne `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1336,7 +1332,6 @@ msgstr "rev- forkert n�gletilbagekald\n"
 msgid "revocation comment: "
 msgstr ""
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr ""
@@ -1387,7 +1382,6 @@ msgstr ""
 msgid " %d = I trust ultimately\n"
 msgstr ""
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr ""
@@ -1695,14 +1689,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1772,7 +1758,6 @@ msgstr "ugyldig v�rdi\n"
 msgid "%s does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
@@ -2072,7 +2057,6 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2086,8 +2070,6 @@ msgstr "ADVARSEL: intet blev eksporteret\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 #, fuzzy
 msgid "[User id not found]"
@@ -2317,7 +2299,6 @@ msgstr "ingen standard offentlig n�glering\n"
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2545,8 +2526,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2882,7 +2861,6 @@ msgstr "sletbid"
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr ""
@@ -3193,8 +3171,6 @@ msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 msgid " (sensitive)"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3317,9 +3293,6 @@ msgstr "Indtast n�glens st�rrelse"
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3411,7 +3384,6 @@ msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr ""
@@ -3453,10 +3425,6 @@ msgstr ""
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3524,7 +3492,6 @@ msgstr "             Fingeraftryk:"
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 #, fuzzy
 msgid "     Key fingerprint ="
@@ -3535,8 +3502,6 @@ msgstr "             Fingeraftryk:"
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3649,7 +3614,6 @@ msgstr "Politik: "
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
@@ -3660,10 +3624,6 @@ msgstr "opret en separat signatur"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4409,9 +4369,6 @@ msgstr ""
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4455,7 +4412,6 @@ msgid ""
 "signatures!\n"
 msgstr ""
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4923,7 +4879,6 @@ msgstr ""
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5002,7 +4957,6 @@ msgstr ""
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 #, fuzzy
 msgid "Revocation certificate created.\n"
@@ -5037,7 +4991,6 @@ msgstr "ukendt kompressionsalgoritme"
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5111,7 +5064,6 @@ msgstr "fejl i trailerlinie\n"
 msgid "error: no ownertrust value\n"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#. error
 #: g10/tdbdump.c:204
 #, fuzzy, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/de.po b/po/de.po
index ac616ce72..28142684c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-07-20 16:01+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -32,7 +32,6 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
@@ -41,7 +40,6 @@ msgstr "ja"
 msgid "yY"
 msgstr "jJyY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nein"
@@ -50,7 +48,6 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit"
@@ -255,7 +252,6 @@ msgstr "nicht verschl�sselt"
 msgid "not processed"
 msgstr "nicht bearbeitet"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "unbrauchbarer �ffentlicher Sch�ssel"
@@ -744,19 +740,19 @@ msgstr "|N|Komprimierverfahren N benutzen"
 msgid "throw keyid field of encrypted packets"
 msgstr "Empf�nger-ID verschl�sselter Pakete entfernen"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -765,7 +761,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -785,17 +781,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -805,7 +801,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -813,382 +809,382 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 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/g10.c:2075
+#: g10/g10.c:2083
 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/g10.c:2081
+#: g10/g10.c:2089
 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/g10.c:2094
+#: g10/g10.c:2102
 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/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "Kompressionsverfahren `%s' ist in diesem Release read-only\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 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/g10.c:2203
+#: g10/g10.c:2211
 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/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, 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/g10.c:2313
+#: g10/g10.c:2321
 #, 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/g10.c:2318
+#: g10/g10.c:2326
 #, 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/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 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/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:2623 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 "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:2937 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 "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1196,19 +1192,19 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
@@ -1333,7 +1329,6 @@ msgstr "Grund f�r Widerruf: "
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1389,7 +1384,6 @@ msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Ich vertraue ihm absolut\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = Bitte weitere Information anzeigen\n"
@@ -1713,14 +1707,6 @@ msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1805,7 +1791,6 @@ msgstr "Ung�ltiger Wert.\n"
 msgid "%s does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2136,7 +2121,6 @@ msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
 # translated by wk
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2150,8 +2134,6 @@ msgstr "WARNUNG: Nichts exportiert\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
@@ -2392,7 +2374,6 @@ msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2639,8 +2620,6 @@ msgstr ""
 "Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
 "(J/n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2998,7 +2977,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3297,8 +3275,6 @@ msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3431,9 +3407,6 @@ msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
@@ -3529,7 +3502,6 @@ msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
@@ -3570,10 +3542,6 @@ msgstr "Kein geheimer Schl�ssel\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3639,7 +3607,6 @@ msgstr " Haupt-Fingerabdruck  ="
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
@@ -3649,8 +3616,6 @@ msgstr "  Schl.-Fingerabdruck ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame L�nge f�r einen verschl�sselten Sitzungsschl�ssel (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3766,7 +3731,6 @@ msgstr "Richtlinie: "
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
@@ -3777,10 +3741,6 @@ msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Schl�ssel erh�ltlich bei: "
@@ -4571,9 +4531,6 @@ msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4623,7 +4580,6 @@ msgstr ""
 "'%s �bersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schl�ssel. Das "
 "ist f�r Signaturen NICHT sicher genug!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5241,7 +5197,6 @@ msgstr ""
 "Diese Plattform ben�tigt tempor�re Dateien zur Ausf�hrung von externen\n"
 "Programmen\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5320,7 +5275,6 @@ msgstr "Ausgabe mit ASCII H�lle erzwungen\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Widerrufzertifikat erzeugt.\n"
@@ -5353,7 +5307,6 @@ msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
 # translated by wk
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5435,7 +5388,6 @@ msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 msgid "error: no ownertrust value\n"
 msgstr "Fehler: Kein \"Owner trust\"-Wert\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/el.po b/po/el.po
index 08e4159e2..0c58758ff 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -30,7 +30,6 @@ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "���|���"
@@ -39,7 +38,6 @@ msgstr "���|���"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "���|���"
@@ -48,7 +46,6 @@ msgstr "���|���"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "�����������"
@@ -253,7 +250,6 @@ msgstr "�� ���������������"
 msgid "not processed"
 msgstr "�� �������������"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "�� ��������������� ������� ������"
@@ -738,19 +734,19 @@ msgstr "|N|����� ���������� ��������� N"
 msgid "throw keyid field of encrypted packets"
 msgstr "�������� ��� ������ keyid ��� ���������������� �������"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "���������� ��� Photo ID"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "�� ���������� ��� Photo ID"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "������� ��� ������� ������� ��� ���������� ��� Photo ID"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -758,7 +754,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -778,15 +774,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -796,7 +792,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -804,382 +800,382 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr ""
 "� ���������� ��������� `%s' ����� �� ���� ��� ������ ��� �������� ����\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "� ���������� ��������� ������ �� ����� ������ %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:2623 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 "�������� ��������� ��� %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:2937 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 "�������� ��������� ��� `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1187,19 +1183,19 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
@@ -1326,7 +1322,6 @@ msgstr "����� ��� ��������:"
 msgid "revocation comment: "
 msgstr "������ ���������:"
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1381,7 +1376,6 @@ msgstr " %d = ��� ����� �����������\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = ������������ �������\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = ���������� ������������ �����������\n"
@@ -1704,14 +1698,6 @@ msgstr ""
 "�� ������� �������� ����� ���� �����, 768 ����� � �������� ������������ "
 "����.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1798,7 +1784,6 @@ msgstr "�� ������ ����\n"
 msgid "%s does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2129,7 +2114,6 @@ msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2143,8 +2127,6 @@ msgstr "�������������: ��� ����� ������ �������\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User id ��� �������]"
@@ -2376,7 +2358,6 @@ msgstr "��� ������� �������������� ����������: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2618,8 +2599,6 @@ msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2974,7 +2953,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "�������� ���� user ID"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3273,8 +3251,6 @@ msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 msgid " (sensitive)"
 msgstr " (���������)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3403,9 +3379,6 @@ msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3502,7 +3475,6 @@ msgstr "������� ������ �� ��������� ���� �� ������; "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
@@ -3543,10 +3515,6 @@ msgstr "������ ������� ������\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3611,7 +3579,6 @@ msgstr " ��������� �������� ��������:"
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     ��������� �������� ="
@@ -3621,8 +3588,6 @@ msgstr "     ��������� �������� ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3735,7 +3700,6 @@ msgstr "��������: "
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
@@ -3745,10 +3709,6 @@ msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
@@ -4525,9 +4485,6 @@ msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4577,7 +4534,6 @@ msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5171,7 +5127,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5249,7 +5204,6 @@ msgstr "������������ ������ �� ����������� ASCII.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "������������� ��������� �������������.\n"
@@ -5281,7 +5235,6 @@ msgstr "�������� ���������� ����������\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5361,7 +5314,6 @@ msgstr "������: �� ������ ���������\n"
 msgid "error: no ownertrust value\n"
 msgstr "������: ������ ���� ������������ ���������\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/eo.po b/po/eo.po
index 9d37e3ad3..ed1d147c8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -31,7 +31,6 @@ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 #, fuzzy
 msgid "yes"
@@ -41,7 +40,6 @@ msgstr "jes"
 msgid "yY"
 msgstr "jJ"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ne"
@@ -50,7 +48,6 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "fini"
@@ -255,7 +252,6 @@ msgstr "ne �ifrita"
 msgid "not processed"
 msgstr "ne traktita"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "neuzebla publika �losilo"
@@ -731,19 +727,19 @@ msgstr "|N|uzi densig-metodon N"
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Montri Foto-Identigilojn"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Ne montri Foto-Identigilojn"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Agordi komandlinion por montri Foto-Identigilojn"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -751,7 +747,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -771,15 +767,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -789,7 +785,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -797,378 +793,378 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, fuzzy, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:2623 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 "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:2937 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 "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1177,20 +1173,20 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
@@ -1320,7 +1316,6 @@ msgstr "Kialo por revoko: "
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMfFsS"
@@ -1375,7 +1370,6 @@ msgstr " %d = Mi plene fidas\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
@@ -1693,14 +1687,6 @@ msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1785,7 +1771,6 @@ msgstr "nevalida valoro\n"
 msgid "%s does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2103,7 +2088,6 @@ msgstr "�losilo %08lX: ne protektita - ignorita\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2117,8 +2101,6 @@ msgstr "AVERTO: nenio estis eksportita\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
@@ -2347,7 +2329,6 @@ msgstr "mankas implicita sekreta �losilaro: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2590,8 +2571,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, fuzzy, c-format
 msgid ""
@@ -2956,7 +2935,6 @@ msgstr "foruid"
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "forfoto"
@@ -3261,8 +3239,6 @@ msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 msgid " (sensitive)"
 msgstr " (sentema)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3390,9 +3366,6 @@ msgstr "Donu la �losilgrandon"
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3487,7 +3460,6 @@ msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
@@ -3529,10 +3501,6 @@ msgstr "mankas sekreta �losilo\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3600,7 +3568,6 @@ msgstr "     �losilo-fingrospuro ="
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
@@ -3610,8 +3577,6 @@ msgstr "     �losilo-fingrospuro ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3724,7 +3689,6 @@ msgstr "Gvidlinio: "
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
@@ -3734,10 +3698,6 @@ msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4498,9 +4458,6 @@ msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4551,7 +4508,6 @@ msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5122,7 +5078,6 @@ msgstr ""
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5202,7 +5157,6 @@ msgstr ""
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 #, fuzzy
 msgid "Revocation certificate created.\n"
@@ -5237,7 +5191,6 @@ msgstr "nekonata densig-metodo"
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5315,7 +5268,6 @@ msgstr "%s: nevalida dosiero-versio %d\n"
 msgid "error: no ownertrust value\n"
 msgstr "eksporti la posedantofido-valorojn"
 
-#. error
 #: g10/tdbdump.c:204
 #, fuzzy, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/es.po b/po/es.po
index fe9fa6360..cab43ad37 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-18 22:40+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -34,7 +34,6 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "s�|si"
@@ -43,7 +42,6 @@ msgstr "s�|si"
 msgid "yY"
 msgstr "sS"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
@@ -52,7 +50,6 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "salir|fin|acabar"
@@ -280,7 +277,6 @@ msgstr "no cifrado"
 msgid "not processed"
 msgstr "no procesado"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "clave p�blica inutilizable"
@@ -783,15 +779,15 @@ msgstr "|N|usa el algoritmo de compresi�n N"
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Muestra IDs fotogr�ficos"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "No muestra IDs fotogr�ficos"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
 
@@ -799,7 +795,7 @@ msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -807,7 +803,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -827,15 +823,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -845,7 +841,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -853,354 +849,354 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "el algoritmo de compresi�n `%s' es de s�lo lectura en esta versi�n\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "no puede usar el cifrado \"%s\" en modo %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "no puede usar el resumen \"%s\" en modo %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "no puede usar la compresi�n \"%s\" en modo %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:2623 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 "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1208,17 +1204,17 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:2937 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 "no se puede abrir `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1226,19 +1222,19 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
@@ -1369,7 +1365,6 @@ msgstr "raz�n para la revocaci�n: "
 msgid "revocation comment: "
 msgstr "comentario a la revocaci�n: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1424,7 +1419,6 @@ msgstr " %d = Conf�o totalmente\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = conf�o por completo\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
@@ -1740,14 +1734,6 @@ msgstr "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1832,7 +1818,6 @@ msgstr "valor inv�lido\n"
 msgid "%s does not expire at all\n"
 msgstr "%s nunca caduca\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2159,7 +2144,6 @@ msgstr "clave %08lX: no protegida - omitida\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2174,8 +2158,6 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
@@ -2406,7 +2388,6 @@ msgstr "no hay anillo secreto de claves por defecto: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2644,8 +2625,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -3000,7 +2979,6 @@ msgstr "borridu"
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "borfoto"
@@ -3299,8 +3277,6 @@ msgstr "Esta clave puede ser revocada por la clave %s"
 msgid " (sensitive)"
 msgstr " (confidencial)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3426,9 +3402,6 @@ msgstr "Introduzca el ID de usuario del revocador designado: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
@@ -3522,7 +3495,6 @@ msgstr "�De verdad quiere revocarla? (s/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
@@ -3563,10 +3535,6 @@ msgstr "no hay clave secreta\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3631,7 +3599,6 @@ msgstr " Huella de clave primaria:"
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "    Huella de clave ="
@@ -3641,8 +3608,6 @@ msgstr "    Huella de clave ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3754,7 +3719,6 @@ msgstr "Pol�tica: "
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
@@ -3764,10 +3728,6 @@ msgstr "no se puede trabajar con firmas m�ltiples\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firmado el %.*s usando clave %s ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Clave disponible en: "
@@ -4533,9 +4493,6 @@ msgstr "no se encuentran claves totalmente fiables\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4584,7 +4541,6 @@ msgstr ""
 "`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura "
 "para las firmas\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5167,7 +5123,6 @@ msgstr ""
 "esta plataforma necesita ficheros temporales para llamar a programas "
 "externos.\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5245,7 +5200,6 @@ msgstr "se fuerza salida con armadura ASCII.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Certificado de revocaci�n creado.\n"
@@ -5277,7 +5231,6 @@ msgstr "algoritmo de protecci�n desconocido\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5357,7 +5310,6 @@ msgstr "error: huella dactilar no v�lida\n"
 msgid "error: no ownertrust value\n"
 msgstr "error: no hay valor de confianza del propietario\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/et.po b/po/et.po
index a7f22ff1a..43cdbd6b3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -30,7 +30,6 @@ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "jah"
@@ -39,7 +38,6 @@ msgstr "jah"
 msgid "yY"
 msgstr "jJ"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ei"
@@ -48,7 +46,6 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "v�lju"
@@ -253,7 +250,6 @@ msgstr "kr�ptimata"
 msgid "not processed"
 msgstr "ei t��deldud"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "mittekasutatav avalik v�ti"
@@ -731,19 +727,19 @@ msgstr "|N|kasuta pakkimisalgoritmi N"
 msgid "throw keyid field of encrypted packets"
 msgstr "�ra lisa kr�ptimisel v�tme id"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Esita foto IDd"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Sea k�surida foto ID vaatamiseks"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -751,7 +747,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -771,15 +767,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -789,7 +785,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -797,370 +793,370 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "pakkimise algoritm `%s' on selles versioonis ainult lugemiseks\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:2623 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 "%s ei �nnestu avada: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:2937 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 "`%s' ei �nnestu avada\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1168,19 +1164,19 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
@@ -1306,7 +1302,6 @@ msgstr "t�histamise p�hjus: "
 msgid "revocation comment: "
 msgstr "t�histamise kommentaar: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iItTvVjJ"
@@ -1361,7 +1356,6 @@ msgstr " %d = Usaldan t�iesti\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
@@ -1673,14 +1667,6 @@ msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1765,7 +1751,6 @@ msgstr "vigane v��rtus\n"
 msgid "%s does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2083,7 +2068,6 @@ msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2097,8 +2081,6 @@ msgstr "HOIATUS: midagi ei eksporditud\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
@@ -2331,7 +2313,6 @@ msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2565,8 +2546,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2920,7 +2899,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3218,8 +3196,6 @@ msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3345,9 +3321,6 @@ msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
@@ -3440,7 +3413,6 @@ msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
@@ -3481,10 +3453,6 @@ msgstr "salajast v�tit pole\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3548,7 +3516,6 @@ msgstr " Primaarse v�tme s�rmej�lg:"
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
@@ -3558,8 +3525,6 @@ msgstr "     V�tme s�rmej�lg ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3670,7 +3635,6 @@ msgstr "Poliis: "
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
@@ -3680,10 +3644,6 @@ msgstr "neid allkirju ei �nnestu t��delda\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "V�tme leiate: "
@@ -4437,9 +4397,6 @@ msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4489,7 +4446,6 @@ msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5065,7 +5021,6 @@ msgstr ""
 "see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
 "kasutamist\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5143,7 +5098,6 @@ msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
@@ -5177,7 +5131,6 @@ msgstr "tundmatu kaitsealgoritm\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5259,7 +5212,6 @@ msgstr "viga: vigane s�rmej�lg\n"
 msgid "error: no ownertrust value\n"
 msgstr "viga: usalduse v��rtus puudub\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 94b99fc91..48f319b44 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -21,8 +21,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -46,7 +46,6 @@ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "kyllä|kylla|joo"
@@ -55,7 +54,6 @@ msgstr "kyllä|kylla|joo"
 msgid "yY"
 msgstr "kK"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ei"
@@ -64,7 +62,6 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "lopeta|sulje"
@@ -269,7 +266,6 @@ msgstr "salaamaton"
 msgid "not processed"
 msgstr "ei käsitelty"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "julkista avainta ei voi käyttää"
@@ -749,19 +745,19 @@ msgstr "|N|käytä pakkausalgoritmia N"
 msgid "throw keyid field of encrypted packets"
 msgstr "jätä avaintunnistekenttä pois salatuista paketeista"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Näytä valokuvatunnisteet"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Älä näytä valokuvatunnisteita"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Aseta valokuvatunnisteiden katsomiskomento"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -770,7 +766,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -789,16 +785,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -808,7 +804,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -816,371 +812,371 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkausalgoritmin täytyy olla väliltä %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:2623 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 "tiedostoa %s ei voi avata: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:2937 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 "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1188,19 +1184,19 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
@@ -1328,7 +1324,6 @@ msgstr "mitätöinnin syy: "
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMlLoO"
@@ -1383,7 +1378,6 @@ msgstr " %d = Luotan täysin\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Luotan ehdottomasti\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = näytä lisätietoja\n"
@@ -1702,14 +1696,6 @@ msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1794,7 +1780,6 @@ msgstr "arvo ei kelpaa\n"
 msgid "%s does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2115,7 +2100,6 @@ msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2131,8 +2115,6 @@ msgstr "VAROITUS: mitään ei viety\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
@@ -2368,7 +2350,6 @@ msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2607,8 +2588,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2962,7 +2941,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "poista käyttäjätunnus"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3260,8 +3238,6 @@ msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 msgid " (sensitive)"
 msgstr " (luottamuksellinen)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3388,9 +3364,6 @@ msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
@@ -3483,7 +3456,6 @@ msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
@@ -3524,10 +3496,6 @@ msgstr "salainen avain ei ole saatavilla\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3595,7 +3563,6 @@ msgstr " Ensisijaisen avaimen sormenjälki:"
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
@@ -3605,8 +3572,6 @@ msgstr "     Avaimen sormenjälki ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3719,7 +3684,6 @@ msgstr "Käytäntö: "
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
@@ -3730,10 +3694,6 @@ msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
@@ -4508,9 +4468,6 @@ msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4562,7 +4519,6 @@ msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5155,7 +5111,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5233,7 +5188,6 @@ msgstr "ASCII-koodattu tuloste määritetty.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Mitätöintivarmenne luotu.\n"
@@ -5265,7 +5219,6 @@ msgstr "tuntematon suojausalgoritmi\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5346,7 +5299,6 @@ msgstr "virhe: sormenjälki on väärä\n"
 msgid "error: no ownertrust value\n"
 msgstr "virhe: ei luottamusarvoa\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 0dcdc6cd2..a6a272810 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-16 20:20+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -37,7 +37,6 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "oui"
@@ -46,7 +45,6 @@ msgstr "oui"
 msgid "yY"
 msgstr "oO"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "non"
@@ -55,7 +53,6 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quitter"
@@ -260,7 +257,6 @@ msgstr "non chiffr�"
 msgid "not processed"
 msgstr "non trait�"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "cl� publique inutilisable"
@@ -754,21 +750,21 @@ msgstr "|N|utiliser l'algorithme de compression N"
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Montrer les photos d'identit�"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Ne pas montrer les photos d'identit�"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Choisir la ligne de commande servant �\n"
 "afficher les photos d'identit�"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -776,7 +772,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -796,17 +792,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -816,7 +812,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -824,389 +820,389 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = signature trouv�e dans la d�finition du groupe \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
 "sont peu s�res\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "�l�ment de configuration \"%s\" inconnu\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement \"%s\" n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr ""
 "l'algorithme de compression `%s' ne fonctionne qu'en lecture pour\n"
 "cette version\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement \"%s\"\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage \"%s\"\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression \"%s\"\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des r�cipients (-r) ont donn�s alors que le chiffrement\n"
 "ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:2623 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 "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:2937 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 "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1214,19 +1210,19 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
@@ -1355,7 +1351,6 @@ msgstr "cause de r�vocation: "
 msgid "revocation comment: "
 msgstr "commentaire de r�vocation: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1409,7 +1404,6 @@ msgstr " %d = je fais enti�rement confiance\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = je donne une confiance ultime\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = donnez-moi plus d'informations\n"
@@ -1732,14 +1726,6 @@ msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1824,7 +1810,6 @@ msgstr "valeur invalide\n"
 msgid "%s does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2158,7 +2143,6 @@ msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "cl� %08lX: cl� de style PGP 2.x - ignor�e\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2174,8 +2158,6 @@ msgstr "ATTENTION: rien n'a �t� export�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
@@ -2411,7 +2393,6 @@ msgstr "pas de porte-cl�s par d�faut: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "cl� %08lX: cl� secr�te import�e\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2652,8 +2633,6 @@ msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -3009,7 +2988,6 @@ msgstr "suppr.ut"
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "suppr.photo"
@@ -3307,8 +3285,6 @@ msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s "
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3443,9 +3419,6 @@ msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3543,7 +3516,6 @@ msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
@@ -3584,10 +3556,6 @@ msgstr "pas de cl� secr�te\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3654,7 +3622,6 @@ msgstr " Empreinte de la cl� principale:"
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr " Empreinte de la cl� ="
@@ -3664,8 +3631,6 @@ msgstr " Empreinte de la cl� ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3778,7 +3743,6 @@ msgstr "Politique: "
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
@@ -3788,10 +3752,6 @@ msgstr "le traitement de ces signatures multiples est impossible\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec la cl� %s ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
@@ -4594,9 +4554,6 @@ msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4649,7 +4606,6 @@ msgstr ""
 "`%s' a �t� ignor�e: c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas\n"
 "s�re pour les signatures !\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5235,7 +5191,6 @@ msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5317,7 +5272,6 @@ msgstr "sortie avec armure ASCII forc�e.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
@@ -5349,7 +5303,6 @@ msgstr "algorithme de protection inconnu\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5430,7 +5383,6 @@ msgstr "erreur: empreinte invalide\n"
 msgid "error: no ownertrust value\n"
 msgstr "erreur: pas de valeur de confiance au propri�taire\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/gl.po b/po/gl.po
index e4cd3f560..960394caf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -30,7 +30,6 @@ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "si|sim"
@@ -39,7 +38,6 @@ msgstr "si|sim"
 msgid "yY"
 msgstr "sS"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "non|nom"
@@ -48,7 +46,6 @@ msgstr "non|nom"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "abandonar"
@@ -253,7 +250,6 @@ msgstr "non cifrado"
 msgid "not processed"
 msgstr "non procesado"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "chave p�blica non utilizable"
@@ -739,19 +735,19 @@ msgstr "|N|emprega-lo algoritmo de compresi�n N"
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Amosar Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Non amosar Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Estabrece-la li�a de comando para ve-las Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -759,7 +755,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -779,17 +775,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -799,7 +795,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -807,374 +803,374 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "o algoritmo de compresi�n `%s' � de s� lectura nesta versi�n\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compresi�n debe estar entre %d e %d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:2623 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 "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:2937 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 "non se puido abrir `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1182,19 +1178,19 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
@@ -1321,7 +1317,6 @@ msgstr "motivo para a revocaci�n: "
 msgid "revocation comment: "
 msgstr "comentario de revocaci�n: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMsSoO"
@@ -1375,7 +1370,6 @@ msgstr " %d = Conf�o totalmente\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Conf�o absolutamente\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = amosar m�is informaci�n\n"
@@ -1694,14 +1688,6 @@ msgstr "chave pequena de m�is; 1024 � o menor valor admitido para RSA.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1786,7 +1772,6 @@ msgstr "valor non v�lido\n"
 msgid "%s does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2112,7 +2097,6 @@ msgstr "chave %08lX: non est� protexida - omitida\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2127,8 +2111,6 @@ msgstr "AVISO: non se exportou nada\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
@@ -2365,7 +2347,6 @@ msgstr "non hai un chaveiro privado por defecto: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2607,8 +2588,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2961,7 +2940,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3261,8 +3239,6 @@ msgstr "Esta chave pode estar revocada por %s chave "
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3393,9 +3369,6 @@ msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
@@ -3490,7 +3463,6 @@ msgstr "�Est� seguro de que quere revocala? (s/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
@@ -3531,10 +3503,6 @@ msgstr "non hai chave secreta\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3600,7 +3568,6 @@ msgstr "Pegada dactilar da chave primaria:"
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Pegada dactilar ="
@@ -3610,8 +3577,6 @@ msgstr "     Pegada dactilar ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3722,7 +3687,6 @@ msgstr "Normativa: "
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
@@ -3732,10 +3696,6 @@ msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
@@ -4512,9 +4472,6 @@ msgstr "non se atoparon chaves de confianza absoluta\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4567,7 +4524,6 @@ msgstr ""
 "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5145,7 +5101,6 @@ msgstr ""
 "esta plataforma precisa de ficheiros temporais ao chamar a programas "
 "externos\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5223,7 +5178,6 @@ msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Creouse o certificado de revocaci�n.\n"
@@ -5255,7 +5209,6 @@ msgstr "algoritmo de protecci�n desco�ecido\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5334,7 +5287,6 @@ msgstr "erro: pegada dactilar non v�lida\n"
 msgid "error: no ownertrust value\n"
 msgstr "erro: non hai un valor de confianza no propietario\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/hu.po b/po/hu.po
index d46cdbfea..1221db680 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -30,7 +30,6 @@ msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "igen"
@@ -39,7 +38,6 @@ msgstr "igen"
 msgid "yY"
 msgstr "iI"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nem"
@@ -48,7 +46,6 @@ msgstr "nem"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "kil�p�s|kilepes"
@@ -253,7 +250,6 @@ msgstr "nem titkos�tott"
 msgid "not processed"
 msgstr "nem feldolgozott"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "haszn�lhatatlan nyilv�nos kulcs"
@@ -734,19 +730,19 @@ msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 msgid "throw keyid field of encrypted packets"
 msgstr "titkos�tott csomagok keyid mez�j�nek eldob�sa"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "fot�azonos�t�k mutat�sa"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "ne mutassa a fot�azonos�t�kat"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "parancssor �ll�t�sa fot�azonos�t�k megn�z�s�hez"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -754,7 +750,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -774,15 +770,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -792,7 +788,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -800,371 +796,371 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "\"%s\" t�m�r�t�algoritmus csak olvashat� ebben a kiad�sban.\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "A t�m�r�t�algoritmus sz�ma %d �s %d k�z� kell essen!\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key felh-azonos�t�"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key felh-azonos�t�"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:2623 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 "Nem tudom megnyitni %s-t: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:2937 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 "Nem tudom megnyitni %s-t!\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1172,19 +1168,19 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
@@ -1310,7 +1306,6 @@ msgstr "Visszavon�s oka: "
 msgid "revocation comment: "
 msgstr "Megjegyz�s a visszavon�shoz: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iIfFkKhH"
@@ -1365,7 +1360,6 @@ msgstr " %d = teljesen megb�zom benne\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = alapvet�en megb�zom benne\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
@@ -1680,14 +1674,6 @@ msgstr "Kulcsm�ret t�l kicsi; 1024 a legkisebb megengedett �rt�k RSA-hoz.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "Kulcsm�ret t�l kicsi; 768 a legkisebb megengedett �rt�k.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1772,7 +1758,6 @@ msgstr "�rv�nytelen �rt�k!\n"
 msgid "%s does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2093,7 +2078,6 @@ msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2107,8 +2091,6 @@ msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[ismeretlen kulcs]"
@@ -2343,7 +2325,6 @@ msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2580,8 +2561,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2934,7 +2913,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3232,8 +3210,6 @@ msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 msgid " (sensitive)"
 msgstr " (�rz�keny)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3362,9 +3338,6 @@ msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
@@ -3457,7 +3430,6 @@ msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
@@ -3498,10 +3470,6 @@ msgstr "Nincs titkos kulcs.\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3566,7 +3534,6 @@ msgstr "Els�dlegeskulcs-ujjlenyomat:"
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
@@ -3576,8 +3543,6 @@ msgstr " Kulcs ujjlenyomata ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3691,7 +3656,6 @@ msgstr "Elj�r�sm�d: "
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
@@ -3701,10 +3665,6 @@ msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
@@ -4476,9 +4436,6 @@ msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4529,7 +4486,6 @@ msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
 "biztons�gos al��r�sokhoz!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5117,7 +5073,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5196,7 +5151,6 @@ msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
@@ -5228,7 +5182,6 @@ msgstr "Ismeretlen v�delmi algoritmus!\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5307,7 +5260,6 @@ msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 msgid "error: no ownertrust value\n"
 msgstr "Hiba: Nincs tulajdonosmegb�zhat�s�gi �rt�k.\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/id.po b/po/id.po
index ca653aef8..7c9bf70e0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -33,7 +33,6 @@ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "y|ya"
@@ -42,7 +41,6 @@ msgstr "y|ya"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n|t|tidak"
@@ -51,7 +49,6 @@ msgstr "n|t|tidak"
 msgid "nN"
 msgstr "tT"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "q|k|keluar"
@@ -256,7 +253,6 @@ msgstr "tidak dienkripsi"
 msgid "not processed"
 msgstr "tidak diproses"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "kunci publik tidak dapat dipakai"
@@ -736,19 +732,19 @@ msgstr "|N|gunakan algoritma kompresi N"
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -756,7 +752,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -776,15 +772,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -794,7 +790,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -802,379 +798,379 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "algoritma kompresi `%s' adalah hanya-baca dalam rilis ini\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:2623 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 "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:2937 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 "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1182,19 +1178,19 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
@@ -1321,7 +1317,6 @@ msgstr "Alasan pembatalan:"
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1376,7 +1371,6 @@ msgstr " %d = Saya sangat percaya\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Saya sangat percaya sekali\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
@@ -1691,14 +1685,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1783,7 +1769,6 @@ msgstr "nilai yang tidak valid\n"
 msgid "%s does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2103,7 +2088,6 @@ msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2118,8 +2102,6 @@ msgstr "PERINGATAN: tidak ada yang diekspor\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
@@ -2350,7 +2332,6 @@ msgstr "tidak ada keyring rahasia baku: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2587,8 +2568,6 @@ msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2943,7 +2922,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3241,8 +3219,6 @@ msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3371,9 +3347,6 @@ msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3470,7 +3443,6 @@ msgstr "Anda tetap ingin membatalkannya? (y/n) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
@@ -3511,10 +3483,6 @@ msgstr "tidak ada kunci rahasia\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3578,7 +3546,6 @@ msgstr "     Fingerprint kunci primer ="
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Fingerprint kunci ="
@@ -3588,8 +3555,6 @@ msgstr "     Fingerprint kunci ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3700,7 +3665,6 @@ msgstr "Kebijakan: "
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
@@ -3710,10 +3674,6 @@ msgstr "tidak dapat menangani banyak signature ini\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
@@ -4478,9 +4438,6 @@ msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4530,7 +4487,6 @@ msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5121,7 +5077,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "platform ini membutuhkan file temp ketika memanggil program eksternal\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5199,7 +5154,6 @@ msgstr "Pemaksaan output mode ASCII.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
@@ -5231,7 +5185,6 @@ msgstr "algoritma proteksi tidak dikenal\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5313,7 +5266,6 @@ msgstr "kesalahan: fingerprint tidak valid\n"
 msgid "error: no ownertrust value\n"
 msgstr "kesalahan: tidak ada nilai ownertrust\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/it.po b/po/it.po
index 343b66a2a..0c4239d49 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -30,7 +30,6 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "si|s�"
@@ -39,7 +38,6 @@ msgstr "si|s�"
 msgid "yY"
 msgstr "sS"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
@@ -48,7 +46,6 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit"
@@ -254,7 +251,6 @@ msgstr "non cifrato"
 msgid "not processed"
 msgstr "non esaminato"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "chiave pubblica inutilizzabile"
@@ -739,19 +735,19 @@ msgstr "|N|usa l'algoritmo di compressione N"
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Mostra le fotografie"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Non mostra le fotografie"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Imposta la riga di comando per vedere le fotografie"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -759,7 +755,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -779,15 +775,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -797,7 +793,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -805,377 +801,377 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr ""
 "in questa versione l'algoritmo di compressione `%s' � in sola lettura\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:2623 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 "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:2937 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 "impossibile aprire `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1183,19 +1179,19 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
@@ -1322,7 +1318,6 @@ msgstr "ragione della revoca: "
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1377,7 +1372,6 @@ msgstr " %d = Mi fido completamente\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Mi fido definitivamente\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
@@ -1693,14 +1687,6 @@ msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1785,7 +1771,6 @@ msgstr "valore non valido\n"
 msgid "%s does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2114,7 +2099,6 @@ msgstr "chiave %08lX: non protetta - saltata\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2128,8 +2112,6 @@ msgstr "ATTENZIONE: non � stato esportato nulla\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
@@ -2360,7 +2342,6 @@ msgstr "nessun portachiavi segreto predefinito: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2598,8 +2579,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2954,7 +2933,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3252,8 +3230,6 @@ msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3386,9 +3362,6 @@ msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3486,7 +3459,6 @@ msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
@@ -3527,10 +3499,6 @@ msgstr "manca la chiave segreta\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3596,7 +3564,6 @@ msgstr " Impronta digitale della chiave primaria:"
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Impronta digitale ="
@@ -3606,8 +3573,6 @@ msgstr "     Impronta digitale ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3718,7 +3683,6 @@ msgstr "Policy: "
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
@@ -3728,10 +3692,6 @@ msgstr "impossibile gestire queste firme multiple\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
@@ -4512,9 +4472,6 @@ msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4564,7 +4521,6 @@ msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5166,7 +5122,6 @@ msgstr ""
 "questa piattaforma richiede file temporanei quando si chiamano programmi "
 "esterni\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5244,7 +5199,6 @@ msgstr "Forzato l'output con armatura ASCII.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Certificato di revoca creato.\n"
@@ -5276,7 +5230,6 @@ msgstr "algoritmo di protezione sconosciuto\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5357,7 +5310,6 @@ msgstr "errore: impronta digitale non valida\n"
 msgid "error: no ownertrust value\n"
 msgstr "errore: non c'� il valore della fiducia\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 2c936b70e..509ca9e9d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-06 00:44+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -33,7 +33,6 @@ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤϼ¹ԤǤ��ޤ���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "yes"
@@ -42,7 +41,6 @@ msgstr "yes"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
@@ -51,7 +49,6 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit"
@@ -256,7 +253,6 @@ msgstr "�Ź沽����Ƥ��ޤ���"
 msgid "not processed"
 msgstr "̤����"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "���ѤǤ��ʤ��������Ǥ�"
@@ -776,21 +772,21 @@ msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "�ե���ID��ɽ�����ʤ�"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "�ե���ID��������륳�ޥ�ɹ�\n"
 "������"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -799,7 +795,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -819,15 +815,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -837,7 +833,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -845,389 +841,389 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "�Ź�: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "�������С���URI�������ǽ\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "���̥��르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ������\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �桼����id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �桼����id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:2623 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 "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/g10.c:2937 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 "��%s�פ������ޤ���\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
@@ -1354,7 +1350,6 @@ msgstr "������ͳ: "
 msgid "revocation comment: "
 msgstr "������Ŭ��: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1408,7 +1403,6 @@ msgstr " %d = �����˿��Ѥ���\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = ����Ū�˿��Ѥ���\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = ���ܤ��������ɽ������\n"
@@ -1720,14 +1714,6 @@ msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1812,7 +1798,6 @@ msgstr "̵������\n"
 msgid "%s does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2126,7 +2111,6 @@ msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2140,8 +2124,6 @@ msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
@@ -2370,7 +2352,6 @@ msgstr "�������̩���ؤ�����ޤ���: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2601,8 +2582,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�����ڤ��̾�򿷤�����̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2953,7 +2932,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3251,8 +3229,6 @@ msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
 msgid " (sensitive)"
 msgstr " (�ǥꥱ����)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3378,9 +3354,6 @@ msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
@@ -3472,7 +3445,6 @@ msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
@@ -3513,10 +3485,6 @@ msgstr "��̩��������ޤ���\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3580,7 +3548,6 @@ msgstr " �縰�λ���:"
 msgid "      Subkey fingerprint:"
 msgstr " �����λ���:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "                ���� ="
@@ -3590,8 +3557,6 @@ msgstr "                ���� ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3702,7 +3667,6 @@ msgstr "�ݥꥷ��: "
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
@@ -3712,10 +3676,6 @@ msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
@@ -4463,9 +4423,6 @@ msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4515,7 +4472,6 @@ msgstr ""
 "��%s�פ򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5085,7 +5041,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5163,7 +5118,6 @@ msgstr "ASCII�������Ϥ������ޤ���\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
@@ -5195,7 +5149,6 @@ msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5274,7 +5227,6 @@ msgstr "���顼: ̵���ʻ���\n"
 msgid "error: no ownertrust value\n"
 msgstr "���顼: ��ͭ�Ԥ��Ѥ����ͤ�����ޤ���\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 1cba37398..8b8d276ff 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-05-10 19:23+0200\n"
 "Last-Translator: Elros Cyriatan <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -32,7 +32,6 @@ msgstr "bewerking is niet mogelijk zonder geïnitialiseerd veilig geheugen\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
@@ -41,7 +40,6 @@ msgstr "ja"
 msgid "yY"
 msgstr "jJ"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nee"
@@ -50,7 +48,6 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "afsluiten"
@@ -255,7 +252,6 @@ msgstr "niet gecodeerd"
 msgid "not processed"
 msgstr "niet verwerkt"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "onbruikbare openbare sleutel"
@@ -737,19 +733,19 @@ msgstr "|N|inpakalgoritme N gebruiken"
 msgid "throw keyid field of encrypted packets"
 msgstr "keyid-veld uit gecodeerde pakketten gooien"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Foto's weergeven"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Niet foto's weergeven"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Opdrachtregel instellen voor weergeven van foto's"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -758,7 +754,7 @@ msgstr ""
 "(Zie de man-handleiding voor een volledige lijst met alle opdrachten en "
 "opties)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -778,17 +774,17 @@ msgstr ""
 " --list-keys [namen]        sleutels weergeven\n"
 " --fingerprint [namen]      vingerafdrukken weergeven\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapporteer softwarefouten alstublieft aan <[email protected]>.\n"
 "Rapporteer fouten in de vertaling alstublieft aan <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -798,7 +794,7 @@ msgstr ""
 "ondertekenen, controleren, coderen of decoderen\n"
 "standaardbewerking hangt af van invoergegevens\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -806,374 +802,374 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Openbare sleutel: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Codering: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compressie: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "conflicterende opdrachten\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "geen =-teken gevonden in groepdefinitie \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "LET OP: oude bestand voor standaard opties `%s' genegeerd\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand voor standaard opties `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "bezig met lezen opties uit `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "coderingsuitbreiding \"%s\" niet geladen vanwege onveilige toegangsrechten\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is geen geldige tekenset\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "kon sleutelserver URI niet inlezen\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ongeldige invoeropties\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "ongeldige invoeropties\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ongeldige uitvoeropties\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "ongeldige uitvoeropties\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kan exec-path niet instellen op %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "WAARSCHUWING: programma maakt mogelijk een core-bestand aan!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WAARSCHUWING: %s gaat boven %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor normaal gebruik!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s niet toegestaan met %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s slaat nergens op met %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "u kunt alleen losse of ongecodeerde ondertekeningen maken in --pgp2 modus\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "u kunt niet tegelijkertijd ondertekenen en coderen in --pgp2 modus\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "u dient bestanden te gebruiken (en niet een pijp) in --pgp2 modus.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "het coderen van een bericht in --pgp2 modus vereist de IDEA-codering\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "het gekozen coderingsalgoritme is ongeldig\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "het gekozen digest-algoritme is ongeldig\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "het gekozen certificaat-digest-algoritme is ongeldig\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, fuzzy, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "digest-algoritme `%s' is alleen-lezen in deze uitgave\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "inpakalgoritme moet binnen bereik %d..%d liggen\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed moet groter zijn dan 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed moet groter zijn dan 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet binnen het bereik 1 tot 255 vallen\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: eenvoudige S2K-modus (0) wordt sterk ontraden\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "ongeldige standaardvoorkeuren\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "ongeldige persoonlijke coderingsvoorkeuren\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "ongeldige persoonlijke digestvoorkeuren\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "ongeldige persoonlijke inpakvoorkeuren\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s slaat nergens op met %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "u kunt %s niet gebruiken in %s modus\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WAARSCHUWING: ontvangers (-r) gegeven zonder gebruik te maken van openbare "
 "sleutel codering\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [bestandsnaam]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikerscode"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikerscode"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key gebruikerscode"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key gebruikerscode"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikerscode [opdrachten]"
 
-#: g10/g10.c:2623 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 %s niet openen: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikerscode] [sleutelbos]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "bijwerken geheim mislukt: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ontpantseren mislukt: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "bepantseren mislukt: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Ga uw gang en typ uw bericht...\n"
 
-#: g10/g10.c:2937 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 `%s' niet openen\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1181,19 +1177,19 @@ msgstr ""
 "een notatienaam mag slechts afdrukbare tekens of spaties bevatten, en moet "
 "eindigen met een '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "een gebruikersnotatienaam moet het '@'-teken bevatten\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "een notatiewaarde mag geen stuurtekens bevatten\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "de gegeven certificatiebeleid URL is ongeldig\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
 
@@ -1318,7 +1314,6 @@ msgstr "reden voor herroeping: "
 msgid "revocation comment: "
 msgstr "herroepingsopmerking: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1374,7 +1369,6 @@ msgstr " %d = Ik vertrouw volledig\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Ik vertrouw maximaal\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = meer informatie weergeven\n"
@@ -1696,14 +1690,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutelgrootte te klein; 768 is de kleinste toegestane waarde.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1788,7 +1774,6 @@ msgstr "ongeldige waarde\n"
 msgid "%s does not expire at all\n"
 msgstr "%s verloopt nooit\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2119,7 +2104,6 @@ msgstr "sleutel %08lX: niet beschermd - overgeslagen\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "sleutel %08lX: PGP 2.x stijl sleutel - overgeslagen\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2134,8 +2118,6 @@ msgstr "WAARSCHUWING: niets uitgevoerd\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "teveel ingangen in pk buffer - uit gezet\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Gebruikerscode niet gevonden]"
@@ -2371,7 +2353,6 @@ msgstr "geen standaard geheime sleutelbos: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "sleutel %08lX: geheime sleutel geïmporteerd\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2615,8 +2596,6 @@ msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Wilt u een nieuwe ondertekening plaatsen om de oude te vervangen? (j/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2974,7 +2953,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "gebruikerscode verwijderen"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3272,8 +3250,6 @@ msgstr "Deze sleutel is mogelijk herroepen door sleutel %s "
 msgid " (sensitive)"
 msgstr " (gevoelig)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3402,9 +3378,6 @@ msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n"
@@ -3499,7 +3472,6 @@ msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikerscodes ondertekend:\n"
@@ -3540,10 +3512,6 @@ msgstr "geen geheime sleutel\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "gebruikerscode \"%s\" is al herroepen\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3611,7 +3579,6 @@ msgstr " Vingerafdruk primaire sleutel:"
 msgid "      Subkey fingerprint:"
 msgstr "      Vingerafdruk deelsleutel:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Vingerafdruk sleutel ="
@@ -3621,8 +3588,6 @@ msgstr "     Vingerafdruk sleutel ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "vreemde grootte voor een gecodeerde sessiesleutel (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3736,7 +3701,6 @@ msgstr "Beleid: "
 msgid "signature verification suppressed\n"
 msgstr "verificatie van ondertekening onderdrukt\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "kan deze meervoudige ondertekeningen niet verwerken\n"
@@ -3746,10 +3710,6 @@ msgstr "kan deze meervoudige ondertekeningen niet verwerken\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4526,9 +4486,6 @@ msgstr "geen maximaal vertrouwde sleutels gevonden\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "openbare sleutel van maximaal vertrouwde sleutel %08lX niet gevonden\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4580,7 +4537,6 @@ msgstr ""
 "`%s' overgeslagen: dit is een met PGP aangemaakte ElGamal-sleutel die niet "
 "veilig is voor ondertekeningen!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5187,7 +5143,6 @@ msgstr ""
 "dit platform vereist het maken van tijdelijke bestanden bij het aanroepen "
 "van externe programma's\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5265,7 +5220,6 @@ msgstr "ASCII-bepantserde uitvoer afgedwongen.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet mislukt: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Herroepingscertificaat aangemaakt.\n"
@@ -5297,7 +5251,6 @@ msgstr "onbekend beschermingsalgoritme\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "LET OP: deze sleutel wordt niet beschermd!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5377,7 +5330,6 @@ msgstr "fout: ongeldige vingerafdruk\n"
 msgid "error: no ownertrust value\n"
 msgstr "fout: geen eigenaarsvertrouwen waarde\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/pl.po b/po/pl.po
index aab86e902..9a7eb5e85 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -40,7 +40,6 @@ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "tak"
@@ -49,7 +48,6 @@ msgstr "tak"
 msgid "yY"
 msgstr "tT"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nie"
@@ -58,7 +56,6 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "wyj�cie"
@@ -263,7 +260,6 @@ msgstr "nie zaszyfrowany"
 msgid "not processed"
 msgstr "nie zosta� przetworzony"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "bezu�yteczny klucz publiczny"
@@ -754,19 +750,19 @@ msgstr "|N|wymuszenie algorytmu kompresji N"
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie numer�w kluczy adresat�w z szyfrogram�w"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "okazywanie zdj�cia - identyfikatora u�ytkownika"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "bez pokazywania zdj��"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "polecenie wywo�uj�ce przegl�dark� do zdj��"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -774,7 +770,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -795,15 +791,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -813,7 +809,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -821,378 +817,378 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "w tej wersji kompresja ,,%s'' jest tylko do odczytu\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie kompresji musi pochodzi� z zakresu %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:2623 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 "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:2937 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 "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1200,19 +1196,19 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
@@ -1339,7 +1335,6 @@ msgstr "pow�d uniewa�nienia: "
 msgid "revocation comment: "
 msgstr "komentarz do uniewa�nienia: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMwWpP"
@@ -1394,7 +1389,6 @@ msgstr " %d = mam pe�ne zaufanie\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = ufam absolutnie\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
@@ -1710,14 +1704,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1802,7 +1788,6 @@ msgstr "niepoprawna warto��\n"
 msgid "%s does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2132,7 +2117,6 @@ msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2146,8 +2130,6 @@ msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
@@ -2379,7 +2361,6 @@ msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2619,8 +2600,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2975,7 +2954,6 @@ msgstr "usid"
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "usfoto"
@@ -3274,8 +3252,6 @@ msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 msgid " (sensitive)"
 msgstr " (poufne)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3403,9 +3379,6 @@ msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
@@ -3498,7 +3471,6 @@ msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
@@ -3539,10 +3511,6 @@ msgstr "brak klucza tajnego\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3608,7 +3576,6 @@ msgstr " Odcisk klucza g��wnego:"
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Odcisk klucza ="
@@ -3618,8 +3585,6 @@ msgstr "     Odcisk klucza ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3731,7 +3696,6 @@ msgstr "Regulamin: "
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
@@ -3741,10 +3705,6 @@ msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
@@ -4514,9 +4474,6 @@ msgstr "brak absolutnie zaufanych kluczy\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4568,7 +4525,6 @@ msgstr ""
 "pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5154,7 +5110,6 @@ msgstr ""
 "platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
 "program�w\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5232,7 +5187,6 @@ msgstr "wymuszono opakowanie ASCII wyniku.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
@@ -5264,7 +5218,6 @@ msgstr "nieznany algorytm ochrony\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5349,7 +5302,6 @@ msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 msgid "error: no ownertrust value\n"
 msgstr "b��d: brak warto��i zaufania w�a�ciciela\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/pt.po b/po/pt.po
index edb04347a..b1e1e6a68 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -33,7 +33,6 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 #, fuzzy
 msgid "yes"
@@ -43,7 +42,6 @@ msgstr "sim"
 msgid "yY"
 msgstr "sS"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n�o"
@@ -52,7 +50,6 @@ msgstr "n�o"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "sair"
@@ -257,7 +254,6 @@ msgstr "n�o cifrado"
 msgid "not processed"
 msgstr "n�o processado"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "chave p�blica n�o utiliz�vel"
@@ -751,19 +747,19 @@ msgstr "|N|usar algoritmo de compress�o N"
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes cifrados"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "N�o mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Configurar linha de comandos para ver fotografias"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -771,7 +767,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -791,15 +787,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -809,7 +805,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -817,374 +813,374 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, fuzzy, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:2623 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 "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:2937 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 "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1192,19 +1188,19 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
@@ -1332,7 +1328,6 @@ msgstr "motivo da revoca��o: "
 msgid "revocation comment: "
 msgstr "coment�rio da revoca��o: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1387,7 +1382,6 @@ msgstr " %d = Confio plenamente\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Confio de forma total\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = mostrar mais informa��es\n"
@@ -1704,14 +1698,6 @@ msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1796,7 +1782,6 @@ msgstr "valor inv�lido\n"
 msgid "%s does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2123,7 +2108,6 @@ msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2137,8 +2121,6 @@ msgstr "AVISO: nada exportado\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
@@ -2369,7 +2351,6 @@ msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2608,8 +2589,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2964,7 +2943,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3263,8 +3241,6 @@ msgstr "Esta chave pode ser revogada pela chave %s "
 msgid " (sensitive)"
 msgstr " (sens�vel)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3391,9 +3367,6 @@ msgstr "Insira o ID de utilizador do revogador escolhido: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
@@ -3487,7 +3460,6 @@ msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
@@ -3528,10 +3500,6 @@ msgstr "nenhuma chave secreta\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3597,7 +3565,6 @@ msgstr "Impress�o da chave prim�ria:"
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "  Impress�o da chave ="
@@ -3607,8 +3574,6 @@ msgstr "  Impress�o da chave ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3720,7 +3685,6 @@ msgstr "Pol�tica: "
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
@@ -3730,10 +3694,6 @@ msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4509,9 +4469,6 @@ msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4561,7 +4518,6 @@ msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5141,7 +5097,6 @@ msgstr ""
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, fuzzy, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5222,7 +5177,6 @@ msgstr ""
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 #, fuzzy
 msgid "Revocation certificate created.\n"
@@ -5257,7 +5211,6 @@ msgstr "algoritmo de compress�o desconhecido"
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5335,7 +5288,6 @@ msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 msgid "error: no ownertrust value\n"
 msgstr "exportar os valores de confian�a"
 
-#. error
 #: g10/tdbdump.c:204
 #, fuzzy, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 91348dfe3..99e1250d3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -38,7 +38,6 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 #, fuzzy
 msgid "yes"
@@ -48,7 +47,6 @@ msgstr "sim"
 msgid "yY"
 msgstr "sS"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n�o"
@@ -58,7 +56,6 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "sair"
@@ -264,7 +261,6 @@ msgstr "n�o criptografado"
 msgid "not processed"
 msgstr "n�o processado(s)"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 #, fuzzy
 msgid "unusable public key"
@@ -784,25 +780,25 @@ msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -822,15 +818,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -840,7 +836,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -848,382 +844,382 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, fuzzy, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:2623 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 "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:2937 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 "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1232,21 +1228,21 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1382,7 +1378,6 @@ msgstr "rev- revoga��es de chaves incorreta\n"
 msgid "revocation comment: "
 msgstr "[revoga��o]"
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr ""
@@ -1444,7 +1439,6 @@ msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 msgid " %d = I trust ultimately\n"
 msgstr ""
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr ""
@@ -1768,14 +1762,6 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1862,7 +1848,6 @@ msgstr "valor inv�lido\n"
 msgid "%s does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
@@ -2184,7 +2169,6 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2198,8 +2182,6 @@ msgstr "AVISO: nada exportado\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 #, fuzzy
 msgid "[User id not found]"
@@ -2429,7 +2411,6 @@ msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2659,8 +2640,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -3014,7 +2993,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr ""
@@ -3329,8 +3307,6 @@ msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 msgid " (sensitive)"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3453,9 +3429,6 @@ msgstr "Digite o tamanho da chave"
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3551,7 +3524,6 @@ msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
@@ -3593,10 +3565,6 @@ msgstr "nenhuma chave secreta\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3664,7 +3632,6 @@ msgstr "       Impress�o digital:"
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 #, fuzzy
 msgid "     Key fingerprint ="
@@ -3675,8 +3642,6 @@ msgstr "       Impress�o digital:"
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3789,7 +3754,6 @@ msgstr "Pol�tica: "
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
@@ -3800,10 +3764,6 @@ msgstr "fazer uma assinatura separada"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4572,9 +4532,6 @@ msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4625,7 +4582,6 @@ msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5150,7 +5106,6 @@ msgstr ""
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5230,7 +5185,6 @@ msgstr ""
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 #, fuzzy
 msgid "Revocation certificate created.\n"
@@ -5266,7 +5220,6 @@ msgstr "algoritmo de compress�o desconhecido"
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5341,7 +5294,6 @@ msgstr "erro: impress�o digital inv�lida\n"
 msgid "error: no ownertrust value\n"
 msgstr "erro: nenhum valor de confian�a\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, fuzzy, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 42dddf8c8..75381cb09 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-06-17 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -35,7 +35,6 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "da"
@@ -44,7 +43,6 @@ msgstr "da"
 msgid "yY"
 msgstr "dD"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nu"
@@ -53,7 +51,6 @@ msgstr "nu"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "termin�"
@@ -258,7 +255,6 @@ msgstr "necifrat"
 msgid "not processed"
 msgstr "neprocesat"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "cheie public� de nefolosit"
@@ -746,19 +742,19 @@ msgstr "|N|folose�te algoritm compresie N"
 msgid "throw keyid field of encrypted packets"
 msgstr "ignor� c�mp keyid pentru pachete cifrate"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Arat� poze ID-uri"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Nu ar�ta poze ID-uri"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Seteaz� linia de comand� pentru a vedea poze ID-uri"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -766,7 +762,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -786,15 +782,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -804,7 +800,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -812,382 +808,382 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "articol configurare necunoscut \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru \"%s\" nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nu este un set de carectere valid\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "nu am putut interpreta URI pentru serverul de chei\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "algoritm compresie `%s' este numai-citire �n acest� edi�ie\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritm compresie trebuie s� fie �n intervalul %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul 1..255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2203
+#: 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"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare \"%s\" c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2313
+#: 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"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "nu pute�i folosi algoritmul de compresie \"%s\" c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizator"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizator"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:2623 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 "nu pot deschide %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/g10.c:2937 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 "nu pot deschide `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1195,20 +1191,20 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
@@ -1335,7 +1331,6 @@ msgstr "motiv pentru revocare: "
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMtTsS"
@@ -1390,7 +1385,6 @@ msgstr " %d = Am toat� �ncrederea\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Am �ncredere suprem�\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
@@ -1709,14 +1703,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1801,7 +1787,6 @@ msgstr "valoare invalid�\n"
 msgid "%s does not expire at all\n"
 msgstr "%s nu expir� deloc\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2125,7 +2110,6 @@ msgstr "cheia %08lX: nu e protejat� - s�rit�\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "cheia %08lX: cheie stil PGP 2.x - s�rit�\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2139,8 +2123,6 @@ msgstr "AVERTISMENT: nimic exportat\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
@@ -2371,7 +2353,6 @@ msgstr "nici un inel de chei secret implicit: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "cheia %08lX: cheie secret� importat�\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2609,8 +2590,6 @@ msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2966,7 +2945,6 @@ msgstr "steuid"
 msgid "delete user ID"
 msgstr "�terge ID utilizator"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "stepoza"
@@ -3266,8 +3244,6 @@ msgstr "Aceast� cheie poate fi revocat� de cheia %s "
 msgid " (sensitive)"
 msgstr " (senzitiv)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3395,9 +3371,6 @@ msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
@@ -3493,7 +3466,6 @@ msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "A�i semnat aceste ID-uri utilizator:\n"
@@ -3534,10 +3506,6 @@ msgstr "nici o cheie secret�\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3602,7 +3570,6 @@ msgstr " Amprent� cheie primar�:"
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Amprent� cheie ="
@@ -3612,8 +3579,6 @@ msgstr "     Amprent� cheie ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3724,7 +3689,6 @@ msgstr "Politica: "
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
@@ -3734,10 +3698,6 @@ msgstr "nu pot m�nui aceste semn�turi multiple\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Semn�tur� f�cut� %.*s folosind cheia %s cu ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
@@ -4505,9 +4465,6 @@ msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %08lX nu a fost g�sit�\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4555,7 +4512,6 @@ msgstr ""
 "s�rit� `%s': aceasta este o cheie ElGamal generat� de PGP care nu e sigur� "
 "pentru semn�turi!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5149,7 +5105,6 @@ msgstr ""
 "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
 "externe\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5227,7 +5182,6 @@ msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
@@ -5259,7 +5213,6 @@ msgstr "algoritm de protec�ie necunoscut\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5338,7 +5291,6 @@ msgstr "eroare: amprent� invalid�\n"
 msgid "error: no ownertrust value\n"
 msgstr "eroare: nici o valoare �ncredere pentru proprietar\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 0d21934c2..3d54fa4e9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-23 19:24+0100\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -33,7 +33,6 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "да"
@@ -42,7 +41,6 @@ msgstr "да"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "нет"
@@ -51,7 +49,6 @@ msgstr "нет"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "Выход"
@@ -256,7 +253,6 @@ msgstr "не зашифровано"
 msgid "not processed"
 msgstr "не выполнено"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "неприменимый открытый ключ"
@@ -737,19 +733,19 @@ msgstr "|N|использовать метод сжатия номер N"
 msgid "throw keyid field of encrypted packets"
 msgstr "не сохранять идентификатор ключа в зашифрованном сообщении"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Показывать фото ID"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Не показывать фото ID"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Задать командную строку для показа фото ID"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -757,7 +753,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -777,18 +773,18 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки (fingerprints)\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "О найденных ошибка сообщайте <[email protected]>.\n"
 "Подпишитесь на русскоязычную группу рассылки GnuPG-ru отправив письмо по "
 "адресу [email protected] с темой subscribe.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -798,7 +794,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -806,373 +802,373 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = sign found in group definition \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "файл конфигурации содержит неизвестный параметр \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек старого формата `%s' проигнорирован\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек `%s' не обнаружен\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл настроек `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "настройки взяты из файла `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s недопустимая таблица символов\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заменит %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного использования!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s недопустимо использовать с %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr ""
 "алгоритм сжатия `%s' в настоящей версии используется только для чтения\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "метод сжатия должен быть в диапазоне %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s не работает пока с %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:2623 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 "не могу открыть %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "не удалось экспортировать ключ: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "неудача при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "неудача при обновлении на сервере ключей: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:2937 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 "не могу открыть `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1180,19 +1176,19 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания должно содержать '@' символ\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
@@ -1320,7 +1316,6 @@ msgstr "причина отзыва: "
 msgid "revocation comment: "
 msgstr "прокомментируйте отзыв: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1375,7 +1370,6 @@ msgstr " %d = Полностью доверяю\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Абсолютно доверяю\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = покажите мне больше информации\n"
@@ -1686,14 +1680,6 @@ msgstr "слишком малый размер ключа; 1024 - минимал
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "слишком малый размер ключа; 768 - минимально допустимый размер.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1778,7 +1764,6 @@ msgstr "неправильное значение\n"
 msgid "%s does not expire at all\n"
 msgstr "%s не имеет ограничения срока действия\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2097,7 +2082,6 @@ msgstr "ключ %08lX: не защищен - пропущен\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "ключ %08lX: PGP 2.x стиля - пропущен\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2111,8 +2095,6 @@ msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User ID Не найден]"
@@ -2343,7 +2325,6 @@ msgstr "нет основной таблицы секретных ключей:
 msgid "key %08lX: secret key imported\n"
 msgstr "ключ %08lX: секретный ключ импортирован\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2575,8 +2556,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2931,7 +2910,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "удалить User ID"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3229,8 +3207,6 @@ msgstr "Данный ключ может быть отозван ключом %s
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3356,9 +3332,6 @@ msgstr "Укажите User ID ключа, назначенного отзыва
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
@@ -3450,7 +3423,6 @@ msgstr "Вы уверены, что хотите отозвать? (y/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Вы подписали данные User ID:\n"
@@ -3491,10 +3463,6 @@ msgstr "нет секретного ключа\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3558,7 +3526,6 @@ msgstr " Отпечаток главного ключа:"
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Отпечаток ключа ="
@@ -3568,8 +3535,6 @@ msgstr "     Отпечаток ключа ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер сеансового ключа шифрования (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3680,7 +3645,6 @@ msgstr "URL Правил: "
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "не могу обработать эти множественные подписи\n"
@@ -3690,10 +3654,6 @@ msgstr "не могу обработать эти множественные п�
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Подпись создана %.*s ключом %s с ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Ключ доступен: "
@@ -4448,9 +4408,6 @@ msgstr "не найдено абсолютно доверяемых ключей
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %08lX не найден\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4500,7 +4457,6 @@ msgstr ""
 "пропущено `%s': это созданный PGP - ElGamal ключ, не обеспечивающий\n"
 "безопасность подписи\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5071,7 +5027,6 @@ msgstr ""
 "на данной платформе требуется использование временных файлов\n"
 " при вызове внешних программ\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5149,7 +5104,6 @@ msgstr "Для вывода использован ASCII формат.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Сертификат отзыва создан.\n"
@@ -5181,7 +5135,6 @@ msgstr "неизвестный алгоритм защиты\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5261,7 +5214,6 @@ msgstr "ошибка: неверный отпечаток\n"
 msgid "error: no ownertrust value\n"
 msgstr "ошибка: нет значения доверия (ownertrust)\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/sk.po b/po/sk.po
index ec47f00ad..b03b65782 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -29,7 +29,6 @@ msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ano"
@@ -38,7 +37,6 @@ msgstr "ano"
 msgid "yY"
 msgstr "aAyY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nie"
@@ -47,7 +45,6 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "ukon�i�"
@@ -252,7 +249,6 @@ msgstr "neza�ifrovan�"
 msgid "not processed"
 msgstr "nespracovan�"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "nepou�ite�n� verejn� k���"
@@ -753,21 +749,21 @@ msgstr ""
 "zahodi� identifik�tor k���a zo �ifrovan�ch\n"
 " paketov"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Zobrazi� fotografick� ID"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazova� fotografick� ID"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Nastavi� pr�kazov� riadok na prehliadanie\n"
 " fotografick�ho ID"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -776,7 +772,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -796,17 +792,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -816,7 +812,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -824,374 +820,374 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "hashovac� algoritmus `%s' je len na ��tanie v tejto verzii\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompresn� algoritmus mus� by� v rozmedz� %d..%d\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u��vate�a"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u��vate�a"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:2623 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 "nemo�no otvori� %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:2937 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 "nemo�no otvori� `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1199,19 +1195,19 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
@@ -1338,7 +1334,6 @@ msgstr "d�vod na revok�ciu: "
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
@@ -1393,7 +1388,6 @@ msgstr " %d = D�verujem �plne\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = D�verujem absol�tne\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
@@ -1711,14 +1705,6 @@ msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� je 768 bitov.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1803,7 +1789,6 @@ msgstr "neplatn� hodnota\n"
 msgid "%s does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2126,7 +2111,6 @@ msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2140,8 +2124,6 @@ msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[User id not found]"
@@ -2374,7 +2356,6 @@ msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2614,8 +2595,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2971,7 +2950,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3269,8 +3247,6 @@ msgstr "Tento k��� m��e by� revokovan� k���om %s "
 msgid " (sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3396,9 +3372,6 @@ msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
@@ -3490,7 +3463,6 @@ msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
@@ -3531,10 +3503,6 @@ msgstr "neexistuje tajn� k���\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3599,7 +3567,6 @@ msgstr " Prim�rny fingerprint k���a:"
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "   Fingerprint k���a ="
@@ -3609,8 +3576,6 @@ msgstr "   Fingerprint k���a ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3727,7 +3692,6 @@ msgstr "Politika: "
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
@@ -3738,10 +3702,6 @@ msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
@@ -4505,9 +4465,6 @@ msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4557,7 +4514,6 @@ msgstr ""
 "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
 "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5142,7 +5098,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5220,7 +5175,6 @@ msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
@@ -5252,7 +5206,6 @@ msgstr "nezn�my ochrann� algoritmus\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5331,7 +5284,6 @@ msgstr "chyba: neplatn� odtla�ok\n"
 msgid "error: no ownertrust value\n"
 msgstr "chyba: �iadna �rove� d�veryhodnosti\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 05995b36a..6a08838f0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -20,8 +20,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -45,7 +45,6 @@ msgstr "operationen �r inte m�jlig utan tillg�ng till s�kert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha anv�nt fel program f�r denna uppgift)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
@@ -54,7 +53,6 @@ msgstr "ja"
 msgid "yY"
 msgstr "jJ"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nej"
@@ -63,7 +61,6 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "avsluta"
@@ -269,7 +266,6 @@ msgstr "inte krypterad"
 msgid "not processed"
 msgstr "inte behandlade"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "oanv�ndbar offentlig (publik) nyckel"
@@ -751,19 +747,19 @@ msgstr "|N|anv�nd komprimeringsalgoritmen N"
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Visa fotoidentifikation"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Visa inte fotoidentifikation"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "S�tt komandoraden f�r att visa fotoientifikation"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -771,7 +767,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -791,17 +787,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -811,7 +807,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -819,180 +815,180 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VARNING: %s os�ker �gare till %s\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "%s: ny inst�llningsfil skapad\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBSERVERA: inst�llningsfilen \"%s\" anv�nds inte\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBSERVERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importalternativ %d\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "felaktiga importalternativ\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "felaktiga exportalternativ\n"
 
-#: g10/g10.c:1874
+#: 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"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s g�ller ist�llet f�r %s\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBSERVERA: %s �r inte f�r normal anv�ndning!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, 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/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa fr�nkopplade signaturereller klartextsignaturer\n"
 "tillsammans med --pgp2\n"
 
-#: g10/g10.c:2075
+#: 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"
 
-#: g10/g10.c:2081
+#: 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"
 
-#: g10/g10.c:2094
+#: 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"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, fuzzy, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -1003,201 +999,201 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 # �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
-#: g10/g10.c:2195
+#: 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"
 
-#: g10/g10.c:2197
+#: 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"
 
-#: g10/g10.c:2199
+#: 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"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBSERVERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2210
+#: 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"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinst�llningar\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktiga inst�llningar av krypteringsalgoritm\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "felaktiga inst�llningar av checksummealgoritm\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "felaktiga inst�llningar av kompressionsalgoritm\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symetrisk kryptering valts\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/g10.c:2623 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"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/g10.c:2937 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:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1205,20 +1201,20 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy �r ogiltig\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy �r ogiltig\n"
 
@@ -1349,7 +1345,6 @@ msgstr "Anledning till sp�rren: "
 msgid "revocation comment: "
 msgstr "Sp�rrkommentar: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr ""
@@ -1410,7 +1405,6 @@ msgstr " %d = Jag litar fullst�ndigt p� denna anv�ndare\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Jag litar helt och h�llet p� denna anv�ndare\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = visa mer information\n"
@@ -1730,14 +1724,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "nyckelstorleken �r f�r liten; 768 �r det minsta till�tna v�rdet.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1824,7 +1810,6 @@ msgstr "ogiltigt v�rde\n"
 msgid "%s does not expire at all\n"
 msgstr "Giltighetstiden f�r %s g�r aldrig ut\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2151,7 +2136,6 @@ msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - �verhoppad\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2165,8 +2149,6 @@ msgstr "VARNING: exporterade ingenting\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Hittade inte anv�ndaridentiteten]"
@@ -2404,7 +2386,6 @@ msgstr "ingen f�rvald publik nyckel\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln �r importerad\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2644,8 +2625,6 @@ msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du att giltighetstiden f�r signaturen ska upph�ra vid samma tid? (J/n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -3006,7 +2985,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "ta bort bild"
@@ -3311,8 +3289,6 @@ msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
 msgid " (sensitive)"
 msgstr " (k�nsligt)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3438,9 +3414,6 @@ msgstr "Ange ID f�r �nskad sp�rrnyckel"
 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"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
@@ -3538,7 +3511,6 @@ msgstr ""
 "Vill du skapa ett sp�rrcertifikat (revocation certificate) f�r denna "
 "signatur? (j/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
@@ -3580,10 +3552,6 @@ msgstr "ingen hemlig nyckel\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3651,7 +3619,6 @@ msgstr "           Fingeravtryck:"
 msgid "      Subkey fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 #, fuzzy
 msgid "     Key fingerprint ="
@@ -3662,8 +3629,6 @@ msgstr "           Fingeravtryck:"
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3789,7 +3754,6 @@ msgstr "Policy: "
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
@@ -3799,10 +3763,6 @@ msgstr "kan inte hantera dessa multipla signaturer\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4583,9 +4543,6 @@ msgstr ""
 "Hittar inte den offentliga (publika) nyckeln tillh�rande den ultimat "
 "betrodda nyckeln %08lX \n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4635,7 +4592,6 @@ msgstr ""
 "hoppade �ver \"%s\": detta �r en nyckel av ElGamal-typ genererad av PGP\n"
 "som inte �r s�ker f�r signaturer!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5228,7 +5184,6 @@ msgstr ""
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, fuzzy, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5311,7 +5266,6 @@ msgstr ""
 msgid "make_keysig_packet failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 #, fuzzy
 msgid "Revocation certificate created.\n"
@@ -5346,7 +5300,6 @@ msgstr "ok�nd komprimeringsalgoritm"
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5423,7 +5376,6 @@ msgstr "%s: ogiltig filversion %d\n"
 msgid "error: no ownertrust value\n"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#. error
 #: g10/tdbdump.c:204
 #, fuzzy, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/tr.po b/po/tr.po
index ba4a62c0f..6cd8a18df 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-07-08 08:10+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -34,7 +34,6 @@ msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "evet"
@@ -43,7 +42,6 @@ msgstr "evet"
 msgid "yY"
 msgstr "eE"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "hayır"
@@ -52,7 +50,6 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit"
@@ -257,7 +254,6 @@ msgstr "şifrelenemedi"
 msgid "not processed"
 msgstr "işlenemedi"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "genel anahtar kullanımdışı"
@@ -739,19 +735,19 @@ msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -759,7 +755,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -779,15 +775,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -797,7 +793,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -805,369 +801,369 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "grup tanımı \"%s\" içinde = işareti yok\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "bu dağıtımda sıkıştırma algoritması %s salt-okunurdur\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s henüz %s ile çalışmıyor\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:2623 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 "%s açılamadı: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh başarısız: %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:2937 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 "`%s' açılamadı\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1175,19 +1171,19 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
@@ -1314,7 +1310,6 @@ msgstr "yürürlükten kaldırma sebebi: "
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "bBmMaAkK"
@@ -1369,7 +1364,6 @@ msgstr " %d = Tamamen güveniyorum\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Son derece güveniyorum\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " b = Daha fazla bilgi gerekli\n"
@@ -1686,14 +1680,6 @@ msgstr ""
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1778,7 +1764,6 @@ msgstr "değer hatalı\n"
 msgid "%s does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2107,7 +2092,6 @@ msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2121,8 +2105,6 @@ msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
@@ -2355,7 +2337,6 @@ msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2600,8 +2581,6 @@ msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2956,7 +2935,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3257,8 +3235,6 @@ msgstr ""
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3391,9 +3367,6 @@ msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
@@ -3492,7 +3465,6 @@ msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
@@ -3534,10 +3506,6 @@ msgstr "gizli anahtar yok\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3603,7 +3571,6 @@ msgstr "Birincil anahtar parmak izi:"
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
@@ -3613,8 +3580,6 @@ msgstr "     Anahtar parmak izi ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3729,7 +3694,6 @@ msgstr "Güvence: "
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
@@ -3739,10 +3703,6 @@ msgstr "bu çoklu imzalar elde edilemiyor\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliği ile yapılmış\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "Anahtar burada: "
@@ -4512,9 +4472,6 @@ msgstr "son derece güvenli bir anahtar yok\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4564,7 +4521,6 @@ msgstr ""
 "`%s' atlandı:\n"
 "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5138,7 +5094,6 @@ msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
 "bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5216,7 +5171,6 @@ msgstr "ASCII zırhlı çıktı istendi.\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
@@ -5248,7 +5202,6 @@ msgstr "bilinmeyen sıkıştırma algoritması\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5328,7 +5281,6 @@ msgstr "hata: parmakizi geçersiz\n"
 msgid "error: no ownertrust value\n"
 msgstr "hata: hiç sahibiningüvencesi değeri yok\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5820d2806..8538d58c7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2004-07-20 15:50+0200\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -31,7 +31,6 @@ msgstr "��ȫ�ڴ�δ��ʼ�������ܽ��в���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������ʹ���˴���ĳ�������ɴ�������)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "yes"
@@ -40,7 +39,6 @@ msgstr "yes"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
@@ -49,7 +47,6 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit"
@@ -254,7 +251,6 @@ msgstr "δ������"
 msgid "not processed"
 msgstr "δ������"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "�����õĹ�Կ"
@@ -731,19 +727,19 @@ msgstr "|N|ʹ�õ� N ��ѹ���㷨"
 msgid "throw keyid field of encrypted packets"
 msgstr "�����ռ���Կ�׺ż�����ܰ���"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "��ʾ��Ƭ��ʶ"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "����ʾ��Ƭ��ʶ"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "�趨�鿴��Ƭ��ʶʱʹ�õ�������"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -751,7 +747,7 @@ msgstr ""
 "@\n"
 "(��ο�����˵���Ի�����������ѡ��������嵥)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -771,15 +767,15 @@ msgstr ""
 " --list-keys [ĳ��]           ��ʾ��Կ\n"
 " --fingerprint [ĳ��]         ��ʾָ��\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "���� <[email protected]> �������ȱ�ݡ�\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�÷��� gpg [ѡ��] [�ļ�] (�� -h ����)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -789,7 +785,7 @@ msgstr ""
 "ǩ�֡���顢���ܻ����\n"
 "Ĭ�ϵĲ������������ݶ���\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -797,386 +793,386 @@ msgstr ""
 "\n"
 "֧�ֵ��㷨��\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "��Կ��"
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "�ԳƼ��ܣ�"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "ɢ�У�"
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "ѹ����"
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "�÷���gpg [ѡ��] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "��ͻ��ָ��\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "�ڡ�%s���鶨�����Ҳ����Ⱥ�(=)\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "δ֪�������%s��\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ע�⣺��ʽ��Ĭ�������ļ���%s���ѱ�����\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ע�⣺û��Ĭ�������ļ���%s��\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�����ļ���%s����%s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�ӡ�%s����ȡѡ��\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ����һ����Ч���ַ���\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "�޷�������Կ������ URI\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s��%d����Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "��Ч�ĵ���ѡ��\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�޷�������·����� %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "���棺������ܻᴴ�������ڴ�ת����\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "���棺%s ��ʹ�� %s ʧЧ\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ע�⣺һ������²����õ� %s��\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ������ %s ����\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ���������壡\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "��ֻ���� --pgp2 ģʽ�²���������ʽ������ǩ��\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "���� --pgp2 ģʽ��ʱ������ͬʱǩ�ֺͼ���\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� --pgp2 ʱ��Ӧ��ֻʹ���ļ������ǹܵ�\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�� --pgp2 ģʽ�¼��ܱ�����Ҫ IDEA �㷨\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "��ѡ��ɢ���㷨��Ч\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "��%s��ѹ���㷨�ڱ����а汾��ֻ��\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ѹ���㷨һ��Ҫ���� %d �� %d ֮��\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "��Ҫ����ȫ����ǩ����һ��Ҫ���� 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "��Ҫ����ǿ����ǩ����һ��Ҫ���� 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "��Ч����С��֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ע�⣺ǿ�Ҳ�����ʹ�ü򵥵� S2K ģʽ(0)\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "��Ч�� S2K ģʽ�������� 0��1 �� 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "��Ч��Ĭ����ѡ��\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "��Ч�ĸ��˶ԳƼ����㷨��ѡ��\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "��Ч�ĸ���ɢ���㷨��ѡ��\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s Ŀǰ�޷��� %s ����\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "�����ý��ԳƼ����㷨��%s������ %s ģʽ��\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "�����ý�ɢ���㷨��%s������ %s ģʽ��\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "�����ý�ѹ���㷨��%s������ %s ģʽ��\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "���棺�������ռ���(-r)����δʹ�ù�Կ����\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [�ļ���]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ļ���]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ļ���]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [�ļ���]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ļ���]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ļ���]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ļ���]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ļ���]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key �û���ʶ"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �û���ʶ"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �û���ʶ"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �û���ʶ"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �û���ʶ [ָ��]"
 
-#: g10/g10.c:2623 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 "�޷��� %s��%s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�޷����͵���Կ��������%s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�޷��ӹ�Կ���������գ�%s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "�޷�������Կ��%s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�޷��ڹ�Կ��������������%s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�޷��ӹ�Կ�������ϸ��£�%s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�⿪ ASCII ��װʧ�ܣ�%s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "���� ASCII ��װʧ�ܣ�%s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "��Ч�ġ�%s��ɢ���㷨\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[�ļ���]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "�뿪ʼ�������ı��ġ���\n"
 
-#: g10/g10.c:2937 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 "�޷��򿪡�%s��\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "������Ʊ���ֻ���пɴ�ӡ���ַ���ո񣬲���һ����=������β\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�û��������һ��Ҫ���С�@���ַ�\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "���ֵһ������ʹ���κεĿ����ַ�\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "�����ĵ���֤���� URL ��Ч\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "������ǩ�ֲ��� URL ��Ч\n"
 
@@ -1302,7 +1298,6 @@ msgid "revocation comment: "
 msgstr "����ע�ͣ�"
 
 #  a string with valid answers
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1356,7 +1351,6 @@ msgstr " %d = ����ȫ����\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = �Ҿ�������\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = ������Ҹ�����Ϣ\n"
@@ -1665,14 +1659,6 @@ msgstr "��Կ�ߴ�̫С��RSA ��Կ�ߴ�����Ҫ�� 1024��\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1755,7 +1741,6 @@ msgstr "��Ч����ֵ\n"
 msgid "%s does not expire at all\n"
 msgstr "%s ��Զ�������\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2069,7 +2054,6 @@ msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "��Կ %08lX��PGP 2.x ��ʽ����Կ����������\n"
 
 #  I hope this warning doesn't confuse people.
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2083,8 +2067,6 @@ msgstr "���棺û�е����κζ���\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk ��������Ŀ̫�ࡪ���ѽ���\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[�Ҳ����û���ʶ]"
@@ -2313,7 +2295,6 @@ msgstr "û��Ĭ�ϵ�˽ԿԿ�׻��� %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "��Կ %08lX��˽Կ�ѵ���\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2548,8 +2529,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "����Ҫ����һ���µ�ǩ����ȡ���ѹ��ڵ���һ����(y/N)"
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2901,7 +2880,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "ɾ��һ���û�/��Ƭ��ʶ"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3199,8 +3177,6 @@ msgstr "�����Կ�ɱ��� %s ��Կ������"
 msgid " (sensitive)"
 msgstr " (���е�)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3329,9 +3305,6 @@ msgstr "�޷��� PGP 2.x ��ʽ����Կ��Ϊָ��������\n"
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�����ܽ�ĳ����Կ��Ϊ���Լ���ָ��������\n"
@@ -3423,7 +3396,6 @@ msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
@@ -3464,10 +3436,6 @@ msgstr "û��˽Կ\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�û���ʶ��%s���Ѿ���������\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3533,7 +3501,6 @@ msgid "      Subkey fingerprint:"
 msgstr " ��Կָ�ƣ�"
 
 #  use tty
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr " ��Կָ�� ="
@@ -3543,8 +3510,6 @@ msgstr " ��Կָ�� ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "���ܹ��ĻỰ��Կ�ߴ�(%d)����\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3655,7 +3620,6 @@ msgstr "���ԣ�"
 msgid "signature verification suppressed\n"
 msgstr "ǩ����֤�ѱ�����\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "�޷�������Щ����ǩ��\n"
@@ -3665,10 +3629,6 @@ msgstr "�޷�������Щ����ǩ��\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�� %.*s ������ǩ�֣�ʹ�� %s��Կ�׺� %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 msgid "Key available at: "
 msgstr "��Կ��ȡ�ԣ�"
@@ -4410,9 +4370,6 @@ msgstr "û���ҵ��κξ������ε���Կ\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "�������ε���Կ %08lX �Ĺ�Կδ���ҵ�\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4458,7 +4415,6 @@ msgid ""
 "signatures!\n"
 msgstr "��%s��������������һ���� PGP ���ɵ� ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5017,7 +4973,6 @@ msgstr "���������ļ�Ȩ�޲���ȫ���ⲿ������ñ�����\n"
 msgid "this platform requires temp files when calling external programs\n"
 msgstr "���������ƽ̨�ϵ����ⲿ����ʱ��Ҫ��ʱ�ļ�\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5095,7 +5050,6 @@ msgstr "��ǿ��ʹ�� ASCII ��װ���������\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet ʧ�ܣ� %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "�ѽ�������֤�顣\n"
@@ -5127,7 +5081,6 @@ msgstr "δ֪�ı����㷨\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "ע�⣺�����Կû�б�������\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5207,7 +5160,6 @@ msgstr "������Ч��ָ��\n"
 msgid "error: no ownertrust value\n"
 msgstr "����û�����ζ�\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 87889b364..926ad3e68 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-08-09 21:19+0200\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -33,7 +33,6 @@ msgstr "�|���ҥΦw�����O����e�A���i��i��ާ@\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:307 util/miscutil.c:344
 #, fuzzy
 msgid "yes"
@@ -43,7 +42,6 @@ msgstr "yes"
 msgid "yY"
 msgstr "yY"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
@@ -52,7 +50,6 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
 #: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "quit"
@@ -257,7 +254,6 @@ msgstr "���Q�[�K"
 msgid "not processed"
 msgstr "���Q�B�z"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "���i�Ϊ����_"
@@ -734,19 +730,19 @@ msgstr "|N|�ϥ� N ���Y�t��k"
 msgid "throw keyid field of encrypted packets"
 msgstr "�q�w�[�K���ʥ]�������_ ID �϶�"
 
-#: g10/g10.c:488
+#: g10/g10.c:489
 msgid "Show Photo IDs"
 msgstr "��ܷӤ� ID"
 
-#: g10/g10.c:489
+#: g10/g10.c:490
 msgid "Don't show Photo IDs"
 msgstr "����ܷӤ� ID"
 
-#: g10/g10.c:490
+#: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
 msgstr "�]�w�[�ݷӤ� ID �ɭn�Ϊ��R�O�C"
 
-#: g10/g10.c:497
+#: g10/g10.c:498
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -754,7 +750,7 @@ msgstr ""
 "@\n"
 "(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
 
-#: g10/g10.c:500
+#: g10/g10.c:501
 msgid ""
 "@\n"
 "Examples:\n"
@@ -774,15 +770,15 @@ msgstr ""
 " --list-keys [�W�r]         ��ܪ��_\n"
 " --fingerprint [�W�r]       ��ܫ���\n"
 
-#: g10/g10.c:666 g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
 
-#: g10/g10.c:683
+#: g10/g10.c:684
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
 
-#: g10/g10.c:686
+#: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -792,7 +788,7 @@ msgstr ""
 "ñ�p�B�ˬd�B�[�K�θѱK\n"
 "�w�]���ާ@�|�̿�J��Ʀөw\n"
 
-#: g10/g10.c:697
+#: g10/g10.c:698
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -800,388 +796,388 @@ msgstr ""
 "\n"
 "�w�Q�䴩���t��k�G\n"
 
-#: g10/g10.c:700
+#: g10/g10.c:701
 msgid "Pubkey: "
 msgstr "���_�G "
 
-#: g10/g10.c:706 g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
 msgstr "�s�K�k�G "
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 msgid "Hash: "
 msgstr "����G "
 
-#: g10/g10.c:718 g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
 msgstr "���Y�G "
 
-#: g10/g10.c:801
+#: g10/g10.c:802
 msgid "usage: gpg [options] "
 msgstr "�Ϊk�G gpg [�ﶵ] "
 
-#: g10/g10.c:869
+#: g10/g10.c:870
 msgid "conflicting commands\n"
 msgstr "���O�����٬�\n"
 
-#: g10/g10.c:887
+#: g10/g10.c:888
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1088
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1090
+#: g10/g10.c:1091
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
 
-#: g10/g10.c:1093
+#: g10/g10.c:1094
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1098
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1224
 #, fuzzy, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "�s���]�w�� `%s' �Q�إߤF\n"
 
-#: g10/g10.c:1437
+#: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
 
-#: g10/g10.c:1473
+#: g10/g10.c:1481
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1485
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�ﶵ�� `%s' �G %s\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�q `%s' Ū���ﶵ\n"
 
-#: g10/g10.c:1693
+#: g10/g10.c:1701
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
 
-#: g10/g10.c:1828
+#: g10/g10.c:1836
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ���O�@�Ӧ��Ī��r����\n"
 
-#: g10/g10.c:1846
+#: g10/g10.c:1854
 msgid "could not parse keyserver URI\n"
 msgstr "�L�k���R���_���A�� URI\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:1866
 msgid "invalid import options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:1865
+#: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1876
 msgid "invalid export options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:1874
+#: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�L�k������ɸ��|�]�� %s\n"
 
-#: g10/g10.c:2032
+#: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
 
-#: g10/g10.c:2036
+#: g10/g10.c:2044
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
 
-#: g10/g10.c:2043 g10/g10.c:2054
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2053
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ���Q���\�� %s �֥�\n"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2056
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2077
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
 
-#: g10/g10.c:2075
+#: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
 
-#: g10/g10.c:2081
+#: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
 
-#: g10/g10.c:2161 g10/g10.c:2179
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:2167 g10/g10.c:2185
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
 msgstr "�ҿ諸�K�n�t��k�L��\n"
 
-#: g10/g10.c:2173
+#: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
 
-#: g10/g10.c:2189
+#: g10/g10.c:2197
 #, fuzzy, c-format
 msgid "compress algorithm `%s' is read-only in this release\n"
 msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
 
-#: g10/g10.c:2193
+#: g10/g10.c:2201
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���Y�t��k�@�w�n���� %d �� %d ����\n"
 
-#: g10/g10.c:2195
+#: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �@�w�n�j�� 0\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �@�w�n�j�� 1\n"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
 
-#: g10/g10.c:2201
+#: g10/g10.c:2209
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
 
-#: g10/g10.c:2203
+#: g10/g10.c:2211
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "�Ъ`�N�G�j�P����ĳ�ϥγ�ª� S2K �Ҧ� (0)\n"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
 
-#: g10/g10.c:2217
+#: g10/g10.c:2225
 msgid "invalid default preferences\n"
 msgstr "�L�Ī��w�]���n\n"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
 msgstr "�L�Ī��ӤH�s�K�k���n\n"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
 msgstr "�L�Ī��ӤH�K�n���n\n"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
 msgstr "�L�Ī��ӤH���Y���n\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2272
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2321
 #, fuzzy, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2418
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/g10.c:2421
+#: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
 
-#: g10/g10.c:2432
+#: g10/g10.c:2440
 msgid "--store [filename]"
 msgstr "--store [�ɦW]"
 
-#: g10/g10.c:2439
+#: g10/g10.c:2447
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ɦW]"
 
-#: g10/g10.c:2451
+#: g10/g10.c:2459
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ɦW]"
 
-#: g10/g10.c:2466
+#: g10/g10.c:2474
 msgid "--sign [filename]"
 msgstr "--sign [�ɦW]"
 
-#: g10/g10.c:2479
+#: g10/g10.c:2487
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:2493
+#: g10/g10.c:2501
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ɦW]"
 
-#: g10/g10.c:2502
+#: g10/g10.c:2510
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ɦW]"
 
-#: g10/g10.c:2527
+#: g10/g10.c:2535
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ɦW]"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2543
 msgid "--sign-key user-id"
 msgstr "--sign-key �ϥΪ�ID"
 
-#: g10/g10.c:2543
+#: g10/g10.c:2551
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2551
+#: g10/g10.c:2559
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2559
+#: g10/g10.c:2567
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2567
+#: g10/g10.c:2575
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �ϥΪ�ID [���O]"
 
-#: g10/g10.c:2623 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 "�L�k�}�� %s: %s\n"
 
-#: g10/g10.c:2638
+#: g10/g10.c:2646
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
 
-#: g10/g10.c:2675
+#: g10/g10.c:2683
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2677
+#: g10/g10.c:2685
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2687
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2698
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:2708
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/g10.c:2741
+#: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�i��ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2844
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�L�Ī� `%s' ����t��k\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2938
 msgid "[filename]"
 msgstr "[�ɦW]"
 
-#: g10/g10.c:2934
+#: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
 msgstr "�ж}�l��J�p���T�� ...\n"
 
-#: g10/g10.c:2937 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 "�L�k�}�� `%s'\n"
 
-#: g10/g10.c:3210
+#: g10/g10.c:3218
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
 
-#: g10/g10.c:3219
+#: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
 
-#: g10/g10.c:3229
+#: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
 msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
 
-#: g10/g10.c:3264
+#: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
 msgstr "���w�������ҭ�h URL �L��\n"
 
-#: g10/g10.c:3266
+#: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
 msgstr "���w��ñ����h URL �L��\n"
 
@@ -1306,7 +1302,6 @@ msgstr "�M�P��]�G "
 msgid "revocation comment: "
 msgstr "�M�P�����G "
 
-#. a string with valid answers
 #: g10/pkclist.c:254
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
@@ -1360,7 +1355,6 @@ msgstr " %d = �ڧ����H��\n"
 msgid " %d = I trust ultimately\n"
 msgstr " %d = �ڹ����H��\n"
 
-#. not yet implemented
 #: g10/pkclist.c:313
 msgid " i = please show me more information\n"
 msgstr " i = �Чi�D�ڧ�h�T��\n"
@@ -1671,14 +1665,6 @@ msgstr "���_�ؤo�Ӥp�F RSA �����_�ؤo�̰_�X�����n�� 1024 �C\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * So, before you complain about this limitation, I suggest that
-#. * you start a discussion with Marvin about this theme and then
-#. * do whatever you want.
 #: g10/keygen.c:1155
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1761,7 +1747,6 @@ msgstr "�L�Ī��ƭ�\n"
 msgid "%s does not expire at all\n"
 msgstr "%s �������|�L��\n"
 
-#. print the date when the key expires
 #: g10/keygen.c:1281
 #, c-format
 msgid "%s expires at %s\n"
@@ -2074,7 +2059,6 @@ msgstr "���_ %08lX: ���Q�O�@ �w �w���L\n"
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "���_ %08lX: PGP 2.x �˦������_ �w �w���L\n"
 
-#. I hope this warning doesn't confuse people.
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
@@ -2088,8 +2072,6 @@ msgstr "ĵ�i�G�S���ץX����F��\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk �֨��̦��Ӧh���� �w �w�T��\n"
 
-#. fixme: returning translatable constants instead of a user ID is
-#. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2672
 msgid "[User id not found]"
 msgstr "[�䤣��ϥΪ� ID]"
@@ -2318,7 +2300,6 @@ msgstr "�S���w�]���p�_�_�Ͱ�G %s\n"
 msgid "key %08lX: secret key imported\n"
 msgstr "���_ %08lX: �p�_�Q�פJ�F\n"
 
-#. we can't merge secret keys
 #: g10/import.c:870
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
@@ -2549,8 +2530,6 @@ msgstr ""
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�p�Q�n�o�G�@���s��ñ���Ө��N�w�L�������@�ӶܡH (y/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
 #: g10/keyedit.c:501
 #, c-format
 msgid ""
@@ -2902,7 +2881,6 @@ msgstr "deluid"
 msgid "delete user ID"
 msgstr "�R���@�ӨϥΪ� ID"
 
-#. delphoto is really deluid in disguise
 #: g10/keyedit.c:1018
 msgid "delphoto"
 msgstr "delphoto"
@@ -3200,8 +3178,6 @@ msgstr "�o����_�i��Q %s ���_�M�P�F "
 msgid " (sensitive)"
 msgstr " �]���K���^"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
 #: 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"
@@ -3325,9 +3301,6 @@ msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
@@ -3419,7 +3392,6 @@ msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
 
-#. FIXME: detect duplicates here
 #: g10/keyedit.c:3181
 msgid "You have signed these user IDs:\n"
 msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
@@ -3460,10 +3432,6 @@ msgstr "�S���p�_\n"
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
@@ -3527,7 +3495,6 @@ msgstr " �D�_�����G"
 msgid "      Subkey fingerprint:"
 msgstr "               �l�_�����G"
 
-#. use tty
 #: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "            ���_���� ="
@@ -3537,8 +3504,6 @@ msgstr "            ���_���� ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
 
-#. There is no way to tell the difference here between a bad
-#. passphrase and a cipher algorithm that we don't have.
 #: g10/mainproc.c:262
 #, fuzzy, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
@@ -3650,7 +3615,6 @@ msgstr "��h�G "
 msgid "signature verification suppressed\n"
 msgstr "ñ�����Ҥw�Q����\n"
 
-#. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
@@ -3660,10 +3624,6 @@ msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %08lX\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
 #: g10/mainproc.c:1381
 #, fuzzy
 msgid "Key available at: "
@@ -4408,9 +4368,6 @@ msgstr "�S������������H�������_\n"
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "�����H�����_ %08lX �����_�S���Q���\n"
 
-#. This should be valid=%d now, but I'm not changing it so I
-#. don't break the translated strings in the stable branch.
-#. Change it in devel. -dms
 #: 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"
@@ -4456,7 +4413,6 @@ msgid ""
 "signatures!\n"
 msgstr "`%s' �w���L�G�o�O�@��� PGP ���ͪ� ElGamal ���_�A�Ω�ñ���ä��w���I\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -5015,7 +4971,6 @@ msgstr "�]�����w�����ɮ��v���ﶵ�A�ӸT�ΤF�~���{���s��\n"
 msgid "this platform requires temp files when calling external programs\n"
 msgstr "�b�o�ӧ@�~���x�W�s�Υ~���{���ɻݭn�Ȧs��\n"
 
-#. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
@@ -5093,7 +5048,6 @@ msgstr "�w�j���ϥ� ASCII �ʸ˹L����X�C\n"
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet ���ѡG %s\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
 msgstr "�w�إߺM�P���ҡC\n"
@@ -5125,7 +5079,6 @@ msgstr "�������O�@�t��k\n"
 msgid "NOTE: This key is not protected!\n"
 msgstr "�`�N�G�o����_�S���Q�O�@�I\n"
 
-#. and issue a usage notice
 #: g10/revoke.c:574
 msgid ""
 "Revocation certificate created.\n"
@@ -5205,7 +5158,6 @@ msgstr "���~�G�L�Ī�����\n"
 msgid "error: no ownertrust value\n"
 msgstr "���~�G�S���D�[�H����\n"
 
-#. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index b9737898e..5fedf06d9 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* autogen.sh: Run aclocal with -I m4.
+
 2004-07-20  Werner Koch  <[email protected]>
 
 	* mk-w32-dist: Do not convert zh_CN. 
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 9913d8342..72c54293d 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -250,7 +250,7 @@ if test "$DIE" = "yes"; then
 fi
 
 echo "Running aclocal..."
-aclocal
+aclocal -I m4
 echo "Running autoheader..."
 autoheader
 echo "Running automake --gnu ..."
diff --git a/tools/ChangeLog b/tools/ChangeLog
index ca2ae046c..0c3c14f06 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* Makefile.am: Replaced INTLLIBS by LIBINTL.
+
 2004-06-17  David Shaw  <[email protected]>
 
 	* ring-a-party: ElGamal -> Elgamal
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 387348f6e..a11d9407a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,9 +25,9 @@ needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 bin_PROGRAMS    = gpgsplit
 noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest
 
-gpgsplit_LDADD  = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@
-mpicalc_LDADD   = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@
-bftest_LDADD    = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@
-shmtest_LDADD   = $(needed_libs) @INTLLIBS@ @CAPLIBS@
+gpgsplit_LDADD  = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@
+mpicalc_LDADD   = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@
+bftest_LDADD    = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@
+shmtest_LDADD   = $(needed_libs) @LIBINTL@ @CAPLIBS@
 
 gpgsplit mpicalc bftest shmtest: $(needed_libs)
diff --git a/util/ChangeLog b/util/ChangeLog
index 3f9ba8351..adfd49191 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-09  Werner Koch  <[email protected]>
+
+	* Makefile.am (http-test): Replaced INTLLIBS by LIBINTL.
+
 2004-03-01  David Shaw  <[email protected]>
 
 	* iobuf.c (block_filter): Properly handle a partial body stream
diff --git a/util/Makefile.am b/util/Makefile.am
index a8d40da2d..de641720a 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -31,7 +31,7 @@ libutil_a_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c  \
 
 http-test:  http.c
 	gcc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) -g -Wall -DTEST \
-	    -o http-test http.c libutil.a ../mpi/libmpi.a @INTLLIBS@
+	    -o http-test http.c libutil.a ../mpi/libmpi.a @LIBINTL@
author	Werner Koch <[email protected]>	2004-08-09 19:47:08 +0000
committer	Werner Koch <[email protected]>	2004-08-09 19:47:08 +0000
commit	c6b88a12dddbca674133560b86928c997c87a188 (patch)
tree	9cc3a817679939fc4b6d9a8cf566aed71ace2795
parent	* gpg.sgml: Note that --throw-keyid is --throw-keyids. (diff)
download	gnupg-c6b88a12dddbca674133560b86928c997c87a188.tar.gz gnupg-c6b88a12dddbca674133560b86928c997c87a188.zip