1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always set

opt.s2k_digest_algo.  This helps fix a problem with PGP 2.x encrypted
symmetric messages.  Change all callers (encode.c, g10.c, keyedit.c,
keygen.c, passphrase.c, sign.c).

* armor.c, cardglue.c, getkey.c, import.c, keygen.c: Be consistent in some
more quoted strings.  Always use 'user ID', not 'user id', "quotes" for
user IDs, etc.
This commit is contained in:
David Shaw 2004-09-24 20:34:38 +00:00
parent 680be9be10
commit 4d26ab92cc
12 changed files with 45 additions and 34 deletions

View file

@ -183,7 +183,7 @@ get_primary_uid ( KBNODE keyblock, size_t *uidlen )
}
/* fixme: returning translatable constants instead of a user ID is
* not good because they are probably not utf-8 encoded. */
s = _("[User id not found]");
s = _("[User ID not found]");
*uidlen = strlen (s);
return s;
}
@ -2688,7 +2688,7 @@ get_user_id( u32 *keyid, size_t *rn )
}
}
} while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
p = m_strdup( _("[User id not found]") );
p = m_strdup( _("[User ID not found]") );
*rn = strlen(p);
return p;
}