mirror of git://git.gnupg.org/gnupg.git
See ChangeLog: Fri Sep 3 10:06:06 CEST 1999 Werner Koch
This commit is contained in:
Werner Koch
parent
c7678c6462
commit
39fe1cbfde
|
|
@ -1,3 +1,15 @@
|
|||
Fri Sep 3 10:04:45 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
* pkclist.c (build_pk_list): Skip keys set with --encrypt-to also
|
||||
when asking for a key.
|
||||
|
||||
* plaintext.c (handle_plaintext): Make sure that we don't read a
|
||||
second EOF in the read loop for partial length packets.
|
||||
|
||||
* mainproc.c (check_sig_and_print): print user ID as utf-8.
|
||||
|
||||
|
||||
Thu Sep 2 16:40:55 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1058,8 +1058,8 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
: _("Good signature from \""));
|
||||
else
|
||||
log_info( _(" aka \""));
|
||||
print_string( log_stream(), un->pkt->pkt.user_id->name,
|
||||
un->pkt->pkt.user_id->len, '\"' );
|
||||
print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
|
||||
un->pkt->pkt.user_id->len );
|
||||
fputs("\"\n", log_stream() );
|
||||
if( rc )
|
||||
break; /* print only one id in this case */
|
||||
|
|
|
|||
|
|
@ -751,11 +751,18 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
|
|||
tty_printf(_("No such user ID.\n"));
|
||||
else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) {
|
||||
if( have_def_rec ) {
|
||||
PK_LIST r = m_alloc( sizeof *r );
|
||||
r->pk = pk; pk = NULL;
|
||||
r->next = pk_list;
|
||||
r->mark = 0;
|
||||
pk_list = r;
|
||||
if (key_present_in_pk_list(pk_list, pk) == 0) {
|
||||
free_public_key(pk); pk = NULL;
|
||||
log_info(_("skipped: public key "
|
||||
"already set as default recipient\n") );
|
||||
}
|
||||
else {
|
||||
PK_LIST r = m_alloc( sizeof *r );
|
||||
r->pk = pk; pk = NULL;
|
||||
r->next = pk_list;
|
||||
r->mark = 0;
|
||||
pk_list = r;
|
||||
}
|
||||
any_recipients = 1;
|
||||
break;
|
||||
}
|
||||
|
|
@ -771,13 +778,22 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
|
|||
tty_printf(_("Public key is disabled.\n") );
|
||||
}
|
||||
else if( do_we_trust_pre( pk, trustlevel ) ) {
|
||||
PK_LIST r;
|
||||
/* Skip the actual key if the key is already present
|
||||
* in the list */
|
||||
if (key_present_in_pk_list(pk_list, pk) == 0) {
|
||||
free_public_key(pk); pk = NULL;
|
||||
log_info(_("skipped: public key "
|
||||
"already set with --encrypt-to\n") );
|
||||
}
|
||||
else {
|
||||
PK_LIST r;
|
||||
|
||||
r = m_alloc( sizeof *r );
|
||||
r->pk = pk; pk = NULL;
|
||||
r->next = pk_list;
|
||||
r->mark = 0;
|
||||
pk_list = r;
|
||||
r = m_alloc( sizeof *r );
|
||||
r->pk = pk; pk = NULL;
|
||||
r->next = pk_list;
|
||||
r->mark = 0;
|
||||
pk_list = r;
|
||||
}
|
||||
any_recipients = 1;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,10 +166,19 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
|
|||
}
|
||||
else { /* binary mode */
|
||||
byte *buffer = m_alloc( 32768 );
|
||||
for( ;; ) {
|
||||
int eof;
|
||||
for( eof=0; !eof; ) {
|
||||
/* Why do we check for len < 32768:
|
||||
* If we won´ we would practically read 2 EOFS but
|
||||
* the first one has already popped the block_filter
|
||||
* off and therefore we don't catch the boundary.
|
||||
* Always assume EOF if iobuf_read returns less bytes
|
||||
* then requested */
|
||||
int len = iobuf_read( pt->buf, buffer, 32768 );
|
||||
if( len == -1 )
|
||||
break;
|
||||
if( len < 32768 )
|
||||
eof = 1;
|
||||
if( mfx->md )
|
||||
md_write( mfx->md, buffer, len );
|
||||
if( fp ) {
|
||||
|
|
@ -243,6 +252,46 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
|
|||
return rc;
|
||||
}
|
||||
|
||||
static void
|
||||
do_hash( MD_HANDLE md, MD_HANDLE md2, IOBUF fp, int textmode )
|
||||
{
|
||||
text_filter_context_t tfx;
|
||||
int c;
|
||||
|
||||
if( textmode ) {
|
||||
memset( &tfx, 0, sizeof tfx);
|
||||
iobuf_push_filter( fp, text_filter, &tfx );
|
||||
}
|
||||
if( md2 ) { /* work around a strange behaviour in pgp2 */
|
||||
/* It seems that at least PGP5 converts a single CR to a CR,LF too */
|
||||
int lc = -1;
|
||||
while( (c = iobuf_get(fp)) != -1 ) {
|
||||
if( c == '\n' && lc == '\r' )
|
||||
md_putc(md2, c);
|
||||
else if( c == '\n' ) {
|
||||
md_putc(md2, '\r');
|
||||
md_putc(md2, c);
|
||||
}
|
||||
else if( c != '\n' && lc == '\r' ) {
|
||||
md_putc(md2, '\n');
|
||||
md_putc(md2, c);
|
||||
}
|
||||
else
|
||||
md_putc(md2, c);
|
||||
|
||||
if( md )
|
||||
md_putc(md, c );
|
||||
lc = c;
|
||||
}
|
||||
}
|
||||
else {
|
||||
while( (c = iobuf_get(fp)) != -1 ) {
|
||||
if( md )
|
||||
md_putc(md, c );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/****************
|
||||
* Ask for the detached datafile and calculate the digest from it.
|
||||
|
|
@ -255,7 +304,6 @@ ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
|
|||
char *answer = NULL;
|
||||
IOBUF fp;
|
||||
int rc = 0;
|
||||
int c;
|
||||
|
||||
fp = open_sigfile( inname ); /* open default file */
|
||||
if( !fp && !opt.batch ) {
|
||||
|
|
@ -299,46 +347,6 @@ ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
|
|||
}
|
||||
|
||||
|
||||
static void
|
||||
do_hash( MD_HANDLE md, MD_HANDLE md2, IOBUF fp, int textmode )
|
||||
{
|
||||
text_filter_context_t tfx;
|
||||
int c;
|
||||
|
||||
if( textmode ) {
|
||||
memset( &tfx, 0, sizeof tfx);
|
||||
iobuf_push_filter( fp, text_filter, &tfx );
|
||||
}
|
||||
if( md2 ) { /* work around a strange behaviour in pgp2 */
|
||||
/* It seems that at least PGP5 converts a single CR to a CR,LF too */
|
||||
int lc = -1;
|
||||
while( (c = iobuf_get(fp)) != -1 ) {
|
||||
if( c == '\n' && lc == '\r' )
|
||||
md_putc(md2, c);
|
||||
else if( c == '\n' ) {
|
||||
md_putc(md2, '\r');
|
||||
md_putc(md2, c);
|
||||
}
|
||||
else if( c != '\n' && lc == '\r' ) {
|
||||
md_putc(md2, '\n');
|
||||
md_putc(md2, c);
|
||||
}
|
||||
else
|
||||
md_putc(md2, c);
|
||||
|
||||
if( md )
|
||||
md_putc(md, c );
|
||||
lc = c;
|
||||
}
|
||||
}
|
||||
else {
|
||||
while( (c = iobuf_get(fp)) != -1 ) {
|
||||
if( md )
|
||||
md_putc(md, c );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/****************
|
||||
* Hash the given files and append the hash to hash context md.
|
||||
|
|
|
|||
32
po/de.po
32
po/de.po
|
|
@ -3,7 +3,7 @@
|
|||
# Walter Koch <koch@hsp.de>, 1998.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"POT-Creation-Date: 1999-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"PO-Revision-Date: 1999-08-31 21:36+0200\n"
|
||||
"Last-Translator: Walter Koch <koch@hsp.de>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
|
|
@ -1123,12 +1123,12 @@ msgstr ""
|
|||
" Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
|
||||
"Besitzer gehört.\n"
|
||||
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s: übersprungen: %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
|
||||
|
|
@ -1149,26 +1149,36 @@ msgstr "Geben Sie die User-ID ein: "
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "Keine solche User-ID vorhanden.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "Unbekannter voreingestellter Empfänger '%s'\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s: Fehler beim Prüfen des Schlüssels: %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "Keine gültigen Adressaten\n"
|
||||
|
||||
|
|
@ -2560,15 +2570,15 @@ msgid "data not saved; use option \"--output\" to save it\n"
|
|||
msgstr ""
|
||||
"Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "Bitte geben Sie den Namen der Datendatei ein: "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr "lese stdin ...\n"
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "kann signierte Datei '%s' nicht öffnen.\n"
|
||||
|
|
|
|||
32
po/es_ES.po
32
po/es_ES.po
|
|
@ -7,7 +7,7 @@
|
|||
# GPG version: 0.9.7
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"POT-Creation-Date: 1999-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"PO-Revision-Date: 1999-06-06 18:33+0200\n"
|
||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
||||
"Date: 1998-11-13 10:49:25+0100\n"
|
||||
|
|
@ -1127,12 +1127,12 @@ msgstr ""
|
|||
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:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s: ignorado: %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr "%s: problema lectura del bloque de clave: %s\n"
|
||||
|
|
@ -1153,27 +1153,37 @@ msgstr "Introduzca el ID de usuario: "
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "ID de usuario inexistente.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr "%s: problema lectura del bloque de clave: %s\n"
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
#, fuzzy
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "la clave pública es %08lX\n"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr "%s: problema lectura del bloque de clave: %s\n"
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, fuzzy, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s: error comprobando la clave: %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr "%s: problema lectura del bloque de clave: %s\n"
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "no hay direcciones válidas\n"
|
||||
|
||||
|
|
@ -2572,15 +2582,15 @@ msgstr "Repita contrase
|
|||
msgid "data not saved; use option \"--output\" to save it\n"
|
||||
msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "Introduzca el nombre del fichero de datos: "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr "leyendo stdin...\n"
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "imposible abrir datos firmados `%s'\n"
|
||||
|
|
|
|||
32
po/fr.po
32
po/fr.po
|
|
@ -5,7 +5,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.0\n"
|
||||
"POT-Creation-Date: 1999-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"PO-Revision-Date: 1999-08-08 04:01+02:00\n"
|
||||
"Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
|
||||
"Language-Team: French <traduc@traduc.org>\n"
|
||||
|
|
@ -1116,12 +1116,12 @@ 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:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s : ignoré : %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr "%s : ignoré : clé publique déjà présente\n"
|
||||
|
|
@ -1143,26 +1143,36 @@ msgstr "Entrez le nom d'utilisateur : "
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "Pas de tel utilisateur.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr "%s : ignoré : clé publique déjà présente\n"
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "La clé publique est désactivée.\n"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr "%s : ignoré : clé publique déjà présente\n"
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "récipient par défaut `%s' inconnu\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s : erreur pendant la vérification de la clé : %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr "%s : ignoré : la clé publique est désactivée\n"
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "pas de destinataire valide\n"
|
||||
|
||||
|
|
@ -2551,15 +2561,15 @@ msgstr ""
|
|||
"données non enregistrées ; utilisez l'option \"--output\" pour\n"
|
||||
"les enregistrer\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "Entrez le nom d'un fichier de données : "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr "lecture de l'entrée standard...\n"
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "ne peut ouvir les données signées `%s'\n"
|
||||
|
|
|
|||
32
po/it.po
32
po/it.po
|
|
@ -5,7 +5,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-0.9.7\n"
|
||||
"POT-Creation-Date: 1999-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"PO-Revision-Date: 1999-08-17 23:04+02:00\n"
|
||||
"Last-Translator: Marco d'Itri <md@linux.it>\n"
|
||||
"Language-Team: Italian <it@li.org>\n"
|
||||
|
|
@ -1106,12 +1106,12 @@ msgstr ""
|
|||
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:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s: saltata: %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr "%s: saltato: chiave pubblica già presente\n"
|
||||
|
|
@ -1132,26 +1132,36 @@ msgstr "Inserisci l'user ID: "
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "User ID inesistente.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr "%s: saltato: chiave pubblica già presente\n"
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "La chiave pubblica è disabilitata.\n"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr "%s: saltato: chiave pubblica già presente\n"
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "destinatario predefinito `%s' sconosciuto\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s: errore nel controllare la chiave: %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr "%s: saltato: chiave pubblica disabilitata\n"
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "nessun indirizzo valido\n"
|
||||
|
||||
|
|
@ -2532,15 +2542,15 @@ msgid "data not saved; use option \"--output\" to save it\n"
|
|||
msgstr ""
|
||||
"i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "Inserisci il nome del file di dati: "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr "viene letto stdin...\n"
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "impossibile aprire i dati firmati `%s'\n"
|
||||
|
|
|
|||
32
po/pl.po
32
po/pl.po
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-0.9.7\n"
|
||||
"POT-Creation-Date: 1999-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"PO-Revision-Date: 1999-05-30 19:08+02:00\n"
|
||||
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
|
|
@ -1127,12 +1127,12 @@ 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:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s: pominięty: %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr "%s: problem przy odczycie bloku klucza: %s\n"
|
||||
|
|
@ -1153,27 +1153,37 @@ msgstr "Wprowad
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "Brak takiego identyfikatora użytkownika.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr "%s: problem przy odczycie bloku klucza: %s\n"
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
#, fuzzy
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "klucz publiczny %08lX\n"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr "%s: problem przy odczycie bloku klucza: %s\n"
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, fuzzy, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "UWAGA: brak domyślnego pliku opcji '%s'\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s: błąd podczas sprawdzania klucza: %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr "%s: problem przy odczycie bloku klucza: %s\n"
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "brak poprawnych adresów\n"
|
||||
|
||||
|
|
@ -2585,15 +2595,15 @@ msgid "data not saved; use option \"--output\" to save it\n"
|
|||
msgstr ""
|
||||
"dane nie zostały zapisane; należy użyć opcji \"--output\" aby je zapisać\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "Nazwa pliku danych: "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr "czytam strumień standardowego wejścia\n"
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "nie można otworzyć podpisanego pliku '%s'\n"
|
||||
|
|
|
|||
32
po/pt_BR.po
32
po/pt_BR.po
|
|
@ -5,7 +5,7 @@
|
|||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"POT-Creation-Date: 1999-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
||||
"Date: 1998-11-20 23:46:36-0200\n"
|
||||
"From: Thiago Jung Bauermann <jungmann@usa.net>\n"
|
||||
|
|
@ -1139,12 +1139,12 @@ msgstr ""
|
|||
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:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s: ignorado: %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr "%s: ignorado: a chave pública já está presente\n"
|
||||
|
|
@ -1165,26 +1165,36 @@ msgstr "Digite o identificador de usu
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "Identificador de usuário inexistente.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr "%s: ignorado: a chave pública já está presente\n"
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "A chave pública está desativada.\n"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
#, fuzzy
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr "%s: ignorado: a chave pública já está presente\n"
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "destinatário padrão desconhecido `%s'\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s: erro na verificação da chave: %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr "%s: ignorado: a chave pública está desativada\n"
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "nenhum endereço válido\n"
|
||||
|
||||
|
|
@ -2591,15 +2601,15 @@ msgstr "Repita a frase secreta: "
|
|||
msgid "data not saved; use option \"--output\" to save it\n"
|
||||
msgstr "dados não salvos; use a opção \"--output\" para salvá-los\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "Por favor digite o nome do arquivo de dados: "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr "lendo de \"stdin\" ...\n"
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "impossível abrir dados assinados `%s'\n"
|
||||
|
|
|
|||
30
po/ru.po
30
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-09-02 14:44+0200\n"
|
||||
"POT-Creation-Date: 1999-09-03 08:52+0200\n"
|
||||
"Content-Type: text/plain; charset=\n"
|
||||
"Date: 1998-01-26 22:08:36+0100\n"
|
||||
"From: Gregory Steuck <steuck@iname.com>\n"
|
||||
|
|
@ -1184,12 +1184,12 @@ msgstr "
|
|||
msgid " It is not certain that the signature belongs to the owner.\n"
|
||||
msgstr " îÅÔ Õ×ÅÒÅÎÎÏÓÔÉ, ÞÔÏ ÐÏÄÐÉÓØ ÐÒÉÎÁÄÌÅÖÉÔ ×ÌÁÄÅÌØÃÕ.\n"
|
||||
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:825 g10/pkclist.c:870
|
||||
#: g10/pkclist.c:694 g10/pkclist.c:716 g10/pkclist.c:841 g10/pkclist.c:886
|
||||
#, c-format
|
||||
msgid "%s: skipped: %s\n"
|
||||
msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
|
||||
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:852
|
||||
#: g10/pkclist.c:702 g10/pkclist.c:868
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key already present\n"
|
||||
msgstr ""
|
||||
|
|
@ -1211,27 +1211,35 @@ msgstr "
|
|||
msgid "No such user ID.\n"
|
||||
msgstr "îÅÔ ÔÁËÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
|
||||
|
||||
#: g10/pkclist.c:771
|
||||
#: g10/pkclist.c:756
|
||||
msgid "skipped: public key already set as default recipient\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/pkclist.c:778
|
||||
#, fuzzy
|
||||
msgid "Public key is disabled.\n"
|
||||
msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
|
||||
|
||||
#: g10/pkclist.c:800
|
||||
#: g10/pkclist.c:785
|
||||
msgid "skipped: public key already set with --encrypt-to\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/pkclist.c:816
|
||||
#, fuzzy, c-format
|
||||
msgid "unknown default recipient `%s'\n"
|
||||
msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
|
||||
|
||||
#: g10/pkclist.c:833
|
||||
#: g10/pkclist.c:849
|
||||
#, c-format
|
||||
msgid "%s: error checking key: %s\n"
|
||||
msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÏ×ÅÒËÅ ËÌÀÞÁ: %s\n"
|
||||
|
||||
#: g10/pkclist.c:838
|
||||
#: g10/pkclist.c:854
|
||||
#, c-format
|
||||
msgid "%s: skipped: public key is disabled\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/pkclist.c:876
|
||||
#: g10/pkclist.c:892
|
||||
msgid "no valid addressees\n"
|
||||
msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n"
|
||||
|
||||
|
|
@ -2660,15 +2668,15 @@ msgstr "
|
|||
msgid "data not saved; use option \"--output\" to save it\n"
|
||||
msgstr "ÄÁÎÎÙÅ ÎÅ ÂÙÌÉ ÓÏÈÒÁÎÅÎÙ; ×ÏÓÐÏÌØÚÕÊÔÅÓØ --\"output\" ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ\n"
|
||||
|
||||
#: g10/plaintext.c:267
|
||||
#: g10/plaintext.c:315
|
||||
msgid "Please enter name of data file: "
|
||||
msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: "
|
||||
|
||||
#: g10/plaintext.c:288
|
||||
#: g10/plaintext.c:336
|
||||
msgid "reading stdin ...\n"
|
||||
msgstr ""
|
||||
|
||||
#: g10/plaintext.c:371
|
||||
#: g10/plaintext.c:379
|
||||
#, c-format
|
||||
msgid "can't open signed data `%s'\n"
|
||||
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
|
|||
break;
|
||||
}
|
||||
else if( a->partial ) {
|
||||
/* These OpenPGP introduced huffman encoded length
|
||||
/* These OpenPGP introduced huffman like encoded length
|
||||
* bytes are really a mess :-( */
|
||||
if( a->first_c ) {
|
||||
c = a->first_c;
|
||||
|
|
@ -220,6 +220,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
|
|||
else { /* next partial body length */
|
||||
a->size = 1 << (c & 0x1f);
|
||||
}
|
||||
/* log_debug("partial: ctx=%p c=%02x size=%u\n", a, c, a->size);*/
|
||||
}
|
||||
else { /* the gnupg partial length scheme - much better :-) */
|
||||
c = iobuf_get(chain);
|
||||
|
|
@ -372,6 +373,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
|
|||
*/
|
||||
/* construct header */
|
||||
len = a->buflen;
|
||||
/*log_debug("partial: remaining length=%u\n", len );*/
|
||||
if( len < 192 )
|
||||
rc = iobuf_put(chain, len );
|
||||
else if( len < 8384 ) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue