aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--acinclude.m410
-rw-r--r--cipher/ChangeLog6
-rw-r--r--cipher/cipher.c2
-rw-r--r--cipher/random.c2
-rw-r--r--configure.in5
-rw-r--r--g10/ChangeLog12
-rw-r--r--g10/g10.c4
-rw-r--r--g10/hkp.c12
-rw-r--r--g10/openfile.c4
-rw-r--r--g10/pkclist.c9
-rw-r--r--mpi/ChangeLog4
-rw-r--r--po/de.po724
-rw-r--r--po/es_ES.po721
-rw-r--r--po/fr.po718
-rw-r--r--po/it.po722
-rw-r--r--po/pl.po721
-rw-r--r--po/pt_BR.po721
-rw-r--r--po/ru.po721
-rw-r--r--util/ChangeLog5
-rw-r--r--util/dotlock.c4
-rw-r--r--util/http.c4
22 files changed, 2650 insertions, 2486 deletions
diff --git a/ChangeLog b/ChangeLog
index b7b10bedf..27b1b16dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 23 14:20:22 CEST 1999 Werner Koch <[email protected]>
+
+ * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): assume yes when
+ cross-compiling.
+
Mon May 17 21:54:43 CEST 1999 Werner Koch <[email protected]>
* configure.in (socket): Fix for Unisys by Katsuhiro Kondou.
diff --git a/acinclude.m4 b/acinclude.m4
index 2d2ab4d7c..fdb8d147f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -553,9 +553,14 @@ AC_CHECK_TOOL(AS, as, false)
])
# GNUPG_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
-# with an underscore?
+# with an underscore?
AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([GNUPG_PROG_NM])dnl
+[if test "$cross_compiling" = yes; then
+ AC_MSG_CHECKING([for _ prefix in compiled symbols])
+ ac_cv_sys_symbol_underscore=yes
+ AC_MSG_RESULT(assume yes)
+else
+AC_REQUIRE([GNUPG_PROG_NM])dnl
AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl
AC_MSG_CHECKING([for _ prefix in compiled symbols])
AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
@@ -588,6 +593,7 @@ fi
rm -rf conftest*
])
AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
+fi
if test x$ac_cv_sys_symbol_underscore = xyes; then
AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
[define if compiled symbols have a leading underscore])
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index e755d022b..b2fc6401c 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 23 14:20:22 CEST 1999 Werner Koch <[email protected]>
+
+ * cipher.c (setup_cipher_table): Enable Twofish
+
+ * random.c (fast_random_poll): Disable use of times() for mingw32.
+
Mon May 17 21:54:43 CEST 1999 Werner Koch <[email protected]>
* dynload.c (register_internal_cipher_extension): Minor init fix.
diff --git a/cipher/cipher.c b/cipher/cipher.c
index c3712f985..a44dcc4a7 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -83,7 +83,6 @@ setup_cipher_table(void)
int i;
i = 0;
- if( getenv("GNUPG_ENABLE_TWOFISH") ) {
cipher_table[i].algo = CIPHER_ALGO_TWOFISH;
cipher_table[i].name = twofish_get_info( cipher_table[i].algo,
&cipher_table[i].keylen,
@@ -95,7 +94,6 @@ setup_cipher_table(void)
if( !cipher_table[i].name )
BUG();
i++;
- }
cipher_table[i].algo = CIPHER_ALGO_BLOWFISH;
cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
&cipher_table[i].keylen,
diff --git a/cipher/random.c b/cipher/random.c
index eb4fdf793..5fa45ea86 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -360,10 +360,12 @@ fast_random_poll()
add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 );
}
#else /* use times */
+ #ifndef HAVE_DOSISH_SYSTEM
{ struct tms buf;
times( &buf );
add_randomness( &buf, sizeof buf, 1 );
}
+ #endif
#endif
#ifdef HAVE_GETRUSAGE
{ struct rusage buf;
diff --git a/configure.in b/configure.in
index 3d0581ae5..dbcffd66c 100644
--- a/configure.in
+++ b/configure.in
@@ -217,6 +217,11 @@ dnl Checks for libraries.
if test "$try_gettext" = yes; then
AM_GNU_GETTEXT
+else
+USE_NLS=no
+USE_INCLUDED_LIBINTL=no
+AC_SUBST(USE_NLS)
+AC_SUBST(USE_INCLUDED_LIBINTL)
fi
if test "$try_gdbm" = yes; then
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 19a0a0723..7d46c88c9 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,15 @@
+Sun May 23 14:20:22 CEST 1999 Werner Koch <[email protected]>
+
+ * pkclist.c (check_signatures_trust): Print a warning and return
+ immediateley if opt.always_trust is true.
+
+ * g10.c (main): Corrected handling of no-default-keyring
+
+ * pkclist.c (algo_available): Disable Twofish until we have settled
+ how to do the MDC.
+
+ * hkp.c: Disable everything for mingw32
+
Sat May 22 22:47:26 CEST 1999 Werner Koch <[email protected]>
* mainproc.c (check_sig_and_print): Add sig creation time to the
diff --git a/g10/g10.c b/g10/g10.c
index 4a75ff9a9..34e0da3ae 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -849,11 +849,11 @@ main( int argc, char **argv )
if( cmd != aDeArmor && cmd != aEnArmor
&& !(cmd == aKMode && argc == 2 ) ) {
- if( !sec_nrings || default_keyring ) /* add default secret rings */
+ if( !sec_nrings && default_keyring ) /* add default secret rings */
add_keyblock_resource("secring.gpg", 0, 1);
for(sl = sec_nrings; sl; sl = sl->next )
add_keyblock_resource( sl->d, 0, 1 );
- if( !nrings || default_keyring ) /* add default ring */
+ if( !nrings && default_keyring ) /* add default ring */
add_keyblock_resource("pubring.gpg", 0, 0);
for(sl = nrings; sl; sl = sl->next )
add_keyblock_resource( sl->d, 0, 0 );
diff --git a/g10/hkp.c b/g10/hkp.c
index cd5b177b1..cd21d3ec6 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -49,6 +49,9 @@ static int urlencode_filter( void *opaque, int control,
int
hkp_ask_import( u32 *keyid )
{
+ #ifdef HAVE_DOSISH_SYSTEM
+ return -1;
+ #else
struct http_context hd;
char *request;
int rc;
@@ -75,6 +78,7 @@ hkp_ask_import( u32 *keyid )
m_free( request );
return rc;
+ #endif
}
@@ -82,6 +86,9 @@ hkp_ask_import( u32 *keyid )
int
hkp_import( STRLIST users )
{
+ #ifdef HAVE_DOSISH_SYSTEM
+ return -1;
+ #else
if( !opt.keyserver_name ) {
log_error("no keyserver known (use option --keyserver)\n");
return -1;
@@ -97,12 +104,16 @@ hkp_import( STRLIST users )
hkp_ask_import( kid );
}
return 0;
+ #endif
}
int
hkp_export( STRLIST users )
{
+ #ifdef HAVE_DOSISH_SYSTEM
+ return -1;
+ #else
int rc;
armor_filter_context_t afx;
IOBUF temp = iobuf_temp();
@@ -177,6 +188,7 @@ hkp_export( STRLIST users )
}
http_close( &hd );
return rc;
+ #endif
}
static int
diff --git a/g10/openfile.c b/g10/openfile.c
index 6d23f6a55..e60520adb 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -101,7 +101,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
name = opt.outfile;
else {
#ifdef USE_ONLY_8DOT3
- #error please implement this
+ #warning please implement 8.3 files
#endif
buf = m_alloc(strlen(iname)+4+1);
strcpy(stpcpy(buf,iname), mode==1 ? ".asc" :
@@ -135,7 +135,7 @@ open_sigfile( const char *iname )
size_t len;
#ifdef USE_ONLY_8DOT3
- #error please implement this
+ #warning please implement 8.3 files
#endif
if( iname && !(*iname == '-' && !iname[1]) ) {
len = strlen(iname);
diff --git a/g10/pkclist.c b/g10/pkclist.c
index f873be404..a170a3dd3 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -428,6 +428,13 @@ check_signatures_trust( PKT_signature *sig )
int did_add = 0;
int rc=0;
+
+ if( opt.always_trust ) {
+ log_info(_("WARNING: Using untrusted key!\n"));
+ return 0;
+ }
+
+
rc = get_pubkey( pk, sig->keyid );
if( rc ) { /* this should not happen */
log_error("Ooops; the key vanished - can't check the trust\n");
@@ -686,6 +693,8 @@ static int
algo_available( int preftype, int algo )
{
if( preftype == PREFTYPE_SYM ) {
+ if( algo == CIPHER_ALGO_TWOFISH )
+ return 0; /* we don't want to generate Twofish messages for now*/
return algo && !check_cipher_algo( algo );
}
else if( preftype == PREFTYPE_HASH ) {
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 10e3bddd6..db2d7025e 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 23 14:20:22 CEST 1999 Werner Koch <[email protected]>
+
+ * config.links (sysdep.h): Not any more conditionally created.
+
Tue May 4 15:47:53 CEST 1999 Werner Koch <[email protected]>
* mpiutil.c (mpi_alloc_like): New.
diff --git a/po/de.po b/po/de.po
index 2d1a59c8f..2c0ebbe0e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
# Walter Koch <[email protected]>, 1998.
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-05-08 17:55+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"PO-Revision-Date: 1999-05-08 20:24+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -226,22 +226,21 @@ msgstr "Netzwerkfehler"
msgid "not encrypted"
msgstr "nicht verschl�sselt"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
msgid "WARNING: using insecure random number generator!!\n"
-msgstr ""
-"WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
+msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -267,7 +266,7 @@ msgstr ""
"Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
"(Es werden noch %d Byte ben�tigt.)\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -275,131 +274,131 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
msgid "|[file]|make a signature"
msgstr "|[file]|Eine Unterschrift erzeugen"
-#: g10/g10.c:166
+#: g10/g10.c:168
msgid "|[file]|make a clear text signature"
msgstr "|[file]|Eine Klartextunterschrift erzeugen"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "Daten verschl�sseln"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschl�sseln"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "Nur speichern"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "Daten entschl�sseln (Voreinstellung)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "Signatur pr�fen"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "Liste der Schl�ssel"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "Signaturen der Schl�ssel pr�fen"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "Liste der geheimen Schl�ssel"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "Ein neues Schl�sselpaar erzeugen"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "Schl�ssel entfernen"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "Unterschreiben oder Bearbeiten eines Schl�ssels"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "Schl�ssel exportieren"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr "Schl�ssel zu einem Schl�sselserver exportieren"
-#: g10/g10.c:185
+#: g10/g10.c:187
msgid "import keys from a key server"
msgstr "Schl�ssel von einem Schl�sselserver importieren"
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "Schl�ssel importieren/kombinieren"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "Lediglich die Struktur der Datenpakete anzeigen"
-#: g10/g10.c:192
+#: g10/g10.c:194
msgid "export the ownertrust values"
msgstr "Exportieren der \"Owner trust\" Werte"
-#: g10/g10.c:194
+#: g10/g10.c:196
msgid "import ownertrust values"
msgstr "Importieren der \"Owner trust\" Werte"
-#: g10/g10.c:196
+#: g10/g10.c:198
msgid "|[NAMES]|update the trust database"
msgstr "|[NAMES]|�ndern der \"Trust\"-Datenbank"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMES]|�berpr�fen der \"Trust\"-Datenbank"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "Reparieren einer besch�digten \"Trust\"-Datenbank"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "Datei oder stdin von der ASCII-H�lle befreien"
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|Message-Digests f�r die Dateien ausgeben"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "Message-Digests f�r die Eingabedaten ausgeben"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -409,147 +408,148 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-H�lle versehen"
-#: g10/g10.c:212
+#: g10/g10.c:214
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|verschl�sseln f�r NAME"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr "Etwas weniger Infos"
-#: g10/g10.c:223
+#: g10/g10.c:225
msgid "force v3 signatures"
msgstr "v3 Signaturen erzwingen"
-#: g10/g10.c:224
+#: g10/g10.c:226
msgid "always use a MDC for encryption"
msgstr "Beim Verschl�ssen ein Siegel (MDC) verwenden"
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "Als geheimen Schl�sselbund mitbenutzen"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|Schl�ssel bei diesen Server nachschlagen"
-#: g10/g10.c:233
+#: g10/g10.c:236
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|Terminalzeichensatz NAME benutzen"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "Optionen aus der Datei lesen"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "Debug-Flags einschalten"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "Alle Debug-Flags einschalten"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "Keine Kommentarpakete schreiben"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "Ben�tigte Vollvertrauen (Voreinstellung 1)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "Ben�tigte Teilvertrauen (Voreinstellung 3)"
-#: g10/g10.c:243
+#: g10/g10.c:246
msgid "|FILE|load extension module FILE"
msgstr "|FILE|Erweiterungsmodul DATEI laden"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
-#: g10/g10.c:245
+#: g10/g10.c:248
msgid "|N|use passphrase mode N"
msgstr "|N|Verwenden des Mantra-Modus N"
-#: g10/g10.c:247
+#: g10/g10.c:250
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|Das Hashverfahren NAME f�r Mantras benutzen"
-#: g10/g10.c:249
+#: g10/g10.c:252
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|Das Verschl�.verfahren NAME f�r Mantras benutzen"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Das Verschl�.verfahren NAME benutzen"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Das Hashverfahren NAME benutzen"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|Die Komprimierverfahren N benutzen"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "entferne die Absender-ID verschl�sselter Pakete"
-#: g10/g10.c:255
+#: g10/g10.c:258
msgid ""
"@\n"
"Examples:\n"
@@ -569,15 +569,15 @@ msgstr ""
" --list-keys [Namen] Schl�ssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdr�cke\" anzeigen\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -587,7 +587,7 @@ msgstr ""
"Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -595,145 +595,145 @@ msgstr ""
"\n"
"Unterst�tzte Verfahren:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Befehle\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/g10.c:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ist kein g�ltiger Zeichensatz.\n"
-#: g10/g10.c:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, 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:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m�ssen gr��er als 0 sein\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
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:804
+#: g10/g10.c:810
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/g10.c:808
+#: g10/g10.c:814
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:885
+#: g10/g10.c:891
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/g10.c:967
+#: g10/g10.c:973
msgid "--edit-key username [commands]"
msgstr "--edit-key Username [Befehle]"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key Username"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key Benutzername"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ung�ltiges Hashverfahren '%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht ge�ffnet werden\n"
@@ -759,54 +759,54 @@ msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
msgid "nested clear text signatures\n"
msgstr "verschachtelte Klartextunterschriften\n"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
-#: g10/armor.c:510
+#: g10/armor.c:512
msgid "unexpected armor:"
msgstr "Unerwartete ASCII-H�lle:"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Pr�fsumme\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
msgid "no valid OpenPGP data found.\n"
msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -964,64 +964,64 @@ msgstr ""
"Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
"Frage mit ja beantworten\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
"Besitzer geh�rt.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
"Signaturen zertifiziert!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
"Besitzer geh�rt.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: �bersprungen: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1029,20 +1029,20 @@ msgstr ""
"Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "Geben Sie die User-ID ein: "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "Keine g�ltigen Adressaten\n"
@@ -1356,7 +1356,7 @@ msgstr ""
msgid "Key generation failed: %s\n"
msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1364,7 +1364,7 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht �berein)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1376,7 +1376,7 @@ msgstr ""
msgid "Really create? "
msgstr "Wirklich erzeugen? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1387,22 +1387,17 @@ msgstr "%s: kann nicht ge�ffnet werden: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen des Mantras: %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: WARNUNG: Leere Datei\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "Lesen von '%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s verschl�sselt f�r: %s\n"
@@ -1441,9 +1436,9 @@ msgstr ""
"der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "Kann die Datei nicht �ffnen: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
#: g10/import.c:160
#, c-format
@@ -1456,9 +1451,9 @@ msgid "%lu keys so far processed\n"
msgstr "%lu Schl�ssel bislang bearbeitet\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "Lesefehler: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "Fehler beim Lesen des Schl.Satzes: %s\n"
#: g10/import.c:175
#, c-format
@@ -1515,7 +1510,7 @@ msgstr "geheime Schl�ssel importiert: %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr " unver�nderte geh.Schl.: %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "Schl�ssel %08lX: Keine User-ID\n"
@@ -1529,7 +1524,7 @@ msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
@@ -1538,162 +1533,153 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
msgid "no default public keyring\n"
msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "kann �ffentlichen Schl�sselbund nicht sperren: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "kann Schl�sselbund nicht schreiben: %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: "
"%s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "Schreiben des Schl�sselblocks\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "Der Schl�sselblock kann nicht geschrieben werden: %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "kann geheimen Schl�sselbund nicht sperren: %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "kann Schl�sselbund nicht schreiben: %s\n"
+#: g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "kann �ffentlichen Schl�sselbund nicht sperren: %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
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:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
"nicht angebracht werden\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "Schl�ssel %08lX: Nicht unterst�tzetes Public-Key-Verfahren\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "Schl�ssel %08lX: �bergehe User-ID '"
-#: g10/import.c:787
+#: g10/import.c:773
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1702,27 +1688,32 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "Schl�ssel %08lX: Nicht exportf�hige Unterschrift - �bergangen\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -1808,7 +1799,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Wirklich unterschreiben? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -1846,336 +1837,336 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "M�chten Sie dies wirklich tun? "
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr "quit"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "Men� verlassen"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr "q"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr "save"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "speichern und Men� verlassen"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr "help"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "Diese Hilfe zeigen"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "show fingerprint"
msgstr "\"Fingerabdruck\" anzeigen"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list"
msgstr "Liste der Schl�ssel"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list key and user ids"
msgstr "Schl�ssel und User-ID auflisten"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr "l"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "User-ID N ausw�hlen"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr "key"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "Zweitschl�ssel N ausw�hlen"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr "check"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "list signatures"
msgstr "Liste der Signaturen"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr "c"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign the key"
msgstr "Den Schl�ssel signieren"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr "s"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
msgid "sign the key locally"
msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "Eine User-ID hinzuf�gen"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "delete user id"
msgstr "User-ID entfernen"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "add a secondary key"
msgstr "Einen Zweitschl�ssel hinzuf�gen"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "Einen Zweitschl�ssel entfernen"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "change the expire date"
msgstr "�ndern des Verfallsdatums"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr "t"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr "Liste der Voreinstellungen"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "change the passphrase"
msgstr "Das Mantra �ndern"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "Den \"Owner trust\" �ndern"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revsig"
msgstr "sign"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
msgid "revoke signatures"
msgstr "Signaturen widerrufen"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revkey"
msgstr "key"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
msgid "revoke a secondary key"
msgstr "Einen Zweitschl�ssel widerrufen"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
msgid "Secret key is available.\n"
msgstr "Geheimer Schl�ssel ist vorhanden.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
msgid "Command> "
msgstr "Befehl> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "�nderungen speichern? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "Beenden ohne zu speichern? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, c-format
msgid "update failed: %s\n"
msgstr "�nderung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, c-format
msgid "update secret failed: %s\n"
msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "Wirklich alle User-IDs beglaubigen? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr "Tip: W�hlen Sie die User-ID, die beglaubigt werden soll\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
msgid "Really remove all selected user ids? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
msgid "Really remove this user id? "
msgstr "Diese User-ID wirklich entfernen? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "Do you really want to delete the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
msgid "Do you really want to delete this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
msgid "Do you really want to revoke the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
msgid "Do you really want to revoke this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
msgid "Please select at most one secondary key.\n"
msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Kein Zweitschl�ssel mit Index %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
msgid "user ID: \""
msgstr "User-ID: \""
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -2184,24 +2175,24 @@ msgstr ""
"\"\n"
"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
msgid "Really create the revocation certificates? (y/N)"
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, c-format
msgid "public key is %08lX\n"
msgstr "�ffentlicher Schl�ssel ist %08lX\n"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
msgid "public key encrypted data: good DEK\n"
msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
@@ -2209,93 +2200,84 @@ msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
msgid "decryption okay\n"
msgstr "Enschl�sselung fehlgeschlagen: %s\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "Enschl�sselung fehlgeschlagen: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Urspr�nglicher Dateiname='%.*s'\n"
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
-#: g10/mainproc.c:895
-msgid "encrypted message is valid\n"
-msgstr "verschl�sselte Botschaft ist g�ltig\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
-
-#: g10/mainproc.c:904
-#, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Siegel (MDC) kann nicht gepr�ft werden: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "FALSCHE Unterschrift von \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "Korrekte Unterschrift von \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
-#: g10/misc.c:90
+#: g10/misc.c:93
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2303,18 +2285,18 @@ msgstr ""
"RSA Schl�ssel sind nicht erw�nscht; bitte denken Sie dar�ber nach, einen\n"
"neuen Schl�ssel zu erzeugen und diesen in Zukunft zu benutzen\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"Diees Verschl�sselungsmethode taugt nicht mehr viel; verwenden Sie eine "
"st�rker standardisierte Methode!\n"
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2360,7 +2342,7 @@ msgstr "Bitte geben Sie den Namen der Datendatei ein: "
msgid "reading stdin ...\n"
msgstr "lese stdin ...\n"
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -2398,36 +2380,37 @@ msgstr ""
"WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
" bitte Mantra nochmals wechseln.\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr ""
-"Vermutlich ist das Siegel (MDC) BESCH�DIGT (wegen unbekanntem \"critical bit\")\n"
+"Vermutlich ist das Siegel (MDC) BESCH�DIGT (wegen unbekanntem \"critical "
+"bit\")\n"
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r Signaturen NICHT sicher "
"genug!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr ""
"�ffentlicher Schl�ssel ist um %lu Sekunde j�nger als die Unterschrift\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr ""
"�ffentlicher Schl�ssel ist um %lu Sekunden j�nger als die Unterschrift\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "Hinweis: Schl�ssel der Signatur ist verfallen am %s.\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
"Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
@@ -2446,12 +2429,17 @@ msgstr "%s kann nicht erzeugt werden: %s\n"
msgid "signing:"
msgstr "unterschreibe:"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
@@ -2490,7 +2478,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3040,40 +3028,40 @@ msgstr ""
"ist f�r Signaturen NICHT sicher genug!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "Datei '%s' existiert bereits. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "�berschreiben (j/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
msgid "writing to stdout\n"
msgstr "Schreiben auf die Standardausgabe\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: neue Optionendatei erstellt\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "%s verschl�sselte Daten\n"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@ -3322,6 +3310,33 @@ msgstr "Keine Hilfe vorhanden."
msgid "No help available for `%s'"
msgstr "Keine Hilfe f�r '%s' vorhanden."
+#~ msgid "can't open file: %s\n"
+#~ msgstr "Kann die Datei nicht �ffnen: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "Lesefehler: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "kann Schl�sselbund nicht schreiben: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "Schreiben des Schl�sselblocks\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "Der Schl�sselblock kann nicht geschrieben werden: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "kann geheimen Schl�sselbund nicht sperren: %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "kann Schl�sselbund nicht schreiben: %s\n"
+
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "verschl�sselte Botschaft ist g�ltig\n"
+
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Siegel (MDC) kann nicht gepr�ft werden: %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "Syntax: gpgm [Optionen] [Dateien] (-h f�r Hilfe)"
@@ -3383,9 +3398,6 @@ msgstr "Keine Hilfe f�r '%s' vorhanden."
#~ msgid "directory record w/o primary key\n"
#~ msgstr "Verzeichnis-Satz ohne Hauptschl�ssel\n"
-#~ msgid "error reading key record: %s\n"
-#~ msgstr "Fehler beim Lesen des Schl.Satzes: %s\n"
-
#~ msgid "line too long\n"
#~ msgstr "Zeile zu lang\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 22a629bc9..7cd82b60f 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
# I also got inspiration from it.po by Marco d'Itri <[email protected]>
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
"From: Urko Lusa <[email protected]>\n"
@@ -236,21 +236,21 @@ msgstr "Error general"
msgid "not encrypted"
msgstr "datos cifrados %s\n"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "�Oh! vaya... esto es un bug (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
msgid "WARNING: using insecure random number generator!!\n"
msgstr "Aviso: �se est� usando un generador de n�meros aleatorios inseguro!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -276,7 +276,7 @@ msgstr ""
"otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
"(se necesitan %d bytes m�s).\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -284,131 +284,131 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
msgid "|[file]|make a signature"
msgstr "|[file]|hace una firma"
-#: g10/g10.c:166
+#: g10/g10.c:168
msgid "|[file]|make a clear text signature"
msgstr "|[file]|hace una firma en texto claro"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "hace una firma separada"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "s�lo almacenar"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "lista las claves"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "lista las claves y firmas"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "comprueba las firmas de las claves"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "lista las claves y huellas dactilares"
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "lista las claves secretas"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "elimina la clave del anillo p�blico"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "exporta las claves"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr ""
-#: g10/g10.c:185
+#: g10/g10.c:187
msgid "import keys from a key server"
msgstr ""
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "importa/fusiona las claves"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "lista s�lo la secuencia de paquetes"
-#: g10/g10.c:192
+#: g10/g10.c:194
msgid "export the ownertrust values"
msgstr "exporta los valores de confianza"
-#: g10/g10.c:194
+#: g10/g10.c:196
msgid "import ownertrust values"
msgstr "importa los valores de confianza"
-#: g10/g10.c:196
+#: g10/g10.c:198
msgid "|[NAMES]|update the trust database"
msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "arregla una base de datos de confianza da�ada"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "quita la armadura de un fichero o stdin"
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "crea la armadura a un fichero o stdin"
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|imprime res�menes de mensaje"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "imprime todos los res�menes de mensaje"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -418,153 +418,154 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/g10.c:212
+#: g10/g10.c:214
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "|N|establece nivel de compresi�n N (0 no comprime)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "prolijo"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
-#: g10/g10.c:223
+#: g10/g10.c:225
msgid "force v3 signatures"
msgstr "fuerza firmas v3"
-#: g10/g10.c:224
+#: g10/g10.c:226
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "usa este usuario para cifrar"
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr ""
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "asume \"s�\" en casi todas las preguntas"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "a�ade este anillo a la lista de anillos"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "a�ade este anillo secreto a la lista"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: g10/g10.c:233
+#: g10/g10.c:236
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "lee opciones del fichero"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "establece los par�metros de depuraci�n"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "habilita depuraci�n completa"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en descriptor DF"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "no escribe paquetes de comentario"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "(por defecto es 1)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "(por defecto es 3)"
-#: g10/g10.c:243
+#: g10/g10.c:246
msgid "|FILE|load extension module FILE"
msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "emula el modo descrito en la RFC1991"
-#: g10/g10.c:245
+#: g10/g10.c:248
msgid "|N|use passphrase mode N"
msgstr "|N|usa modo de contrase�a N"
-#: g10/g10.c:247
+#: g10/g10.c:250
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
"para las contrase�as"
-#: g10/g10.c:249
+#: g10/g10.c:252
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
"contrase�as"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|usa el algoritmo de compresi�n N"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "elimina el campo keyid de los paquetes cifrados"
-#: g10/g10.c:255
+#: g10/g10.c:258
msgid ""
"@\n"
"Examples:\n"
@@ -584,15 +585,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -602,7 +603,7 @@ msgstr ""
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende del tipo de datos de entrada\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -610,145 +611,145 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "comandos incompatibles\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "nota: no existe fichero de opciones predefinido `%s'\n"
-#: g10/g10.c:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, 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:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, 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:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
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:804
+#: g10/g10.c:810
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:808
+#: g10/g10.c:814
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:885
+#: g10/g10.c:891
#, 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:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/g10.c:967
+#: g10/g10.c:973
msgid "--edit-key username [commands]"
msgstr "--edit-key nombre_usuario"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nombre_usuario"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key nombre_usuario"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "no puede abrirse `%s': %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[nombre_fichero]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee el mensaje ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "no puede abrirse `%s'\n"
@@ -774,54 +775,54 @@ msgstr "cabecera de firma clara no v�lida\n"
msgid "nested clear text signatures\n"
msgstr "firmas en texto claro anidadas\n"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "L�nea con guiones no v�lida: "
-#: g10/armor.c:510
+#: g10/armor.c:512
msgid "unexpected armor:"
msgstr "armadura inesperada"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracteres no v�lidos radix64 %02x ignorados\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "Fin de fichero prematuro\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "Fin de suma de comprobaci�n prematuro\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "Suma de comprobaci�n mal creada\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "fin de fichero prematuro (en el cierre)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "error en la l�nea de cierre\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
msgid "no valid OpenPGP data found.\n"
msgstr "no se han encontrados datos OpenPGP v�lidos\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -969,61 +970,61 @@ msgstr ""
"\"s�\" a la siguiente pregunta.\n"
"\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "ATENCI�N: �Usando una clave no fiable!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " Esto puede significar que la firma est� falsificada.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta clave est� caducada!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " No hay indicios de que la firma pertenezca al propietario.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma es probablemente una FALSIFICACI�N.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVISO: �Esta clave no est� certificada con suficientes firmas de confianza!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No es seguro que la firma pertenezca al propietario.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1031,20 +1032,20 @@ msgstr ""
"No se ha especificado un ID de usuario (puede usar \"-r\")\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "Introduzca el ID de usuario: "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: error comprobando la clave: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "no hay direcciones v�lidas\n"
@@ -1361,7 +1362,7 @@ msgstr ""
msgid "Key generation failed: %s\n"
msgstr "Creaci�n de la clave fallida: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, fuzzy, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1369,7 +1370,7 @@ msgstr ""
"clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
"el reloj)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, fuzzy, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1381,7 +1382,7 @@ msgstr ""
msgid "Really create? "
msgstr "�Crear de verdad? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1392,22 +1393,17 @@ msgstr "%s: no puede abrirse: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "error creando contrase�a: %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: atenci�n: fichero vac�o\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "leyendo desde `%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "atenci�n: '%s' es un fichero vac�o\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s cifrado para: %s\n"
@@ -1445,9 +1441,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "no puede abrirse el fichero: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "no puede abrirse `%s': %s\n"
#: g10/import.c:160
#, c-format
@@ -1460,9 +1456,9 @@ msgid "%lu keys so far processed\n"
msgstr "hasta ahora se han procesado %lu claves\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "error de lectura: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "error lectura registro de clave: %s\n"
#: g10/import.c:175
#, c-format
@@ -1519,7 +1515,7 @@ msgstr " claves secretas importadas: %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr " claves secretas sin cambios: %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "clave %08lX: no hay identificativo de usuario\n"
@@ -1533,7 +1529,7 @@ msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "esto puede ser debido a la ausencia de autofirma\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
@@ -1542,159 +1538,150 @@ msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
msgid "no default public keyring\n"
msgstr "no hay anillo p�blico por defecto\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "escribiendo en `%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "no puede bloquearse el anillo p�blico: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "no puede escribirse en el anillo: %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "%s: error escritura registro de versi�n: %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "clave %08lX: clave p�blica importada\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "clave %08lX: no se corresponde con nuestra copia\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "escribiendo bloque de claves\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "no puede escribirse el bloque de claves: %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s: error escritura registro de versi�n: %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "clave %08lX: 1 nueva firma\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "clave %08lX: %d nuevas firmas\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "clave %08lX: 1 nueva sub-clave\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "clave %08lX: %d nuevas sub-claves\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "clave %08lX: sin cambios\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "no puede bloquearse el anillo secreto: %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "no puede escribirse el anillo: %s\n"
+#: g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "no puede bloquearse el anillo p�blico: %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "clave %08lX: clave secreta importata\n"
#. we can't merge secret keys
-#: g10/import.c:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "clave %08lX: ya estaba en el anillo secreto\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "clave %08lX: clave secreta no encontrada: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"clave %08lX: falta la clave p�blica - imposibile applicar el\n"
"certificado de revocaci�n\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "clave %08lX: certificado de revocaci�n no v�lido: %s - rechazado\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "clave %08lX: certificado de revocaci�n importado\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "clave %08lX: algoritmo da clave p�blica no soportado\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "clave %08lX: autofirma no v�lida\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, fuzzy, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "clave %08lX.%lu: buena uni�n de sub-clave\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, fuzzy, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "clave %08lX.%lu: uni�n de sub-clave no v�lida\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "clave %08lX: ignorado identificativo de usuario '"
-#: g10/import.c:787
+#: g10/import.c:773
#, fuzzy, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "clave %08lX: 1 nueva sub-clave\n"
@@ -1703,29 +1690,34 @@ msgstr "clave %08lX: 1 nueva sub-clave\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, fuzzy, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr ""
"clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
"clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -1809,7 +1801,7 @@ msgstr ""
msgid "Really sign? "
msgstr "�Firmar de verdad? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
@@ -1847,368 +1839,368 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "�Realmente quiere hacer esto? "
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr "moviendo la firma de la clave al lugar correcto\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr ""
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "sale de este men�"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr ""
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr ""
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "graba y sale"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr ""
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "muestra esta ayuda"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr ""
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "show fingerprint"
msgstr "muestra huella dactilar"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list"
msgstr ""
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list key and user ids"
msgstr "lista clave e identificativos de usuario"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "selecciona identificativo de usuario N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr ""
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "selecciona clave secundaria N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr ""
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "list signatures"
msgstr "lista firmas"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr ""
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr ""
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign the key"
msgstr "firma la clave"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr ""
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "lsign"
msgstr "firmando:"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "sign the key locally"
msgstr "firma la clave"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr ""
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr ""
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "a�ade un identificativo de usuario"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr ""
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "delete user id"
msgstr "borra un identificativo de usuario"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr ""
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "add a secondary key"
msgstr "a�ade una clave secundaria"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr ""
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "borra una clave secundaria"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr ""
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "change the expire date"
msgstr "cambia fecha de caducidad"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr ""
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "cambia entre lista de claves secretas y p�blicas"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr ""
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr ""
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr "muestra preferencias"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "change the passphrase"
msgstr "cambia la contrase�a"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr ""
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revoke signatures"
msgstr "fuerza firmas v3"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revoke a secondary key"
msgstr "borra una clave secundaria"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "�Grabar cambios? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "�Salir sin grabar? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualizaci�n de la clave secreta fallida: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "actualizaci�n de confianza fallida: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "�Firmar realmente todos los identificativos de usuario? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
msgid "Really remove all selected user ids? "
msgstr "�Borrar realmente todos los identificativos seleccionados? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
msgid "Really remove this user id? "
msgstr "�Borrar realmente este identificativo? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "Do you really want to delete the selected keys? "
msgstr "�Borrar realmente las claves seleccionadas? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
msgid "Do you really want to delete this key? "
msgstr "�Borrar realmente esta clave? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "�Borrar realmente las claves seleccionadas? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "�Borrar realmente esta clave? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "Comando no v�lido (pruebe \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
msgid "Please select at most one secondary key.\n"
msgstr "Por favor, seleccione como m�ximo una clave secundaria\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr "Cambiando caducidad de clave secundaria.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr "No hay firma correspondiente en anillo secreto\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "No hay ning�n identificativo de usuario con el �ndice %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
#, fuzzy
msgid "user ID: \""
msgstr "Introduzca el ID de usuario: "
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "Nada que firmar con la clave %08lX\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "genera un certificado de revocaci�n"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "genera un certificado de revocaci�n"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
#, fuzzy
msgid "no secret key\n"
msgstr "Clave secreta incorrecta"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, fuzzy, c-format
msgid "public key is %08lX\n"
msgstr "Clave p�blica no encontrada"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
@@ -2216,93 +2208,83 @@ msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "descifrado de la clave p�blica fallido: %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "nota: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaci�n de la firma\n"
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
-#: g10/mainproc.c:895
-#, fuzzy
-msgid "encrypted message is valid\n"
-msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:904
-#, fuzzy, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Imposible comprobar la firma: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "Firma INCORRECTA de \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "Firma correcta de \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
#, fuzzy
msgid " aka \""
msgstr " importadas: %lu"
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr "firma viejo estilo (PGP 2.x)\n"
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
-#: g10/misc.c:90
+#: g10/misc.c:93
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no se pueden desactivar los core dumps: %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr "�No se deber�an usar algoritmos experimentales!\n"
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2310,18 +2292,18 @@ msgstr ""
"Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
"para futuros usos\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"este algoritmo de cifrado est� en desuso; considere el uso de uno m�s "
"est�ndar.\n"
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el sub-paquete de tipo %d tiene el bit cr�tico activado\n"
@@ -2366,7 +2348,7 @@ msgstr "Introduzca el nombre del fichero de datos: "
msgid "reading stdin ...\n"
msgstr "leyendo stdin...\n"
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "imposible abrir datos firmados `%s'\n"
@@ -2402,34 +2384,34 @@ msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "Aviso: detectada clave d�bil - por favor cambie la contrase�a.\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
#, fuzzy
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"�esto es una clave ElGamal generada por PGP que NO es segura para las "
"firmas!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, fuzzy, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "lid %lu: identificativo de usuario sin firma\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, fuzzy, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "lid %lu: identificativo de usuario sin firma\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "atenci�n: clave de la firma caducada el %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
@@ -2447,12 +2429,17 @@ msgstr "no puede crearse `%s': %s\n"
msgid "signing:"
msgstr "firmando:"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "atenci�n: '%s' es un fichero vac�o\n"
+
+#: g10/textfilter.c:128
#, fuzzy, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, fuzzy, c-format
msgid "input line longer than %d characters\n"
msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
@@ -2492,7 +2479,7 @@ msgstr "%s: se ha creado el directorio\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: el directorio no existe\n"
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: no puede crearse: %s\n"
@@ -3048,40 +3035,40 @@ msgstr ""
" que NO es segura para las firmas!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "El fichero `%s' ya existe. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "�Sobreescribir (s/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
msgid "writing to stdout\n"
msgstr "escribiendo en stdout\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "asumiendo que hay datos firmados en `%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: se ha creado un nuevo fichero de opciones\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados %s\n"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado con algoritmo desconocido %d\n"
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@ -3220,6 +3207,35 @@ msgstr "Ayuda no disponible"
msgid "No help available for `%s'"
msgstr "Ayuda no disponible para `%s'"
+#~ msgid "can't open file: %s\n"
+#~ msgstr "no puede abrirse el fichero: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "error de lectura: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "no puede escribirse en el anillo: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "escribiendo bloque de claves\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "no puede escribirse el bloque de claves: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "no puede bloquearse el anillo secreto: %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "no puede escribirse el anillo: %s\n"
+
+#, fuzzy
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
+
+#, fuzzy
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Imposible comprobar la firma: %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
@@ -3279,9 +3295,6 @@ msgstr "Ayuda no disponible para `%s'"
#~ msgid "directory record w/o primary key\n"
#~ msgstr "registro de directorio sin clave primaria\n"
-#~ msgid "error reading key record: %s\n"
-#~ msgstr "error lectura registro de clave: %s\n"
-
#~ msgid "line too long\n"
#~ msgstr "linea demasiado larga\n"
diff --git a/po/fr.po b/po/fr.po
index 381124f82..2384fd3e4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 0.9.4a\n"
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"PO-Revision-Date: 1999-03-20 20:09+01:00\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -228,22 +228,22 @@ msgstr "erreur de r�seau"
msgid "not encrypted"
msgstr "donn�es chiffr�es avec %s\n"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... c'est un bug (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "vous avez trouv� un bug ... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"ATTENTION : utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -268,7 +268,7 @@ msgstr ""
"Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
"pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -276,133 +276,133 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
msgid "|[file]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/g10.c:166
+#: g10/g10.c:168
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "faire une signature d�tach�e"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "chiffrer les donn�es"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "chiffrement sym�trique seulement"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "pas d'action"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "d�chiffrer les donn�es (d�faut)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "v�rifier une signature"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "lister les cl�s"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "lister les cl�s et les signatures"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "v�rifier les signatures des cl�s"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "lister les cl�s et les empreintes"
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "lister les cl�s secr�tes"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "g�n�rer une nouvelle paire de cl�s"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "enlever la cl� du porte-cl�s public"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "signer ou �diter une cl�"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "exporter les cl�s"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/g10.c:185
+#: g10/g10.c:187
#, fuzzy
msgid "import keys from a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "importer/fusionner les cl�s"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "ne lister que les paquets"
-#: g10/g10.c:192
+#: g10/g10.c:194
msgid "export the ownertrust values"
msgstr "exporter les indices de confiance"
-#: g10/g10.c:194
+#: g10/g10.c:196
msgid "import ownertrust values"
msgstr "importer les indices de confiance"
#
-#: g10/g10.c:196
+#: g10/g10.c:198
msgid "|[NAMES]|update the trust database"
msgstr "|[NOMS]|mettre la base de confiance � jour"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMS]|v�rifier la base de confiance"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "r�parer une base de confiance corrompue"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "Enlever l'armure d'un fichier ou de stdin"
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "Mettre une armure � un fichier ou � stdin"
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "�crire toutes les fonctions de hachage"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -412,149 +412,150 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "cr�er une sortie ascii armur�e"
-#: g10/g10.c:212
+#: g10/g10.c:214
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr "utiliser ce nom pour signer ou d�chiffrer"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 d�sactive)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "utiliser le mode de texte canonique"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "bavard"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
#
-#: g10/g10.c:223
+#: g10/g10.c:225
msgid "force v3 signatures"
msgstr "forcer les signatures en v3"
-#: g10/g10.c:224
+#: g10/g10.c:226
msgid "always use a MDC for encryption"
msgstr ""
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr "ne rien changer"
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "mode automatique : ne jamais rien demander"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "r�pondre oui � la plupart des questions"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "r�pondre non � la plupart des questions"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "ajouter ce porte-cl�s � la liste des porte-cl�s"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "ajouter ce porte-cl�s secret � la liste"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
-#: g10/g10.c:233
+#: g10/g10.c:236
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOM|le terminal utilise la table de caract�res NOM"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "lire les options du fichier"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "choisir les attributs de d�boguage"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "permettre un d�boguage complet"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|FD|�crire l'�tat sur ce descripteur"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "ne pas �crire de paquets de commentaire"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "(1 par d�faut)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "(3 par d�faut)"
-#: g10/g10.c:243
+#: g10/g10.c:246
msgid "|FILE|load extension module FILE"
msgstr "|FICH|charger le module d'extension FICH"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "imiter le mode d�crit dans la RFC1991"
# FIXMOI : faudra trouver mieux ...
-#: g10/g10.c:245
+#: g10/g10.c:248
msgid "|N|use passphrase mode N"
msgstr "|N|utiliser le mode de codage des mots de passe N"
-#: g10/g10.c:247
+#: g10/g10.c:250
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
-#: g10/g10.c:249
+#: g10/g10.c:252
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser la fonction de hachage NOM"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|utiliser l'algorithme de compression N"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "supprimer l'identification des paquets chiffr�s"
-#: g10/g10.c:255
+#: g10/g10.c:258
msgid ""
"@\n"
"Examples:\n"
@@ -574,15 +575,15 @@ msgstr ""
" --list-keys [utilisateur] montrer les cl�s\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Rapporter toutes anomalies � <[email protected]>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -592,7 +593,7 @@ msgstr ""
"signer, v�rifier, chiffer ou d�chiffrer\n"
"l'op�ration par d�faut d�pend des donn�es entr�es\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -600,145 +601,145 @@ msgstr ""
"\n"
"Algorithmes support�s:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, 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:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s' : %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, 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:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "l'algorithme de compression doit faire partie de l'�chelle %d..%d\n"
-#: g10/g10.c:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
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:804
+#: g10/g10.c:810
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:808
+#: g10/g10.c:814
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide ; doit �tre 0, 1 ou 3\n"
-#: g10/g10.c:885
+#: g10/g10.c:891
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "n'a pas pu initialiser la base de confiance : %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/g10.c:967
+#: g10/g10.c:973
msgid "--edit-key username [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key utilisateur"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key utilisateur"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "ne peut ouvrir %s: %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "suppression d'armure non r�ussie : %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "construction d'armure non r�ussie : %s \n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr "Continuez et tapez votre message...\n"
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "ne peut ouvrir `%s'\n"
@@ -764,54 +765,54 @@ msgstr "en-t�te de signature claire invalide\n"
msgid "nested clear text signatures\n"
msgstr "signatures en texte clair imbriqu�es\n"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "ligne de traits d'�chappement invalide : "
-#: g10/armor.c:510
+#: g10/armor.c:512
msgid "unexpected armor:"
msgstr "armure inattendue :"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caract�re %02x invalide en base 64 ignor�\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "CRC malform�\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "Erreur de CRC ; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "erreur dans la ligne de remorque\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
msgid "no valid OpenPGP data found.\n"
msgstr "aucune de donn�e OpenPGP valide n'a �t� trouv�e.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armure invalide : ligne plus longue que %d caract�res\n"
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -962,63 +963,63 @@ msgstr ""
"oui � la prochaine question\n"
"\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "ATTENTION : Utilisation d'une cl� sans confiance !\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATTENTION : Cette cl� � �t� r�voqu�e par son propri�taire !\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " Cela pourrait signifier que la signature est fausse.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATTENTION : Cette cl� � �t� r�voqu�e par son propri�taire !\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Note : Cette cl� a expir� !\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ATTENTION : Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Rien ne dit que la signature appartient � son propri�taire.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENTION : Nous ne faisons PAS confiance � cette cl� !\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " La signature est certainement FAUSSE.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATTENTION : Les signatures de cette cl� n'ont pas une confiance suffisante "
"!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Il n'est pas s�r que la signature appartient � son propri�taire.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s : ignor� : %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1027,20 +1028,20 @@ msgstr ""
"\"-r\")\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "Entrez le nom d'utilisateur : "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "Pas de tel utilisateur.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "pas de destinataire valide\n"
@@ -1354,7 +1355,7 @@ msgid "Key generation failed: %s\n"
msgstr "La g�n�ration de cl� a �chou� : %s\n"
# on s'amuse comme on peut...
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1362,7 +1363,7 @@ msgstr ""
"la cl� a �t� cr��e %lu seconde dans le futur (discontinuit� temporelle ou\n"
"probl�me d'horloge)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1374,7 +1375,7 @@ msgstr ""
msgid "Really create? "
msgstr "Cr�er vraiment ? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1385,22 +1386,17 @@ msgstr "%s : ne peut ouvrir : %s\n"
msgid "error creating passphrase: %s\n"
msgstr "erreur pendant la cr�ation du mot de passe : %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s : ATTENTION : fichier vide\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "lecture de `%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATTENTION : `%s' est un fichier vide\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s chiffr� pour : %s\n"
@@ -1440,9 +1436,9 @@ msgstr ""
"principale %08lX\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "ne peut ouvrir le fichier : %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "ne peut ouvrir %s: %s\n"
#: g10/import.c:160
#, c-format
@@ -1455,9 +1451,9 @@ msgid "%lu keys so far processed\n"
msgstr "%lu cl�s trait�es jusqu'ici\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "erreur de lecture : %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "erreur pendant la cr�ation du mot de passe : %s\n"
#: g10/import.c:175
#, c-format
@@ -1514,7 +1510,7 @@ msgstr " cl�s secr�tes import�es : %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr " cl�s secr�tes inchang�es : %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "cl� %08lX : pas de nom d'utilisateur\n"
@@ -1528,7 +1524,7 @@ msgstr "cl� %08lX : pas de nom d'utilisateur valide\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "cela peut provenir d'une auto-signature manquante\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
@@ -1537,159 +1533,150 @@ msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
msgid "no default public keyring\n"
msgstr "pas de porte-cl�s public par d�faut\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "�criture de `%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "ne peut verrouiller le porte-cl�s public : %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "ne peut �crire le porte-cl�s : %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "%s : erreur pendant l'�criture de l'enregistrement de version : %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "cl� %08lX : cl� publique import�e\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "cl� %08lX : ne ressemble pas � notre copie\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "cl� %08lX : ne peut trouver le bloc de cl�s original : %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "cl� %08lX : ne peut lire le bloc de cl�s original : %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "�criture du bloc de cl�s\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "ne peut �crire le bloc de cl�s : %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s : erreur pendant l'�criture de l'enregistrement de version : %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "cl� %08lX : un nouvel utilisateur\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "cl� %08lX : %d nouveaux utilisateurs\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "cl� %08lX : une nouvelle signature\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "cl� %08lX : %d nouvelles signatures\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "cl� %08lX : une nouvelle sous-cl�\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "cl� %08lX : %d nouvelles sous-cl�s\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "cl� %08lX : n'a pas chang�\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "ne peut verrouiller le porte-cl�s secret : %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "ne peut �crire le porte-cl�s : %s\n"
+#: g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "ne peut verrouiller le porte-cl�s public : %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
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:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "cl� %08lX : d�j� dans le porte-cl�s secret\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "cl� %08lX : cl� secr�te pas trouv�e: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"cl� %08lX : pas de cl� publique - ne peut appliquer le certificat de\n"
"r�vocation\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "cl� %08lX : certificat de r�vocation invalide : %s - rejet�\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "cl� %08lX : certificat de r�vocation import�\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "cl� %08lX : pas d'utilisateur pour la signature\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "cl� %08lX : algorithme de cl� publique non support�\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "cl� %08lX : auto-signature invalide\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "cl� %08lX : pas de sous-cl� pour relier la cl�\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "cl� %08lX : liaison avec la sous-cl� invalide\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "cl� %08lX : utilisateur non pris en compte '"
-#: g10/import.c:787
+#: g10/import.c:773
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "cl� %08lX : sous-cl� non prise en compte\n"
@@ -1698,27 +1685,32 @@ msgstr "cl� %08lX : sous-cl� non prise en compte\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "cl� %08lX : signature non exportable (classe %02x) - ignor�e\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "cl� %08lX : certificat de r�vocation au mauvais endroit - ignor�e\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "cl� %08lX : certificat de r�vocation invalide : %s - ignor�e\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "cl� %08lX : certificat de r�vocation ajout�\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n"
@@ -1804,7 +1796,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Signer r�ellement ? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, c-format
msgid "signing failed: %s\n"
msgstr "la signature a �chou� : %s\n"
@@ -1841,371 +1833,371 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "Voulez-vous vraiment faire cela? "
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr "replacer la signature d'une cl� � l'endroit correct\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr "quitter"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "quitter ce menu"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr "q"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr "enregistrer"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "enregistrer et quitter"
# FIXMOI : si je mets aide �a va demander de taper "aide"...
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr "help"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "afficher cette aide"
# g10/keyedit.c:556 ???
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "show fingerprint"
msgstr "afficher l'empreinte"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list"
msgstr "lister"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list key and user ids"
msgstr "lister la cl� et les noms d'utilisateurs"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr "l"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "s�lectionner le nom d'utilisateur N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr "cl�"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "s�lectionner la cl� secondaire N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr "v�rifier"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "list signatures"
msgstr "lister les signatures"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr "c"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr "signer"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign the key"
msgstr "signer la cl�"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr "s"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
msgid "lsign"
msgstr "lsigner"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
msgid "sign the key locally"
msgstr "signer la cl� localement"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr "d�boguer"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr "aj.ut"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "ajouter un utilisateur"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr "suppr.ut"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "delete user id"
msgstr "enlever un utilisateur"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr "aj.cl�"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "add a secondary key"
msgstr "ajouter une cl� secondaire"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr "suppr.cl�"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "enlever une cl� secondaire"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "change the expire date"
msgstr "changer la date d'expiration"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr "changer"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr "t"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr "lister les pr�f�rences"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr "mot.pas"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "change the passphrase"
msgstr "changer le mot de passe"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr "confi."
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "changer la confiance"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revsig"
msgstr "signer"
#
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revoke signatures"
msgstr "forcer les signatures en v3"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revkey"
msgstr "cl�"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revoke a secondary key"
msgstr "enlever une cl� secondaire"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "ne peut faire cela en mode automatique\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
msgid "Secret key is available.\n"
msgstr "La cl� secr�te est disponible.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
msgid "Command> "
msgstr "Commande> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
msgid "Need the secret key to do this.\n"
msgstr "Il faut la cl� secr�te pour faire cela.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "Enregistrer les changements? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "Quitter sans enregistrer? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, c-format
msgid "update failed: %s\n"
msgstr "la mise � jour a �chou� : %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, c-format
msgid "update secret failed: %s\n"
msgstr "la mise � jour de la cl� secr�te a �chou� : %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "la mise � jour de la base de confiance a �chou� : %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "Signer vraiment tous les utilisateurs ? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr "Aide : S�lectionner les utilisateurs � signer\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
msgid "Really remove all selected user ids? "
msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
msgid "Really remove this user id? "
msgstr "Enlever r�ellement cet utilisateur ? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "Vous devez s�lectionner au moins une cl�.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "Do you really want to delete the selected keys? "
msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
msgid "Do you really want to delete this key? "
msgstr "Voulez-vous vraiment supprimer cette cl� ? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "Voulez-vous vraiment supprimer cette cl� ? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "Commande invalide (essayez � help �)\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
msgid "Please select at most one secondary key.\n"
msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la cl� principale.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "Pas d'utilisateur avec l'index %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Pas de cl� secondaire avec l'index %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
#, fuzzy
msgid "user ID: \""
msgstr "Entrez le nom d'utilisateur : "
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "Rien � signer avec la cl� %08lX\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
#, fuzzy
msgid "no secret key\n"
msgstr "mauvaise cl� secr�te"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, c-format
msgid "public key is %08lX\n"
msgstr "la cl� publique est %08lX\n"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
msgid "public key encrypted data: good DEK\n"
msgstr "donn�es chiffr�es avec la cl� publique : bonne cl� de chiffrement\n"
@@ -2213,92 +2205,82 @@ msgstr "donn�es chiffr�es avec la cl� publique : bonne cl� de chiffrement\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "le d�chiffrement de la cl� publique a �chou� : %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
msgid "decryption okay\n"
msgstr "le d�chiffrement a r�ussi\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "le d�chiffrement a �chou� : %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTE : l'exp�diteur a demand� � pour vos yeux seulement �\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom de fichier original : '%.*s'\n"
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr "v�rification de signature supprim�e\n"
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
-#: g10/mainproc.c:895
-#, fuzzy
-msgid "encrypted message is valid\n"
-msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:904
-#, fuzzy, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Ne peut v�rifier la signature : %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "MAUVAISE signature de \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "Bonne signature de \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne peut v�rifier la signature : %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien style (PGP 2.x)\n"
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
-#: g10/misc.c:90
+#: g10/misc.c:93
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ne peut emp�cher la g�n�ration de fichiers core : %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION : Le programme peut cr�er un fichier � core � !\n"
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2306,18 +2288,18 @@ msgstr ""
"Les cl�s RSA sont d�conseill�es : consid�rez cr�er une nouvelle cl�\n"
"et l'utiliser dans l'avenir\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"Cet algorithme de chiffrement est d�conseill� ; utilisez-en un\n"
"plus standard !\n"
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ne peut g�rer l'algorithme � cl� publique %d\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -2364,7 +2346,7 @@ msgstr "Entrez le nom d'un fichier de donn�es : "
msgid "reading stdin ...\n"
msgstr "lecture de l'entr�e standard...\n"
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "ne peut ouvir les donn�es sign�es `%s'\n"
@@ -2402,36 +2384,36 @@ msgstr "Mot de passe invalide ; r�essayez...\n"
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "ATTENTION : Cl� faible d�tect�e - changez encore le mot de passe.\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
#, fuzzy
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr ""
"la signature est suppos�e �tre fausse car un bit critique est\n"
"inconnu\n"
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
"signatures !\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "la cl� publique est plus r�cente de %lu secondes que la signature\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "NOTE : la cl� de signature a expir� le %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
"la signature est suppos�e �tre fausse car un bit critique est\n"
@@ -2451,12 +2433,17 @@ msgstr "ne peut cr�er %s : %s\n"
msgid "signing:"
msgstr "signature :"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATTENTION : `%s' est un fichier vide\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "ne peut pas traiter les ligne plus longues que %d caract�res\n"
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
@@ -2497,7 +2484,7 @@ msgstr "%s : r�pertoire cr��\n"
msgid "%s: directory does not exist!\n"
msgstr "%s : le r�pertoire n'existe pas !\n"
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s : ne peut cr�er : %s\n"
@@ -3064,40 +3051,40 @@ msgstr ""
"s�re pour les signatures !\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "Le fichier `%s' existe. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "R��crire (o/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
msgid "writing to stdout\n"
msgstr "�criture vers la sortie standard\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr "%s : nouveau fichier d'options cr��\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "donn�es chiffr�es avec %s\n"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "chiffr� avec l'algorithme inconnu %d\n"
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@ -3271,6 +3258,35 @@ msgstr "Pas d'aide disponible"
msgid "No help available for `%s'"
msgstr "Pas d'aide disponible pour `%s'"
+#~ msgid "can't open file: %s\n"
+#~ msgstr "ne peut ouvrir le fichier : %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "erreur de lecture : %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "ne peut �crire le porte-cl�s : %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "�criture du bloc de cl�s\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "ne peut �crire le bloc de cl�s : %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "ne peut verrouiller le porte-cl�s secret : %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "ne peut �crire le porte-cl�s : %s\n"
+
+#, fuzzy
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "la fonction de hachage s�lectionn�e est invalide\n"
+
+#, fuzzy
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Ne peut v�rifier la signature : %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)"
diff --git a/po/it.po b/po/it.po
index 8efbf3907..52d290898 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.4.3\n"
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"PO-Revision-Date: 1998-11-09 16:19+01:00\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -273,23 +273,23 @@ msgstr "Errore generale"
msgid "not encrypted"
msgstr "cifra dati"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... questo � un bug (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "Hai trovato un bug... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
#, fuzzy
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"Attenzione: si sta usando un generatore di numeri casuali non sicuro!!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -312,7 +312,7 @@ msgstr ""
"altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
"(Servono ancora %d altri byte)\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -320,131 +320,131 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
msgid "|[file]|make a signature"
msgstr "|[file]|fai una firma"
-#: g10/g10.c:166
+#: g10/g10.c:168
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "immagazzina soltanto"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "elenca le chiavi"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "rimuove una chiave dal portachiavi pubblico"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr ""
-#: g10/g10.c:185
+#: g10/g10.c:187
msgid "import keys from a key server"
msgstr ""
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "elenca solo la sequenza dei pacchetti"
-#: g10/g10.c:192
+#: g10/g10.c:194
msgid "export the ownertrust values"
msgstr "esporta i valori di fiducia"
-#: g10/g10.c:194
+#: g10/g10.c:196
msgid "import ownertrust values"
msgstr "importa i valori di fiducia"
-#: g10/g10.c:196
+#: g10/g10.c:198
msgid "|[NAMES]|update the trust database"
msgstr "|[NAMES]|controlla il database della fiducia"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMES]|controlla il database della fiducia"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "ripara un database della fiducia rovinato"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "rimuovi l'armatura a un file o a stdin"
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "crea l'armatura a un file o a stdin"
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "stampa tutti i message digests"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -454,150 +454,151 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/g10.c:212
+#: g10/g10.c:214
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|usa l'algoritmo di cifratura NOME"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disabilita)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "prolisso"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr "meno prolisso"
-#: g10/g10.c:223
+#: g10/g10.c:225
msgid "force v3 signatures"
msgstr "forza l'uso di firme v3"
-#: g10/g10.c:224
+#: g10/g10.c:226
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "usa questo user-id per cifrare"
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr ""
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "modo batch: non fare domande"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "assumi \"s�\" a quasi tutte le domande"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "assumi \"no\" a quasi tutte le domande"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "aggiungi questo portachiavi segreto alla lista"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|usa NAME come chiave segreta predefinita"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: g10/g10.c:233
+#: g10/g10.c:236
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|usa l'algoritmo di cifratura NOME"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "leggi le opzioni dal file"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "imposta i flag di debugging"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "abilita il debugging completo"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato su questo fd"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "non scrivere pacchetti di commento"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "(predefinito � 1)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "(predefinito � 3)"
-#: g10/g10.c:243
+#: g10/g10.c:246
msgid "|FILE|load extension module FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "emula il modo descritto nel RFC1991"
-#: g10/g10.c:245
+#: g10/g10.c:248
msgid "|N|use passphrase mode N"
msgstr "|N|usa il modo N per la passphrase"
-#: g10/g10.c:247
+#: g10/g10.c:250
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|usa l'algoritmo di message digest NOME"
-#: g10/g10.c:249
+#: g10/g10.c:252
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|usa l'algoritmo di cifratura NOME"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|usa l'algoritmo di message digest NOME"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|usa l'algoritmo di compressione N"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "elimina il campo keyid dei pacchetti crittografati"
-#: g10/g10.c:255
+#: g10/g10.c:258
msgid ""
"@\n"
"Examples:\n"
@@ -617,15 +618,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Per favore segnala i bug a <[email protected]>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -635,7 +636,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -643,147 +644,147 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "uso: gpg [options] "
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, fuzzy, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "nota: nessun file con opzioni predefinite `%s'\n"
-#: g10/g10.c:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con opzioni predefinite `%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, fuzzy, c-format
msgid "%s is not a valid character set\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/g10.c:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, 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:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr ""
-#: g10/g10.c:804
+#: g10/g10.c:810
#, fuzzy
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "nota: il modo S2K semplice (0) � fortemente scoraggiato\n"
-#: g10/g10.c:808
+#: g10/g10.c:814
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:885
+#: g10/g10.c:891
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/g10.c:967
+#: g10/g10.c:973
#, fuzzy
msgid "--edit-key username [commands]"
msgstr "--edit-key nomeutente"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nomeutente"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key nomeutente"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [userid] [portachiavi]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire `%s'\n"
@@ -810,56 +811,56 @@ msgstr "header della firma in chiaro non valido\n"
msgid "nested clear text signatures\n"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: "
-#: g10/armor.c:510
+#: g10/armor.c:512
#, fuzzy
msgid "unexpected armor:"
msgstr "Dati inaspettati"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "eof prematura (nessun CRC)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "CRC malformato\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "errore nel CRC; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "eof prematura (nella coda)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
#, fuzzy
msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr ""
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1006,61 +1007,61 @@ msgstr ""
"prossima domanda.\n"
"\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " Questo pu� significare che la firma � stata falsificata.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Nota: questa chiave � scaduta!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Non ci sono indicazioni che la firma appartenga al proprietario.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma � probabilmente un FALSO.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non � sicuro che la firma appartenga al proprietario.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1068,20 +1069,20 @@ msgstr ""
"Non hai specificato un user ID. (puoi usare \"-r\")\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "Inserisci l'user ID: "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: errore nel controllare la chiave: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
@@ -1396,7 +1397,7 @@ msgstr ""
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, fuzzy, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1404,7 +1405,7 @@ msgstr ""
"chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
"l'orologio)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, fuzzy, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1416,7 +1417,7 @@ msgstr ""
msgid "Really create? "
msgstr "Crea davvero? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1427,22 +1428,17 @@ msgstr "%s: impossibile aprire: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, fuzzy, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: attenzione: file vuoto\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "lettura da `%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, fuzzy, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "%s: attenzione: file vuoto\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, fuzzy, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s crittografato per: %s\n"
@@ -1481,9 +1477,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "impossibile aprire il file: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "impossibile aprire `%s': %s\n"
#: g10/import.c:160
#, c-format
@@ -1496,9 +1492,9 @@ msgid "%lu keys so far processed\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "errore di lettura: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "%s: errore nel controllare la chiave: %s\n"
#: g10/import.c:175
#, c-format
@@ -1555,7 +1551,7 @@ msgstr "chiavi segrete importate %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "chiave %08lX: nessun user id\n"
@@ -1569,7 +1565,7 @@ msgstr "chiave %08lX: nessun user id valido\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
@@ -1578,159 +1574,150 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
msgid "no default public keyring\n"
msgstr "nessun portachiavi pubblico predefinito\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "scrittura in `%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "%s: errore nel controllare la chiave: %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "chiave %08lX: chiave pubblica importata\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "scrittura del keyblock\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "impossibile aprire il keyblock: %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s: errore nel controllare la chiave: %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "chiave %08lX: un nuovo user id\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "chiave %08lX: %d nuovi user id\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "chiave %08lX: una nuova firma\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "chiave %08lX: %d nuove firme\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "chiave %08lX: una nuova subchiave\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "chiave %08lX: %d nuove subchiavi\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "chiave %08lX: non cambiata\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "impossibile bloccare il portachiavi segreto: %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "impossibile scrivere il portachiavi: %s\n"
+#: g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
#. we can't merge secret keys
-#: g10/import.c:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
"certificato di revoca\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "chiave %08lX: certificato di revoca importato\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "chiave %08lX: nessun user id per la firma\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "chiave %08lX: autofirma non valida\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, fuzzy, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, fuzzy, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "chiave %08lX: saltato l'user id '"
-#: g10/import.c:787
+#: g10/import.c:773
#, fuzzy, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "chiave %08lX: una nuova subchiave\n"
@@ -1739,27 +1726,32 @@ msgstr "chiave %08lX: una nuova subchiave\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, fuzzy, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca aggiunto\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -1843,7 +1835,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Firmo davvero? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
@@ -1881,370 +1873,370 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "Vuoi veramente farlo?"
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr ""
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr "quit"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "abbandona questo men�"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr "q"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr "save"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "salva ed esci"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr "help"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "mostra questo aiuto"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "show fingerprint"
msgstr "mostra le impronte digitali"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list"
msgstr "list"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list key and user ids"
msgstr "elenca le chiavi e gli user id"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr "l"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "scegli l'user id N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr "key"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "scegli la chiave secondaria N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr "check"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "list signatures"
msgstr "elenca le firme"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr "c"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign the key"
msgstr "firma la chiave"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr "s"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "lsign"
msgstr "sign"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "sign the key locally"
msgstr "firma la chiave"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "aggiungi un user id"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "delete user id"
msgstr "cancella un user id"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "add a secondary key"
msgstr "aggiungi una chiave secondaria"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "cancella una chiave secondaria"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "change the expire date"
msgstr "cambia la data di scadenza"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr "t"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr "elenca le impostazioni"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "change the passphrase"
msgstr "cambia la passphrase"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revsig"
msgstr "sign"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revoke signatures"
msgstr "forza l'uso di firme v3"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revkey"
msgstr "key"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revoke a secondary key"
msgstr "cancella una chiave secondaria"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "impossibile fare questo in batch mode\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "Salvo i cambiamenti? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "Esco senza salvare? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, c-format
msgid "update secret failed: %s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, fuzzy, c-format
msgid "update of trustdb failed: %s\n"
msgstr "aggiornamento del trustdb fallito: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "Firmo davvero tutti gli user id? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr "Suggerimento: seleziona gli user id da firmare\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "Devi selezionare almeno un user id.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "Non puoi cancellare l'ultimo user id!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
msgid "Really remove all selected user ids? "
msgstr "Tolgo davvero tutti gli user id selezionati? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
msgid "Really remove this user id? "
msgstr "Tolgo davvero questo user id? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "Do you really want to delete the selected keys? "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
msgid "Do you really want to delete this key? "
msgstr "Vuoi davvero cancellare questa chiave? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "Vuoi davvero cancellare questa chiave? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr "Togli le selezioni dalle chiavi segrete.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
msgid "Please select at most one secondary key.\n"
msgstr "Seleziona al massimo una chiave secondaria.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr "Modifico il tempo di scadenza per una chiave secondaria.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr "Modifico il tempo di scadenza per la chiave primaria.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "Nessun user id con l'indice %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nessuna chiave secondaria con l'indice %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
#, fuzzy
msgid "user ID: \""
msgstr "Inserisci l'user ID: "
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "Niente da firmare con la chiave %08lX\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "genera un certificato di revoca"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "genera un certificato di revoca"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
#, fuzzy
msgid "no secret key\n"
msgstr "Chiave segreta errata o danneggiata"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, fuzzy, c-format
msgid "public key is %08lX\n"
msgstr "Chiave pubblica non trovata"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
#, fuzzy
msgid "public key encrypted data: good DEK\n"
msgstr "Decifratura della chiave pubblica fallita: %s\n"
@@ -2253,95 +2245,85 @@ msgstr "Decifratura della chiave pubblica fallita: %s\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Decifratura della chiave pubblica fallita: %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
#, fuzzy
msgid "decryption okay\n"
msgstr "decifratura fallita: %s\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
#, fuzzy
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr ""
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr ""
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Firma fatta %.*s usando %s key ID %08lX\n"
-#: g10/mainproc.c:895
-#, fuzzy
-msgid "encrypted message is valid\n"
-msgstr "l'algoritmo di digest selezionato non � valido\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:904
-#, fuzzy, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Impossibile controllare la firma: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "Firma NON corretta da \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "Buona firma da \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
#, fuzzy
msgid " aka \""
msgstr "importate: %lu"
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr ""
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
-#: g10/misc.c:90
+#: g10/misc.c:93
#, fuzzy, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr ""
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2349,16 +2331,16 @@ msgstr ""
"L'uso di chiavi RSA � deprecato; per favore in futuro considera di creare e\n"
"usare una nuova chiave.\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, fuzzy, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -2406,7 +2388,7 @@ msgstr "Inserisci il nome del file di dati: "
msgid "reading stdin ...\n"
msgstr ""
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -2447,32 +2429,32 @@ msgstr ""
"Attenzione: individuata una chiave debole - per favore cambia ancora la\n"
"passphrase.\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr ""
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, fuzzy, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "chiave %08lX: user id senza firma\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, fuzzy, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "chiave %08lX: user id senza firma\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, fuzzy, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "attenzione: firma della chiave scaduta il %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
@@ -2491,12 +2473,17 @@ msgstr "%s: impossibile creare: %s\n"
msgid "signing:"
msgstr "sign"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, fuzzy, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "%s: attenzione: file vuoto\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr ""
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
msgstr ""
@@ -2535,7 +2522,7 @@ msgstr "%s: impossibile creare: %s\n"
msgid "%s: directory does not exist!\n"
msgstr ""
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: impossibile creare: %s\n"
@@ -3079,40 +3066,40 @@ msgstr ""
"questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "Il file `%s' esiste. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "Sovrascrivo (y/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
msgid "writing to stdout\n"
msgstr "scrivo su stdout\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "presumo che i dati firmati siano in `%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: creato un nuovo file delle opzioni\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, fuzzy, c-format
msgid "%s encrypted data\n"
msgstr "cifra dati"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr ""
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
#, fuzzy
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3254,6 +3241,35 @@ msgstr "Nessun aiuto disponibile"
msgid "No help available for `%s'"
msgstr "Nessun aiuto disponibile per `%s'"
+#~ msgid "can't open file: %s\n"
+#~ msgstr "impossibile aprire il file: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "errore di lettura: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "scrittura del keyblock\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "impossibile aprire il keyblock: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "impossibile bloccare il portachiavi segreto: %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "impossibile scrivere il portachiavi: %s\n"
+
+#, fuzzy
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "l'algoritmo di digest selezionato non � valido\n"
+
+#, fuzzy
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Impossibile controllare la firma: %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)"
@@ -3311,10 +3327,6 @@ msgstr "Nessun aiuto disponibile per `%s'"
#~ msgstr "%s: utente non trovato\n"
#, fuzzy
-#~ msgid "error reading key record: %s\n"
-#~ msgstr "%s: errore nel controllare la chiave: %s\n"
-
-#, fuzzy
#~ msgid "error: invalid fingerprint\n"
#~ msgstr "errore nella riga della coda\n"
diff --git a/po/pl.po b/po/pl.po
index 6449a8976..2db658fb7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.9.2\n"
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"PO-Revision-Date: 1999-01-26 01:30+01:00\n"
"Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -235,23 +235,23 @@ msgstr "b��d sieci"
msgid "not encrypted"
msgstr "%s zaszyfrowane dane\n"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... to jest b��d w programie (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"OSTRZE�ENIE: u�ywany generator liczb losowych\n"
"nie jest kryptograficznie bezpieczny!!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -277,7 +277,7 @@ msgstr ""
"Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
"ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -285,132 +285,132 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
msgid "|[file]|make a signature"
msgstr "|[plik]|z�o�enie podpisu"
-#: g10/g10.c:166
+#: g10/g10.c:168
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "tylko zapis"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lnie)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "lista kluczy"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "sprawdzenie podpis�w kluczy"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "lista kluczy tajnych"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "generacja nowej pary klucza"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "generacja certyfikatu uniewa�nienia klucza"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/g10.c:185
+#: g10/g10.c:187
#, fuzzy
msgid "import keys from a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "do��czanie klucza do zbioru"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "wypisane sekwencji pakiet�w"
-#: g10/g10.c:192
+#: g10/g10.c:194
msgid "export the ownertrust values"
msgstr "eksport warto�ci zaufania"
-#: g10/g10.c:194
+#: g10/g10.c:196
msgid "import ownertrust values"
msgstr "wczytanie warto��i zaufania"
-#: g10/g10.c:196
+#: g10/g10.c:198
msgid "|[NAMES]|update the trust database"
msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "naprawa uszkodzonej Bazy Zaufania"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "Zdj�cie opakowania ASCII pliku lub potoku"
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "Opakowanie ASCII pliku lub potoku"
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skr�ty wiadomo�ci"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "wszystkie skr�ty wiadomo�ci"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -420,149 +420,150 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "plik wynikowy w opakowaniu ASCII"
-#: g10/g10.c:212
+#: g10/g10.c:214
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - brak)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "plik wyj�ciowy"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "z informacjami dodatkowymi"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr "mniej komunikat�ww"
-#: g10/g10.c:223
+#: g10/g10.c:225
msgid "force v3 signatures"
msgstr "wymuszenie trzeciej wersji formatu podpis�w"
-#: g10/g10.c:224
+#: g10/g10.c:226
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "u�y� tego identyfikatora do szyfrowania"
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr ""
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "tryb wsadowy: �adnych pyta�"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "doda� zbi�r kluczy do listy"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "doda� zbi�r kluczy tajnych do listy"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
-#: g10/g10.c:233
+#: g10/g10.c:236
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "wczytanie opcji z pliku"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "ustawienie opcji �ledzenia wykonania programu"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "umo�liwienie pe�nego �ledzenia programu"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|FD|zapisa� opis stanu do FD"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "nie zapisywa� pakiet�w z komentarzem"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "(domy�lnie 1)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "(domy�lnie 3)"
-#: g10/g10.c:243
+#: g10/g10.c:246
msgid "|FILE|load extension module FILE"
msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "emulacja trybu opisanego w RFC1991"
-#: g10/g10.c:245
+#: g10/g10.c:248
msgid "|N|use passphrase mode N"
msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
-#: g10/g10.c:247
+#: g10/g10.c:250
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
-#: g10/g10.c:249
+#: g10/g10.c:252
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|algorytm kompresji N"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "usuni�cie identyfikator�w kluczy pakiet�w"
-#: g10/g10.c:255
+#: g10/g10.c:258
msgid ""
"@\n"
"Examples:\n"
@@ -583,15 +584,15 @@ msgstr ""
" --list-keys [nazwy] pokazuje klucze\n"
" --fingerprint [nazwy] pokazuje odciski kluczy\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Spos�b u�ycia: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -601,7 +602,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -609,145 +610,145 @@ msgstr ""
"\n"
"Obs�ugiwane algorytmy:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "spos�b u�ycia: gpg [opcje]"
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
-#: g10/g10.c:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji '%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z '%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/g10.c:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
-#: g10/g10.c:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
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:804
+#: g10/g10.c:810
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/g10.c:808
+#: g10/g10.c:814
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:885
+#: g10/g10.c:891
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]\""
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/g10.c:967
+#: g10/g10.c:973
msgid "--edit-key username [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nazwa u�ytkownika"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key nazwa u�ytkownika"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "nie mog� otworzy� %s: %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Opakowywanie ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "nie mog� otworzy� '%s'\n"
@@ -773,54 +774,54 @@ msgstr "niew�a�ciwy nag��wek czytelnego podpisanego dokumentu\n"
msgid "nested clear text signatures\n"
msgstr "zagnie�d�one podpisy na czytelnym dokumencie\n"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "niepoprawne oznaczenie linii minusami:"
-#: g10/armor.c:510
+#: g10/armor.c:512
msgid "unexpected armor:"
msgstr "nieoczekiwane opakowanie:"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "przewczesny koniec pliku (brak CRC)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "przedwczesny koniec pliku (w CRC)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "b��d formatu CRC\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "B��d sumy CRC; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "b��d w linii ko�cz�cej\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
msgid "no valid OpenPGP data found.\n"
msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -972,63 +973,63 @@ msgstr ""
"w�a�ciciela. Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�*\n"
"wiesz co robisz mo�esz odpowiedzie� \"tak\" na nast�pne pytanie.\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nic nie wskazuje na to �e ten podpis z�o�y� w�a�ciciel klucza.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"OSTRZE�ENIE: Ten klucz nie jest po�wiadczony wystarczaj�co zaufanymi "
"podpisami!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez w�a�ciciela.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pomini�ty: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1036,20 +1037,20 @@ msgstr ""
"Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
"Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "brak poprawnych adres�w\n"
@@ -1368,7 +1369,7 @@ msgstr ""
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod�a si�: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1376,7 +1377,7 @@ msgstr ""
"klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1388,7 +1389,7 @@ msgstr ""
msgid "Really create? "
msgstr "Na pewno generowa�? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1399,22 +1400,17 @@ msgstr "%s: nie mog� otworzy�: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "odczyt z '%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1452,9 +1448,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "nie mo�na otworzy� pliku: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "nie mog� otworzy� %s: %s\n"
#: g10/import.c:160
#, c-format
@@ -1467,9 +1463,9 @@ msgid "%lu keys so far processed\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "b��d odczytu: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
#: g10/import.c:175
#, c-format
@@ -1526,7 +1522,7 @@ msgstr " tajnych kluczy dodanych: %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
@@ -1540,7 +1536,7 @@ msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "klucz %08lX: brak klucza publicznego: %s\n"
@@ -1549,162 +1545,153 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n"
msgid "no default public keyring\n"
msgstr "brak domy�lnego zbioru kluczy publicznych\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "zapis do '%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "nie mog� zablokowa� zbioru kluczy publicznych: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "%s: b��d zapisu numeru wersji: %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "klucz %08lX: klucz publiczny wczytany do zbioru\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "zapisuj� blok klucza\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "nie mog� zapisa� bloku klucza: %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s: b��d zapisu numeru wersji: %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "klucz %08lX: 1 nowy podpis\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "klucz %08lX: %d nowych podpis�w\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "klucz %08lX: 1 nowy podklucz\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "klucz %08lX: %d nowych podkluczy\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "klucz %08lX: bez zmian\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "niemo�liwy jest zapis zbioru kluczy: %s\n"
+#: g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "nie mog� zablokowa� zbioru kluczy publicznych: %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
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:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "klucz %08lX: brak klucza tajnego: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
"uniwa�nienia nie mo�e by� zastosowany\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr ""
"klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
"%s - odrzucony\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr ""
"klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '"
-#: g10/import.c:787
+#: g10/import.c:773
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1713,31 +1700,36 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, fuzzy, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr ""
"klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
"miejscu - zosta� pomini�ty\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
"klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
"miejscu - zosta� pomini�ty\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -1822,7 +1814,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Na pewno podpisa�? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisywanie nie powiod�o si�: %s\n"
@@ -1860,371 +1852,371 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "Czy na pewno chcesz to zrobi�? "
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr "wyj�cie"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "wyj�cie z tego menu"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr "w"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr "zapis"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "zapis zmian i wyj�cie"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr "pomoc"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "ten tekst pomocy"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr "odc"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "show fingerprint"
msgstr "okazanie odcisku klucza"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list"
msgstr "lista"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list key and user ids"
msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr "l"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr "id"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "wyb�r identyfikatora u�ytkownika N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr "klucz"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "wyb�r podklucza N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr "lista"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "list signatures"
msgstr "lista podpis�w"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr "l"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr "podpis"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign the key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr "p"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "lsign"
msgstr "podpis"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "sign the key locally"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr "�ledzenia"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr "dodid"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr "usid"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "delete user id"
msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr "dodkl"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "add a secondary key"
msgstr "dodanie podklucza"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr "uskl"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "usuni�cie podklucza"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr "data"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "change the expire date"
msgstr "zmiana daty wa�no�ci klucza"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr "prze�"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr "p"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr "opcje"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr "lista opcji"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr "has�o"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "change the passphrase"
msgstr "zmiana wyra�enia przej�ciowego (has�a)"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr "zaufanie"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revsig"
msgstr "podpis"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revoke signatures"
msgstr "wymuszenie trzeciej wersji formatu podpis�w"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revkey"
msgstr "klucz"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revoke a secondary key"
msgstr "usuni�cie podklucza"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "operacja niemo�liwa do wykonania w trybie wsadowym\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
msgid "Command> "
msgstr "Polecenie> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "Zapisa� zmiany? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "Wyj�� bez zapisania zmian? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, c-format
msgid "update failed: %s\n"
msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, c-format
msgid "update secret failed: %s\n"
msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr ""
"Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
msgid "Really remove all selected user ids? "
msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
msgid "Really remove this user id? "
msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "Do you really want to delete the selected keys? "
msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
msgid "Do you really want to delete this key? "
msgstr "Czy na pewno chcesz usun�� ten klucz? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "Czy na pewno chcesz usun�� ten klucz? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawna komenda (spr�buj \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
msgid "Please select at most one secondary key.\n"
msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Brak podklucza o indeksie %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
#, fuzzy
msgid "user ID: \""
msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "generacja certyfikatu uniewa�nienia klucza"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "generacja certyfikatu uniewa�nienia klucza"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
#, fuzzy
msgid "no secret key\n"
msgstr "niepoprawny klucz prywatny"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, fuzzy, c-format
msgid "public key is %08lX\n"
msgstr "klucz publiczny nie odnaleziony"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
msgid "public key encrypted data: good DEK\n"
msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
@@ -2232,95 +2224,85 @@ msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
msgid "decryption okay\n"
msgstr "odszyfrowane poprawnie\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "b��d odszyfrowywania: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pierwotna nazwa pliku='%.*s'\n"
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr ""
"Podpis z�o�ony %.*s za pomoc� %s,\n"
"z u�yciem klucza o identyfikatorze %08lX\n"
-#: g10/mainproc.c:895
-#, fuzzy
-msgid "encrypted message is valid\n"
-msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:904
-#, fuzzy, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Nie mog� sprawdzi� podpisu: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "Poprawny podpis z�o�ony przez \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
#, fuzzy
msgid " aka \""
msgstr " do��czono do zbioru: %lu"
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mog� sprawdzi� podpisu: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x)\n"
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
-#: g10/misc.c:90
+#: g10/misc.c:93
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nie mo�na wy��czy� zrzucania pami�ci: %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2328,18 +2310,18 @@ msgstr ""
"Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
"wygenerowaniu odpowiednich kluczy.\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"ten algorytm szyfruj�cy jest odradzanym prosz� u�ywa� bardziej "
"standardowych!\n"
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "algorytm klucza publicznego niemo�liwy do obs�u�enia: %d\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2385,7 +2367,7 @@ msgstr "Nazwa pliku danych: "
msgid "reading stdin ...\n"
msgstr "czytam strumie� standardowego wej�cia\n"
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
@@ -2424,35 +2406,35 @@ msgstr ""
"Ostrze�enie: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
"wyra�enie przej�ciowe (has�o).\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
#, fuzzy
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr ""
"przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk�adane\n"
"nie zapewniaj� bezpiecze�stwa!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
"przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
@@ -2471,12 +2453,17 @@ msgstr "nie mog� stworzy� %s: %s\n"
msgid "signing:"
msgstr "podpis:"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "nie mog� obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, fuzzy, c-format
msgid "input line longer than %d characters\n"
msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
@@ -2515,7 +2502,7 @@ msgstr "%s: katalog utworzony\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: katalog nie istnieje!\n"
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: nie mog� utworzy�: %s\n"
@@ -3070,40 +3057,40 @@ msgstr ""
"podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "Plik '%s' ju� istnieje. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "Nadpisa� (t/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
msgid "writing to stdout\n"
msgstr "zapisywanie na wyj�cie standardowe\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: stworzono nowy plik ustawie�\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "%s zaszyfrowane dane\n"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "zaszyfrowane nieznanym algorytmem %d\n"
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@ -3291,6 +3278,35 @@ msgstr "Pomoc niedost�pna"
msgid "No help available for `%s'"
msgstr "Brak pomocy o '%s'"
+#~ msgid "can't open file: %s\n"
+#~ msgstr "nie mo�na otworzy� pliku: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "b��d odczytu: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "zapisuj� blok klucza\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "nie mog� zapisa� bloku klucza: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "niemo�liwy jest zapis zbioru kluczy: %s\n"
+
+#, fuzzy
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
+
+#, fuzzy
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Nie mog� sprawdzi� podpisu: %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "Spos�b u�ycia: gpgm [opcje] [pliki] (-h podaje pomoc)"
@@ -3351,9 +3367,6 @@ msgstr "Brak pomocy o '%s'"
#~ msgid "directory record w/o primary key\n"
#~ msgstr "wpis katalogowy bez klucza g��wnego\n"
-#~ msgid "error reading key record: %s\n"
-#~ msgstr "b��d odczytu rekordu podpisu: %s\n"
-
#~ msgid "line too long\n"
#~ msgstr "linia za d�uga\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 89d99595b..7e94b99d0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <[email protected]>\n"
@@ -276,21 +276,21 @@ msgstr "Erro geral"
msgid "not encrypted"
msgstr "dados codificados com\n"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... isto � um bug (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc� encontrou um bug ... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -316,7 +316,7 @@ msgstr ""
"para que o sistema possa coletar mais entropia!\n"
"(S�o necess�rios mais %d bytes)\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -324,131 +324,131 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
msgid "|[file]|make a signature"
msgstr "|[arquivo]|faz uma assinatura"
-#: g10/g10.c:166
+#: g10/g10.c:168
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|faz uma assinatura em texto puro"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "faz uma assinatura separada"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "codifica dados"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "codifica apenas com criptografia sim�trica"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "apenas armazena"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "decodifica dados (padr�o)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "verifica uma assinatura"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "lista as chaves"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "lista as chaves e as assinaturas"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "confere as assinaturas das chaves"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "lista as chaves e as impress�es digitais"
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "lista as chaves secretas"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "gera um novo par de chaves"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "remove a chave do anel de chaves p�blico"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "assina ou edita uma chave"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "gera um certificado de revoga��o"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "exporta as chaves"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr ""
-#: g10/g10.c:185
+#: g10/g10.c:187
msgid "import keys from a key server"
msgstr ""
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "importa/funde as chaves"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "lista apenas as seq��ncias de pacotes"
-#: g10/g10.c:192
+#: g10/g10.c:194
msgid "export the ownertrust values"
msgstr "exporta os valores de confian�a"
-#: g10/g10.c:194
+#: g10/g10.c:196
msgid "import ownertrust values"
msgstr "importa os valores de confian�a"
-#: g10/g10.c:196
+#: g10/g10.c:198
msgid "|[NAMES]|update the trust database"
msgstr "|[NOMES]|atualiza o banco de dados de confian�a"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMES]|confere o banco de dados de confian�a"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "conserta um banco de dados de confian�a danificado"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "Retira a armadura de um arquivo ou \"stdin\""
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "Cria armadura para um arquivo ou \"stdin\""
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "imprime todos os \"digests\" de mensagens"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -458,154 +458,155 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "cria uma sa�da ascii com armadura"
-#: g10/g10.c:212
+#: g10/g10.c:214
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr "usa este identificador de usu�rio para assinar ou decodificar"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "|N|estabelece n�vel de compress�o N (0 desabilita)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "usa como arquivo de sa�da"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "prolixo"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/g10.c:223
+#: g10/g10.c:225
msgid "force v3 signatures"
msgstr "for�a assinaturas v3"
-#: g10/g10.c:224
+#: g10/g10.c:226
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "usa este identificador de usu�rio para codificar"
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr ""
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "processo de lote: nunca perguntar"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "adiciona este anel de chaves � lista de an�is de chaves"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "adiciona este anel de chaves secreto � lista"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME como chave secreta padr�o"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: g10/g10.c:233
+#: g10/g10.c:236
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "l� op��es do arquivo"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "estabelece par�metros de depura��o"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "habilita depura��o completa"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|DA|escreve informa��es de status para este DA"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "n�o escreve pacotes de coment�rio"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "(o padr�o � 1)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "(o padr�o � 3)"
-#: g10/g10.c:243
+#: g10/g10.c:246
msgid "|FILE|load extension module FILE"
msgstr "|ARQUIVO|carrega m�dulo de extens�o ARQUIVO"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "emula o modo descrito no RFC1991"
-#: g10/g10.c:245
+#: g10/g10.c:248
msgid "|N|use passphrase mode N"
msgstr "|N|usa frase secreta modo N"
-#: g10/g10.c:247
+#: g10/g10.c:250
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
"frases secretas"
-#: g10/g10.c:249
+#: g10/g10.c:252
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOME|usa algoritmo de criptografia NOME para\n"
"frases secretas"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa algoritmo de criptografia NOME"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|usa algoritmo de compress�o N"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "elimina o campo keyid dos pacotes codificados"
-#: g10/g10.c:255
+#: g10/g10.c:258
msgid ""
"@\n"
"Examples:\n"
@@ -625,15 +626,15 @@ msgstr ""
" --list-keys [nomes] mostra chaves\n"
" --fingerprint [nomes] mostra impress�es digitais\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -643,7 +644,7 @@ msgstr ""
"assina, verifica, codifica ou decodifica\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -651,145 +652,145 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/g10.c:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n�o � um mapa de caracteres v�lido\n"
-#: g10/g10.c:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "algoritmo de compress�o deve estar na faixa %d..%d\n"
-#: g10/g10.c:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
-#: g10/g10.c:804
+#: g10/g10.c:810
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:808
+#: g10/g10.c:814
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:885
+#: g10/g10.c:891
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confian�a: %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/g10.c:967
+#: g10/g10.c:973
msgid "--edit-key username [commands]"
msgstr "--edit-key nome_do_usu�rio [comandos]"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nome_do_usu�rio"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key nome_do_usu�rio"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [id_do_usu�rio] [anel_de_chaves]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribui��o inv�lido `%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
@@ -816,56 +817,56 @@ msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
msgid "nested clear text signatures\n"
msgstr "|[arquivo]|faz uma assinatura em texto puro"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
-#: g10/armor.c:510
+#: g10/armor.c:512
#, fuzzy
msgid "unexpected armor:"
msgstr "Dados inesperados"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caractere radix64 inv�lido %02x ignorado\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "fim de arquivo prematuro (sem CRC)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "fim de arquivo prematuro (no CRC)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "erro na linha \"trailer\"\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
#, fuzzy
msgid "no valid OpenPGP data found.\n"
msgstr "nenum dado RFC1991 ou OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr ""
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1014,59 +1015,59 @@ msgstr ""
"afirmativamente � pr�xima pergunta\n"
"\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: Usando chave n�o confi�vel!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " Isto pode significar que a assinatura � falsificada.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave expirou!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " N�o h� indica��o de que a assinatura pertence ao dono.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " A assinatura � provavelmente uma FALSIFICA��O.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "AVISO: Esta chave n�o est� certificada com assinaturas confi�veis!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " N�o se tem certeza de que a assinatura pertence ao dono.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1074,20 +1075,20 @@ msgstr ""
"Voc� n�o especificou um ID de usu�rio. (pode-se usar \"-r\")\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "Digite o identificador de usu�rio:"
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "Identificador de usu�rio inexistente.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: erro verificando chave: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "nenhum endere�o v�lido\n"
@@ -1403,14 +1404,14 @@ msgstr ""
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, fuzzy, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, fuzzy, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1421,7 +1422,7 @@ msgstr ""
msgid "Really create? "
msgstr "Realmente criar? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1432,22 +1433,17 @@ msgstr "%s: imposs�vel abrir: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "erro criando frase secreta: %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: AVISO: arquivo vazio\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "lendo de `%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "AVISO: `%s' � um arquivo vazio\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, fuzzy, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s codificado para: %s\n"
@@ -1485,9 +1481,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "imposs�vel abrir arquivo: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
#: g10/import.c:160
#, c-format
@@ -1500,9 +1496,9 @@ msgid "%lu keys so far processed\n"
msgstr "%lu chaves processadas at� agora\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "erro de leitura: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "erro lendo registro de chave: %s\n"
#: g10/import.c:175
#, c-format
@@ -1559,7 +1555,7 @@ msgstr " chaves secretas importadas: %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "chave %08lX: sem id de usu�rio\n"
@@ -1573,7 +1569,7 @@ msgstr "chave %08lX: sem ids de usu�rios v�lidos\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
@@ -1582,159 +1578,150 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
msgid "no default public keyring\n"
msgstr "sem anel de chaves p�blico padr�o\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "escrevendo para `%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "imposs�vel bloquear anel de chaves p�blico: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "imposs�vel escrever para o anel de chaves: %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "%s: erro escrevendo registro de vers�o: %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "chave %08lX: chave p�blica importada\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "escrevendo bloco de chaves\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "imposs�vel escrever bloco de chaves: %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s: erro escrevendo registro de vers�o: %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "chave %8lX: 1 novo id de usu�rio\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "chave %08lX: %d novos ids de usu�rios\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "chave %08lX: 1 nova assinatura\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "chave %08lX: 1 nova subchave\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "chave %08lX: %d novas subchaves\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "chave %08lX: n�o modificada\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "imposs�vel bloquear anel de chaves secreto: %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "imposs�vel escrever anel de chaves: %s\n"
+#: g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "imposs�vel bloquear anel de chaves p�blico: %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
#. we can't merge secret keys
-#: g10/import.c:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "chave %08lX: j� no anel de chaves secreto\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
"de revoga��o\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "chave %08lX: certificado de revoga��o importado\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "chave %08lX: sem id de usu�rio para assinatura\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, fuzzy, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, fuzzy, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "chave %08lX.%lu: Liga��o de subchave inv�lida: %s\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "chave %08lX: id de usu�rio ignorado '"
-#: g10/import.c:787
+#: g10/import.c:773
#, fuzzy, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "chave %08lX: 1 nova subchave\n"
@@ -1743,27 +1730,32 @@ msgstr "chave %08lX: 1 nova subchave\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, fuzzy, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o adicionado\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -1847,7 +1839,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@ -1885,371 +1877,371 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "Voc� realmente quer fazer isso? "
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr "movendo a assinatura da chave para o local correto\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr "sair"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "sair deste menu"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr "s"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr "gravar"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "gravar e sair"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr "ajuda"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "mostra esta ajuda"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr ""
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "show fingerprint"
msgstr "mostra impress�o digital"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list"
msgstr "lista"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
msgid "list key and user ids"
msgstr "lista chave e identificadores de usu�rios"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "seleciona id de usu�rio N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr "chave"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "seleciona chave secund�ria N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr "verifica"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "list signatures"
msgstr "lista assinaturas"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr "v"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr "assina"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign the key"
msgstr "assina a chave"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr "a"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "lsign"
msgstr "assina"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "sign the key locally"
msgstr "assina a chave"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr "depura"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr ""
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "adiciona um novo id de usu�rio"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr ""
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "delete user id"
msgstr "deleta id de usu�rio"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr ""
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "add a secondary key"
msgstr "adiciona nova chave secund�ria"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr ""
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "deleta uma chave secund�ria"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr "expira"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "change the expire date"
msgstr "muda a data em que a chave expira"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr "comuta"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "comuta entre listagem de chave secreta e p�blica"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr "c"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr ""
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr "senha"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr "confianca"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revsig"
msgstr "assina"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revoke signatures"
msgstr "for�a assinaturas v3"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revkey"
msgstr "chave"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revoke a secondary key"
msgstr "deleta uma chave secund�ria"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo de processo por lotes\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
#, fuzzy
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "Salvar altera��es? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "Sair sem salvar? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, c-format
msgid "update failed: %s\n"
msgstr "atualiza��o falhou: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, c-format
msgid "update secret failed: %s\n"
msgstr "atualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr "Chave sem mudan�as, nenhuma atualiza��o � necess�ria.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, fuzzy, c-format
msgid "update of trustdb failed: %s\n"
msgstr "atualiza��o da confian�a falhou: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "Realmente assinar todos os ids de usu�rio? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr "Sugest�o: Selecione os ids de usu�rio para assinar\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "Voc� precisa selecionar pelo menos um id de usu�rio.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "Voc� n�o pode deletar o �ltimo id de usu�rio!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
msgid "Really remove all selected user ids? "
msgstr "Realmente remover todos os ids de usu�rio selecionados? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
msgid "Really remove this user id? "
msgstr "Realmente remover este id de usu�rio? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� realmente quer deletar as chaves selecionadas? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
msgid "Do you really want to delete this key? "
msgstr "Voc� realmente quer deletar esta chave? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� realmente quer deletar as chaves selecionadas? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "Voc� realmente quer deletar esta chave? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"ajuda\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as sele��es das chaves secretas.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
msgid "Please select at most one secondary key.\n"
msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr "Modificando data de expira��o para a chave secund�ria.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr "Modificando data de expira��o para a chave prim�ria.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Voc� n�o pode modificar a data de expira��o de uma chave v3\n"
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no anel de chaves secreto\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "Nenhum id de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
#, fuzzy
msgid "user ID: \""
msgstr "Digite o identificador de usu�rio:"
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "gera um certificado de revoga��o"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "gera um certificado de revoga��o"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
#, fuzzy
msgid "no secret key\n"
msgstr "Chave secreta incorreta"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, fuzzy, c-format
msgid "public key is %08lX\n"
msgstr "Chave p�blica n�o encontrada"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
#, fuzzy
msgid "public key encrypted data: good DEK\n"
msgstr "dados codificados com chave p�blica: DEK bom\n"
@@ -2258,94 +2250,84 @@ msgstr "dados codificados com chave p�blica: DEK bom\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decodifica��o de chave p�blica falhou: %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
msgid "decryption okay\n"
msgstr "decodifica��o correta\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "decodifia��o falhou: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome de arquivo original='%.*s'\n"
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr "verifia��o de assinatura suprimida\n"
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n"
-#: g10/mainproc.c:895
-#, fuzzy
-msgid "encrypted message is valid\n"
-msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:904
-#, fuzzy, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Imposs�vel verificar assinatura: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "Assinatura INCORRETA de \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "Assinatura correta de\""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
#, fuzzy
msgid " aka \""
msgstr " importados: %lu"
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr "assinatura antiga (PGP2.x)\n"
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
-#: g10/misc.c:90
+#: g10/misc.c:93
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "imposs�vel desabilitar core dumps: %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
#, fuzzy
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr ""
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2353,16 +2335,16 @@ msgstr ""
"Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
"us�-la no futuro\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -2407,7 +2389,7 @@ msgstr "Por favor digite o nome do arquivo de dados: "
msgid "reading stdin ...\n"
msgstr "lendo \"stdin\" ...\n"
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -2445,32 +2427,32 @@ msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr ""
"AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr ""
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, fuzzy, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "lid %lu: id de usu�rio sem assinatura\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, fuzzy, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "lid %lu: id de usu�rio sem assinatura\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "NOTA: chave de assinatura expirou %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
@@ -2488,12 +2470,17 @@ msgstr "imposs�vel criar %s: %s\n"
msgid "signing:"
msgstr "assinando:"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr ""
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
msgstr ""
@@ -2533,7 +2520,7 @@ msgstr "%s: diret�rio criado\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: diret�rio inexistente!\n"
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: imposs�vel criar: %s\n"
@@ -3086,40 +3073,40 @@ msgstr ""
"para assinaturas!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "Arquivo `%s' existe. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "Sobrescrever (s/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
msgid "writing to stdout\n"
msgstr "escrevendo para \"stdout\"\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "assumindo dados assinados em `%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "dados codificados com\n"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "codificado com algoritmo desconhecido %d\n"
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
#, fuzzy
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3260,6 +3247,35 @@ msgstr "Nenhuma ajuda dispon�vel"
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
+#~ msgid "can't open file: %s\n"
+#~ msgstr "imposs�vel abrir arquivo: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "erro de leitura: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "imposs�vel escrever para o anel de chaves: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "escrevendo bloco de chaves\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "imposs�vel escrever bloco de chaves: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "imposs�vel bloquear anel de chaves secreto: %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "imposs�vel escrever anel de chaves: %s\n"
+
+#, fuzzy
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
+
+#, fuzzy
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Imposs�vel verificar assinatura: %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
@@ -3324,9 +3340,6 @@ msgstr "Nenhuma ajuda dispon�vel para `%s'"
#~ msgid "directory record w/o primary key\n"
#~ msgstr "registro de diret�rio sem chave prim�ria\n"
-#~ msgid "error reading key record: %s\n"
-#~ msgstr "erro lendo registro de chave: %s\n"
-
#~ msgid "line too long\n"
#~ msgstr "linha muito longa\n"
diff --git a/po/ru.po b/po/ru.po
index 4bc7a90e0..2642770a8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-05-23 09:21+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <[email protected]>\n"
@@ -282,22 +282,22 @@ msgstr "����� ������"
msgid "not encrypted"
msgstr "����������� ������"
-#: util/logger.c:178
+#: util/logger.c:218
#, fuzzy, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:410
#, fuzzy
msgid "WARNING: using insecure random number generator!!\n"
msgstr "��������: ������������ ���������� ��������� ��������� �����!\n"
-#: cipher/random.c:409
+#: cipher/random.c:411
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -322,7 +322,7 @@ msgstr ""
"������������ ��������� ������. ����������, ��������� ���-������, �����\n"
"�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
-#: g10/g10.c:163
+#: g10/g10.c:165
msgid ""
"@Commands:\n"
" "
@@ -330,136 +330,136 @@ msgstr ""
"@�������:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:167
#, fuzzy
msgid "|[file]|make a signature"
msgstr "|[����]|������� �������"
-#: g10/g10.c:166
+#: g10/g10.c:168
#, fuzzy
msgid "|[file]|make a clear text signature"
msgstr "|[����]|������� ��������� �������"
-#: g10/g10.c:167
+#: g10/g10.c:169
msgid "make a detached signature"
msgstr "������� ��������� �������"
-#: g10/g10.c:168
+#: g10/g10.c:170
msgid "encrypt data"
msgstr "����������� ������"
-#: g10/g10.c:169
+#: g10/g10.c:171
msgid "encryption only with symmetric cipher"
msgstr "����������� ������������ ����������"
-#: g10/g10.c:170
+#: g10/g10.c:172
msgid "store only"
msgstr "������ ���������"
-#: g10/g10.c:171
+#: g10/g10.c:173
msgid "decrypt data (default)"
msgstr "������������ ������ (�� ���������)"
-#: g10/g10.c:172
+#: g10/g10.c:174
msgid "verify a signature"
msgstr "��������� �������"
-#: g10/g10.c:173
+#: g10/g10.c:175
msgid "list keys"
msgstr "������ ������"
-#: g10/g10.c:175
+#: g10/g10.c:177
msgid "list keys and signatures"
msgstr "������ ������ � ��������"
-#: g10/g10.c:176
+#: g10/g10.c:178
msgid "check key signatures"
msgstr "��������� ������� �� �����"
-#: g10/g10.c:177
+#: g10/g10.c:179
msgid "list keys and fingerprints"
msgstr "������ ������ � �� \"����������� �������\""
-#: g10/g10.c:178
+#: g10/g10.c:180
msgid "list secret keys"
msgstr "������ ��������� ������"
-#: g10/g10.c:179
+#: g10/g10.c:181
msgid "generate a new key pair"
msgstr "������������� ����� ���� ������ (�������� � ���������)"
-#: g10/g10.c:180
+#: g10/g10.c:182
msgid "remove key from the public keyring"
msgstr "������� ���� �� ������"
-#: g10/g10.c:181
+#: g10/g10.c:183
msgid "sign or edit a key"
msgstr "��������� ��� ������������� ����"
-#: g10/g10.c:182
+#: g10/g10.c:184
msgid "generate a revocation certificate"
msgstr "������������� ���������� ����������"
-#: g10/g10.c:183
+#: g10/g10.c:185
msgid "export keys"
msgstr "�������������� �����"
-#: g10/g10.c:184
+#: g10/g10.c:186
msgid "export keys to a key server"
msgstr ""
-#: g10/g10.c:185
+#: g10/g10.c:187
msgid "import keys from a key server"
msgstr ""
-#: g10/g10.c:188
+#: g10/g10.c:190
msgid "import/merge keys"
msgstr "�������������/�������� �����"
-#: g10/g10.c:190
+#: g10/g10.c:192
msgid "list only the sequence of packets"
msgstr "���������� ������ ������������������ �������"
-#: g10/g10.c:192
+#: g10/g10.c:194
#, fuzzy
msgid "export the ownertrust values"
msgstr "�������������� ��������� �������\n"
-#: g10/g10.c:194
+#: g10/g10.c:196
#, fuzzy
msgid "import ownertrust values"
msgstr "������������� ��������� �������\n"
-#: g10/g10.c:196
+#: g10/g10.c:198
#, fuzzy
msgid "|[NAMES]|update the trust database"
msgstr "|[�����]|��������� ���� ������ �������"
-#: g10/g10.c:198
+#: g10/g10.c:200
msgid "|[NAMES]|check the trust database"
msgstr "|[�����]|��������� ���� ������ �������"
-#: g10/g10.c:199
+#: g10/g10.c:201
msgid "fix a corrupted trust database"
msgstr "��������� ����������� ���� ������ �������"
-#: g10/g10.c:200
+#: g10/g10.c:202
msgid "De-Armor a file or stdin"
msgstr "������������ stdin ��� ���� �� ASCII-�������������"
-#: g10/g10.c:201
+#: g10/g10.c:203
msgid "En-Armor a file or stdin"
msgstr "������������ stdin ��� ���� � ASCII-�������������"
-#: g10/g10.c:202
+#: g10/g10.c:204
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|���������� �������� ���������"
-#: g10/g10.c:203
+#: g10/g10.c:205
msgid "print all message digests"
msgstr "���������� ��� ��������� ���������"
-#: g10/g10.c:209
+#: g10/g10.c:211
msgid ""
"@\n"
"Options:\n"
@@ -469,156 +469,157 @@ msgstr ""
"���������:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:213
msgid "create ascii armored output"
msgstr "����� � ASCII-�������������"
-#: g10/g10.c:212
+#: g10/g10.c:214
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|���|������������ ������������ ���������� ���"
-#: g10/g10.c:216
+#: g10/g10.c:218
msgid "use this user-id to sign or decrypt"
msgstr ""
"������������ ��������� ������������� ������������ ��� ������� ��� �����������"
-#: g10/g10.c:217
+#: g10/g10.c:219
msgid "|N|set compress level N (0 disables)"
msgstr "|N|���������� ������� ������ (0 - �� �������)"
-#: g10/g10.c:219
+#: g10/g10.c:221
msgid "use canonical text mode"
msgstr "������������ ������������ ��������� �����"
-#: g10/g10.c:220
+#: g10/g10.c:222
msgid "use as output file"
msgstr "������������ � �������� ��������� �����"
-#: g10/g10.c:221
+#: g10/g10.c:223
msgid "verbose"
msgstr "������������"
-#: g10/g10.c:222
+#: g10/g10.c:224
msgid "be somewhat more quiet"
msgstr ""
-#: g10/g10.c:223
+#: g10/g10.c:225
#, fuzzy
msgid "force v3 signatures"
msgstr "��������� ������� �� �����"
-#: g10/g10.c:224
+#: g10/g10.c:226
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "������������ ��������� ������������� ������������ ��� ����������"
-#: g10/g10.c:225
+#: g10/g10.c:227
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:229
msgid "batch mode: never ask"
msgstr "�������� �����: ������ �� ����������"
-#: g10/g10.c:227
+#: g10/g10.c:230
msgid "assume yes on most questions"
msgstr "�������� \"��\" �� ����������� ��������"
-#: g10/g10.c:228
+#: g10/g10.c:231
msgid "assume no on most questions"
msgstr "�������� \"���\" �� ����������� ��������"
-#: g10/g10.c:229
+#: g10/g10.c:232
msgid "add this keyring to the list of keyrings"
msgstr "�������� ��� ������ � ������ ������ ������"
-#: g10/g10.c:230
+#: g10/g10.c:233
msgid "add this secret keyring to the list"
msgstr "�������� ��� ��������� ������ � ������ ������ ������"
-#: g10/g10.c:231
+#: g10/g10.c:234
msgid "|NAME|use NAME as default secret key"
msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
-#: g10/g10.c:232
+#: g10/g10.c:235
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: g10/g10.c:233
+#: g10/g10.c:236
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|���|������������ ������������ ���������� ���"
-#: g10/g10.c:234
+#: g10/g10.c:237
msgid "read options from file"
msgstr "������ ��������� �� �����"
-#: g10/g10.c:236
+#: g10/g10.c:239
msgid "set debugging flags"
msgstr "���������� ���������� �����"
-#: g10/g10.c:237
+#: g10/g10.c:240
msgid "enable full debugging"
msgstr "��������� ��� �������"
-#: g10/g10.c:238
+#: g10/g10.c:241
msgid "|FD|write status info to this FD"
msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
-#: g10/g10.c:239
+#: g10/g10.c:242
msgid "do not write comment packets"
msgstr "�� ������ ������ � �������������"
-#: g10/g10.c:240
+#: g10/g10.c:243
msgid "(default is 1)"
msgstr "(�� ��������� 1)"
-#: g10/g10.c:241
+#: g10/g10.c:244
msgid "(default is 3)"
msgstr "(�� ��������� 3)"
-#: g10/g10.c:243
+#: g10/g10.c:246
#, fuzzy
msgid "|FILE|load extension module FILE"
msgstr "|����|��������� ���� � ������������ ��������"
-#: g10/g10.c:244
+#: g10/g10.c:247
msgid "emulate the mode described in RFC1991"
msgstr "����������� ����� ��������� � RFC1991"
-#: g10/g10.c:245
+#: g10/g10.c:248
#, fuzzy
msgid "|N|use passphrase mode N"
msgstr "|N|������������ �������� ����� ������ N\n"
-#: g10/g10.c:247
+#: g10/g10.c:250
#, fuzzy
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
-#: g10/g10.c:249
+#: g10/g10.c:252
#, fuzzy
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
-#: g10/g10.c:250
+#: g10/g10.c:253
msgid "|NAME|use cipher algorithm NAME"
msgstr "|���|������������ ������������ ���������� ���"
-#: g10/g10.c:251
+#: g10/g10.c:254
msgid "|NAME|use message digest algorithm NAME"
msgstr "|���|������������ ���-�������� ���"
-#: g10/g10.c:252
+#: g10/g10.c:255
msgid "|N|use compress algorithm N"
msgstr "|N|������������ �������� ������ N"
-#: g10/g10.c:253
+#: g10/g10.c:256
msgid "throw keyid field of encrypted packets"
msgstr "����������� ���� keyid � ������������� �������"
-#: g10/g10.c:255
+#: g10/g10.c:258
#, fuzzy
msgid ""
"@\n"
@@ -639,17 +640,17 @@ msgstr ""
" --list-keys [names] �������� ������ ������\n"
" --fingerprint [names] �������� \"��������� �������\" ������\n"
-#: g10/g10.c:323
+#: g10/g10.c:327
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"����������, ����������� ��������� �� ������� �� ������ "
-#: g10/g10.c:327
+#: g10/g10.c:331
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
-#: g10/g10.c:330
+#: g10/g10.c:334
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -659,7 +660,7 @@ msgstr ""
"�����������, ��������� �������, ������� ��� ��������������\n"
"����� ������ ������� �� ������� ������\n"
-#: g10/g10.c:335
+#: g10/g10.c:339
msgid ""
"\n"
"Supported algorithms:\n"
@@ -667,147 +668,147 @@ msgstr ""
"\n"
"�������������� ���������:\n"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "usage: gpg [options] "
msgstr "�������������: gpg [���������] "
-#: g10/g10.c:449
+#: g10/g10.c:453
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Kommandos\n"
-#: g10/g10.c:576
+#: g10/g10.c:580
#, fuzzy, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
-#: g10/g10.c:580
+#: g10/g10.c:584
#, c-format
msgid "option file `%s': %s\n"
msgstr "���� ���������� `%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:591
#, c-format
msgid "reading options from `%s'\n"
msgstr "�������� ��������� �� `%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:737
#, fuzzy, c-format
msgid "%s is not a valid character set\n"
msgstr "������������ ������ � �����������.\n"
-#: g10/g10.c:774 g10/g10.c:786
+#: g10/g10.c:780 g10/g10.c:792
msgid "selected cipher algorithm is invalid\n"
msgstr "������ ������������ �������� ����������\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:786 g10/g10.c:798
msgid "selected digest algorithm is invalid\n"
msgstr "������ ������������ ��������-��������\n"
-#: g10/g10.c:795
+#: g10/g10.c:801
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
-#: g10/g10.c:797
+#: g10/g10.c:803
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ ���� ������ 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:805
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ ���� ������ 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:807
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr ""
-#: g10/g10.c:804
+#: g10/g10.c:810
#, fuzzy
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
-#: g10/g10.c:808
+#: g10/g10.c:814
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
-#: g10/g10.c:885
+#: g10/g10.c:891
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "������ ������������� ���� ������ �������: %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:897
msgid "--store [filename]"
msgstr "--store [��� �����]"
-#: g10/g10.c:898
+#: g10/g10.c:904
msgid "--symmetric [filename]"
msgstr "--symmetric [��� �����]"
-#: g10/g10.c:906
+#: g10/g10.c:912
msgid "--encrypt [filename]"
msgstr "--encrypt [��� �����]"
-#: g10/g10.c:919
+#: g10/g10.c:925
msgid "--sign [filename]"
msgstr "--sign [��� �����]"
-#: g10/g10.c:932
+#: g10/g10.c:938
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [��� �����]"
-#: g10/g10.c:946
+#: g10/g10.c:952
msgid "--clearsign [filename]"
msgstr "--clearsign [��� �����]"
-#: g10/g10.c:958
+#: g10/g10.c:964
msgid "--decrypt [filename]"
msgstr "--decrypt [��� �����]"
-#: g10/g10.c:967
+#: g10/g10.c:973
#, fuzzy
msgid "--edit-key username [commands]"
msgstr "--edit-key ���-������������"
-#: g10/g10.c:981
+#: g10/g10.c:987
msgid "--delete-secret-key username"
msgstr "--delete-secret-key ���-������������"
-#: g10/g10.c:984
+#: g10/g10.c:990
msgid "--delete-key username"
msgstr "--delete-key ���-������������"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
#, c-format
msgid "can't open %s: %s\n"
msgstr "���������� ������� ���� `%s': %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1024
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
-#: g10/g10.c:1077
+#: g10/g10.c:1083
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "������ �������������: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1091
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "������ �����������: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1157
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "������������ ���-�������� `%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1232
msgid "[filename]"
msgstr "[��� �����]"
-#: g10/g10.c:1230
+#: g10/g10.c:1236
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "���������� ������� ���� `%s'\n"
@@ -835,56 +836,56 @@ msgstr "������������ ������ ��������� �������\n"
msgid "nested clear text signatures\n"
msgstr "|[����]|������� ��������� �������"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "������������ ������ ������������ � �������: "
-#: g10/armor.c:510
+#: g10/armor.c:512
#, fuzzy
msgid "unexpected armor:"
msgstr "����������� ������"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "������������ ��� ��������� radix64 ������ %02x ��������\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "����������� ����� ����� (��� CRC)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "����������� ����� ����� (� CRC)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "������������ ����� CRC\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "������ CRC; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "����������� ����� ����� (� ������)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "������ � ����������� ������\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
#, fuzzy
msgid "no valid OpenPGP data found.\n"
msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr ""
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1031,60 +1032,60 @@ msgstr ""
"��� ������ ��� ����������. ��������� \"��\" �� ��������� ������,\n"
"������ ���� �� *�������������* ��������� ��� �������.\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "��������: ������������ ���� � �������� ��� �������!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "��������: �������� ����� ��� ������� ���!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " ��� ����� ��������, ��� ������� ����������.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "��������: �������� ����� ��� ������� ���!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "���������: ���� �������� ����� ��� �����!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "��������: ���� ���� �� ������� ���������� ��������!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" ��� ������� �������� �� ��, ��� ���� ����������� ��� ���������.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "��������: �� �� �������� ����� �����!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " ������� �������� -- ��������.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ��� �����������, ��� ������� ����������� ���������.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ��������: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:591
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1093,20 +1094,20 @@ msgstr ""
"\"-r\").\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:596
msgid "Enter the user ID: "
msgstr "������� ������������� ������������: "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:607
msgid "No such user ID.\n"
msgstr "��� ������ �������������� ������������.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:653
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: ������ ��� �������� �����: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:679
msgid "no valid addressees\n"
msgstr "��� ���������� �������\n"
@@ -1424,7 +1425,7 @@ msgstr ""
msgid "Key generation failed: %s\n"
msgstr "��������� ����� �� �������: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
#, fuzzy, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1432,7 +1433,7 @@ msgstr ""
"�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
"����������� ����)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
#, fuzzy, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1445,7 +1446,7 @@ msgstr ""
msgid "Really create? "
msgstr "������������� �������? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1456,22 +1457,17 @@ msgstr "%s: ���������� �������: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "������ ��� �������� �������� �����: %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, fuzzy, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: ��������������: ������ ����.\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "�������� �� `%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, fuzzy, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "%s: ��������������: ������ ����.\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:417
#, fuzzy, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s ����������� ���: %s\n"
@@ -1510,9 +1506,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "���������� ������� ����: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "���������� ������� ���� `%s': %s\n"
#: g10/import.c:160
#, c-format
@@ -1525,9 +1521,9 @@ msgid "%lu keys so far processed\n"
msgstr ""
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "������ ������: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
#: g10/import.c:175
#, c-format
@@ -1584,7 +1580,7 @@ msgstr "���� %08lX: ��������� ���� ������������\n"
msgid " secret keys unchanged: %lu\n"
msgstr "����������� ������������ ��������� ����"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "���� %08lX: ��� �������������� ������������\n"
@@ -1598,7 +1594,7 @@ msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "��� ����� ���� ������� ����������� ����-�������\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "���� %08lX: �������� ���� �� ������: %s\n"
@@ -1607,159 +1603,150 @@ msgstr "���� %08lX: �������� ���� �� ������: %s\n"
msgid "no default public keyring\n"
msgstr "��� ������ �������� ������ �� ���������\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
#, c-format
msgid "writing to `%s'\n"
msgstr "������������ � `%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435
+#, fuzzy
+msgid "can't lock keyring `%': %s\n"
msgstr "���������� ������������� ������ �������� ������: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "���������� �������� � ������ ������: %s\n"
+#: g10/import.c:382
+#, fuzzy
+msgid "error writing keyring `%': %s\n"
+msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "���� %08lX: �������� ���� ������������\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "���� %08lX: �� ��������� � ����� ������\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "������������ ���� �����\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "���������� �������� ���� �����: %s\n"
+#: g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "���� %08lX: 1 ����� ������������� ������������\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "���� %08lX: %d ����� ��������������� �������������\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "���� %08lX: 1 ����� �������\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "���� %08lX: %d ����� ��������\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "���� %08lX: 1 ����� ���-����\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "���� %08lX: %d ����� ���-������\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "���� %08lX: �� �������\n"
-#: g10/import.c:552
-#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "���������� ������������� ������ ��������� ������: %s\n"
-
-#: g10/import.c:555
+#: g10/import.c:544 g10/import.c:645
#, fuzzy, c-format
-msgid "can't write keyring: %s\n"
-msgstr "���������� �������� ������ ������: %s\n"
+msgid "can't lock keyring `%s': %s\n"
+msgstr "���������� ������������� ������ �������� ������: %s\n"
-#: g10/import.c:559
+#: g10/import.c:552
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "���� %08lX: ��������� ���� ������������\n"
#. we can't merge secret keys
-#: g10/import.c:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
"����������\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "���� %08lX: ���������� ���������� ������������\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "���� %08lX: ������������ ����-�������\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, fuzzy, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "���� %08lX: ��� �������������� ������������\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, fuzzy, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "���� %08lX: �������� ������������� ������������ '"
-#: g10/import.c:787
+#: g10/import.c:773
#, fuzzy, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -1768,27 +1755,32 @@ msgstr "���� %08lX: 1 ����� ���-����\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:812
+#: g10/import.c:798
#, fuzzy, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "���� %08lX: ���������� ���������� ��������\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -1877,7 +1869,7 @@ msgstr ""
msgid "Really sign? "
msgstr "������������� ���������? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
#, fuzzy, c-format
msgid "signing failed: %s\n"
msgstr "������ ������������: %s\n"
@@ -1915,388 +1907,388 @@ msgstr ""
msgid "Do you really want to do this? "
msgstr "�� ������������� ����� ������? "
-#: g10/keyedit.c:499
+#: g10/keyedit.c:501
msgid "moving a key signature to the correct place\n"
msgstr ""
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit"
msgstr "�����"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:537
msgid "quit this menu"
msgstr "����� �� ����"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:538
msgid "q"
msgstr ""
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save"
msgstr "��������"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:539
msgid "save and quit"
msgstr "�������� � �����"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "help"
msgstr "������"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:540
msgid "show this help"
msgstr "�������� ������"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
msgid "fpr"
msgstr ""
-#: g10/keyedit.c:540
+#: g10/keyedit.c:542
#, fuzzy
msgid "show fingerprint"
msgstr "�������� \"��������� ������\""
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
#, fuzzy
msgid "list"
msgstr "������"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:543
#, fuzzy
msgid "list key and user ids"
msgstr "������ ������ � ��������������� �������������"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:544
msgid "l"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "uid"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:545
msgid "select user id N"
msgstr "������� ������������� ������������ N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "key"
msgstr "����"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:546
msgid "select secondary key N"
msgstr "������� �������������� ���� N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
msgid "check"
msgstr "��������"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:547
#, fuzzy
msgid "list signatures"
msgstr "������ ������ � �� ��������"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:548
msgid "c"
msgstr ""
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
msgid "sign"
msgstr "���������"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:549
#, fuzzy
msgid "sign the key"
msgstr "��������� ����"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:550
msgid "s"
msgstr ""
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "lsign"
msgstr "���������"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:551
#, fuzzy
msgid "sign the key locally"
msgstr "��������� ����"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:552
msgid "debug"
msgstr "�������"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "adduid"
msgstr ""
-#: g10/keyedit.c:551
+#: g10/keyedit.c:553
msgid "add a user id"
msgstr "�������� ������������� ������������"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
msgid "deluid"
msgstr ""
-#: g10/keyedit.c:552
+#: g10/keyedit.c:554
#, fuzzy
msgid "delete user id"
msgstr "������� ������������� ������������"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
msgid "addkey"
msgstr ""
-#: g10/keyedit.c:553
+#: g10/keyedit.c:555
#, fuzzy
msgid "add a secondary key"
msgstr "�������� �������������� ����"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delkey"
msgstr ""
-#: g10/keyedit.c:554
+#: g10/keyedit.c:556
msgid "delete a secondary key"
msgstr "������� �������������� ����"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
msgid "expire"
msgstr ""
-#: g10/keyedit.c:555
+#: g10/keyedit.c:557
#, fuzzy
msgid "change the expire date"
msgstr "�������� �������� �����"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle"
msgstr ""
-#: g10/keyedit.c:556
+#: g10/keyedit.c:558
msgid "toggle between secret and public key listing"
msgstr "����������� ����� ������� ��������� � �������� ������"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:560
msgid "t"
msgstr ""
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "pref"
msgstr ""
-#: g10/keyedit.c:559
+#: g10/keyedit.c:561
msgid "list preferences"
msgstr ""
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:560
+#: g10/keyedit.c:562
#, fuzzy
msgid "change the passphrase"
msgstr "�������� �������� �����"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "trust"
msgstr ""
-#: g10/keyedit.c:561
+#: g10/keyedit.c:563
msgid "change the ownertrust"
msgstr "�������� ��������� �������"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revsig"
msgstr "���������"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:564
#, fuzzy
msgid "revoke signatures"
msgstr "��������� ������� �� �����"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revkey"
msgstr "����"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:565
#, fuzzy
msgid "revoke a secondary key"
msgstr "������� �������������� ����"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:584
msgid "can't do that in batchmode\n"
msgstr "���������� ������� ��� � �������� ������.\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:613
#, fuzzy
msgid "Secret key is available.\n"
msgstr "������� ��������� ����.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:642
#, fuzzy
msgid "Command> "
msgstr "�������> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:669
#, fuzzy
msgid "Need the secret key to do this.\n"
msgstr "����� ��� �������, ����� ��������� ����.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:691
msgid "Save changes? "
msgstr "��������� ���������? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:694
msgid "Quit without saving? "
msgstr "����� ��� ����������? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:704
#, fuzzy, c-format
msgid "update failed: %s\n"
msgstr "���������� �� �������: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:711
#, fuzzy, c-format
msgid "update secret failed: %s\n"
msgstr "���������� ������� �� �������: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:718
msgid "Key not changed so no update needed.\n"
msgstr "���� �� ���������, ���������� �� �����.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:721 g10/keyedit.c:780
#, fuzzy, c-format
msgid "update of trustdb failed: %s\n"
msgstr "���������� ���� ������ ������� �� �������: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
msgid "Really sign all user ids? "
msgstr "������������� ��������� ��� �������������� ������������? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:755
msgid "Hint: Select the user ids to sign\n"
msgstr ""
"���������: �������� �������������� ������������ ������� ������ ���������\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:791
msgid "You must select at least one user id.\n"
msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:793
msgid "You can't delete the last user id!\n"
msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:796
#, fuzzy
msgid "Really remove all selected user ids? "
msgstr "������������� ������� ��� ��������� �������������� ������������? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:797
#, fuzzy
msgid "Really remove this user id? "
msgstr "������������� ������� ���� ������������� ������������? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:820 g10/keyedit.c:842
msgid "You must select at least one key.\n"
msgstr "�� ������ ������� ���� �� ���� ����.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
#, fuzzy
msgid "Do you really want to delete the selected keys? "
msgstr "�� ������������� ������ ������� ��������� �����? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:825
#, fuzzy
msgid "Do you really want to delete this key? "
msgstr "�� ������������� ������ ������� ���� ����? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:846
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "�� ������������� ������ ������� ��������� �����? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:847
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "�� ������������� ������ ������� ���� ����? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:901
msgid "Invalid command (try \"help\")\n"
msgstr "������������ ������� (���������� \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1293
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1299
#, fuzzy
msgid "Please select at most one secondary key.\n"
msgstr "�� ������ ������� ���� �� ���� ����.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1303
msgid "Changing exiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1305
msgid "Changing exiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1346
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1362
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1422
#, c-format
msgid "No user id with index %d\n"
msgstr "��� �������������� ������������ � �������� %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1468
#, c-format
msgid "No secondary key with index %d\n"
msgstr "��� ��������������� ����� � �������� %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1566
#, fuzzy
msgid "user ID: \""
msgstr "������� ������������� ������������: "
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1569
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "������ ����������� ������ %08lX\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1573
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "������������� ���������� ����������"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1653
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "������������� ���������� ����������"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
#, fuzzy
msgid "no secret key\n"
msgstr "������ ��������� ����"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, fuzzy, c-format
msgid "public key is %08lX\n"
msgstr "�������� ���� �� ������"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
#, fuzzy
msgid "public key encrypted data: good DEK\n"
msgstr "����������� �������� ������ �� ������� %s\n"
@@ -2305,94 +2297,84 @@ msgstr "����������� �������� ������ �� ������� %s\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "����������� �������� ������ �� ������� %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
#, fuzzy
msgid "decryption okay\n"
msgstr "����������� �� �������: %s\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "����������� �� �������: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
#, fuzzy
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr ""
-#: g10/mainproc.c:876
+#: g10/mainproc.c:890
msgid "signature verification suppressed\n"
msgstr ""
-#: g10/mainproc.c:883
+#: g10/mainproc.c:896
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
-#: g10/mainproc.c:895
-#, fuzzy
-msgid "encrypted message is valid\n"
-msgstr "������ ������������ ��������-��������\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:904
-#, fuzzy, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "���������� ��������� �������: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:922 g10/mainproc.c:933
msgid "BAD signature from \""
msgstr "������ ������� �� \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:923 g10/mainproc.c:934
msgid "Good signature from \""
msgstr "������� ������� �� \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:925
msgid " aka \""
msgstr ""
-#: g10/mainproc.c:974
+#: g10/mainproc.c:975
#, c-format
msgid "Can't check signature: %s\n"
msgstr "���������� ��������� �������: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1056
msgid "old style (PGP 2.x) signature\n"
msgstr ""
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1061
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
-#: g10/misc.c:90
+#: g10/misc.c:93
#, fuzzy, c-format
msgid "can't disable core dumps: %s\n"
msgstr "���������� ������� ���� `%s': %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr ""
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2400,16 +2382,16 @@ msgstr ""
"����������� RSA ������� �� �������������, ����������, ��������� � ��������\n"
"������ ����� ��� ������������� � �������\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, fuzzy, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "���������� ������������� ������ �������� ������: %s\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:872
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -2456,7 +2438,7 @@ msgstr "����������, ������� ��� ����� ������: "
msgid "reading stdin ...\n"
msgstr ""
-#: g10/plaintext.c:292
+#: g10/plaintext.c:302
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "���������� ������� ����������� ������ `%s' .\n"
@@ -2495,31 +2477,31 @@ msgstr "������������ �������� �����, ���������� ����� ...\n"
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "��������������: ��������� ������ ���� - ������� �������� �����.\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr ""
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, fuzzy, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, fuzzy, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, fuzzy, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "��������������: ���� ������� ������� %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
@@ -2538,12 +2520,17 @@ msgstr "%s: ���������� �������: %s\n"
msgid "signing:"
msgstr "���������"
-#: g10/textfilter.c:122
+#: g10/sign.c:346
+#, fuzzy, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "%s: ��������������: ������ ����.\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr ""
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
msgstr ""
@@ -2582,7 +2569,7 @@ msgstr "%s: ���������� �������: %s\n"
msgid "%s: directory does not exist!\n"
msgstr ""
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
#, fuzzy, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: ���������� �������: %s\n"
@@ -3130,41 +3117,41 @@ msgid ""
msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "���� `%s' ����������. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "���������� (y/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:92
#, fuzzy
msgid "writing to stdout\n"
msgstr "������������ � `%s'\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:149
#, fuzzy, c-format
msgid "assuming signed data in `%s'\n"
msgstr "���������� ������� ����������� ������ `%s' .\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:199
#, c-format
msgid "%s: new options file created\n"
msgstr ""
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, fuzzy, c-format
msgid "%s encrypted data\n"
msgstr "����������� ������"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr ""
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
#, fuzzy
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3323,6 +3310,36 @@ msgstr "������ �����������."
msgid "No help available for `%s'"
msgstr "������ ��� `%s' �����������."
+#~ msgid "can't open file: %s\n"
+#~ msgstr "���������� ������� ����: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "������ ������: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "���������� �������� � ������ ������: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "������������ ���� �����\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "���������� �������� ���� �����: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "���������� ������������� ������ ��������� ������: %s\n"
+
+#, fuzzy
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "���������� �������� ������ ������: %s\n"
+
+#, fuzzy
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "������ ������������ ��������-��������\n"
+
+#, fuzzy
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "���������� ��������� �������: %s\n"
+
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
#~ msgstr "�������������: gpgm [���������] [�����] (-h ��� ������)"
@@ -3378,10 +3395,6 @@ msgstr "������ ��� `%s' �����������."
#~ msgstr "%s: ������������ �� ������\n"
#, fuzzy
-#~ msgid "error reading key record: %s\n"
-#~ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-
-#, fuzzy
#~ msgid "error: invalid fingerprint\n"
#~ msgstr "������ � ����������� ������\n"
diff --git a/util/ChangeLog b/util/ChangeLog
index 25edc5afe..0ec6deb40 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 23 14:20:22 CEST 1999 Werner Koch <[email protected]>
+
+ * dotlock.c: Tweaked to make it compile under mingw32
+ * http.c: Disabled for mingw32.
+
Sat May 22 22:47:26 CEST 1999 Werner Koch <[email protected]>
* logger.c (log_set_logfile): New.
diff --git a/util/dotlock.c b/util/dotlock.c
index 213f0d38e..18841ec56 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -25,7 +25,9 @@
#include <ctype.h>
#include <errno.h>
#include <unistd.h>
+#ifndef HAVE_DOSISH_SYSTEM
#include <sys/utsname.h>
+#endif
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
@@ -71,7 +73,9 @@ create_dotlock( const char *file_to_lock )
DOTLOCK h;
int fd = -1;
char pidstr[16];
+ #ifndef HAVE_DOSISH_SYSTEM
struct utsname uts;
+ #endif
const char *nodename;
const char *dirpart;
int dirpartlen;
diff --git a/util/http.c b/util/http.c
index 1073e0433..4bac8d845 100644
--- a/util/http.c
+++ b/util/http.c
@@ -25,6 +25,9 @@
#include <string.h>
#include <ctype.h>
#include <errno.h>
+
+#ifndef HAVE_DOSISH_SYSTEM
+
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -685,6 +688,7 @@ write_server( int sock, const char *data, size_t length )
return 0;
}
+#endif /* HAVE_DOSISH_SYSTEM */
/**** Test code ****/
#ifdef TEST