mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Use a unique capitalization for "Note:".
--
This commit is contained in:
parent
36679f33aa
commit
54ffe2045a
20 changed files with 190 additions and 114 deletions
|
@ -1282,7 +1282,7 @@ show_keysize_warning (void)
|
|||
return;
|
||||
shown = 1;
|
||||
tty_printf
|
||||
(_("NOTE: There is no guarantee that the card "
|
||||
(_("Note: There is no guarantee that the card "
|
||||
"supports the requested size.\n"
|
||||
" If the key generation does not succeed, "
|
||||
"please check the\n"
|
||||
|
@ -1392,7 +1392,7 @@ generate_card_keys (ctrl_t ctrl)
|
|||
|| (info.fpr3valid && !fpr_is_zero (info.fpr3)))
|
||||
{
|
||||
tty_printf ("\n");
|
||||
log_info (_("NOTE: keys are already stored on the card!\n"));
|
||||
log_info (_("Note: keys are already stored on the card!\n"));
|
||||
tty_printf ("\n");
|
||||
if ( !cpr_get_answer_is_yes ("cardedit.genkeys.replace_keys",
|
||||
_("Replace existing keys? (y/N) ")))
|
||||
|
|
14
g10/gpg.c
14
g10/gpg.c
|
@ -1976,7 +1976,7 @@ get_default_configname (void)
|
|||
/* Print a warning when both config files are present. */
|
||||
char *p = make_filename (opt.homedir, "options", NULL);
|
||||
if (! access (p, R_OK))
|
||||
log_info (_("NOTE: old default options file '%s' ignored\n"), p);
|
||||
log_info (_("Note: old default options file '%s' ignored\n"), p);
|
||||
xfree (p);
|
||||
}
|
||||
else
|
||||
|
@ -2243,7 +2243,7 @@ main (int argc, char **argv)
|
|||
if( !configfp ) {
|
||||
if( default_config ) {
|
||||
if( parse_debug )
|
||||
log_info(_("NOTE: no default option file '%s'\n"),
|
||||
log_info(_("Note: no default option file '%s'\n"),
|
||||
configname );
|
||||
}
|
||||
else {
|
||||
|
@ -2509,7 +2509,7 @@ main (int argc, char **argv)
|
|||
#endif /*!NO_TRUST_MODELS*/
|
||||
|
||||
case oForceOwnertrust:
|
||||
log_info(_("NOTE: %s is not for normal use!\n"),
|
||||
log_info(_("Note: %s is not for normal use!\n"),
|
||||
"--force-ownertrust");
|
||||
opt.force_ownertrust=string_to_trust_value(pargs.r.ret_str);
|
||||
if(opt.force_ownertrust==-1)
|
||||
|
@ -3235,7 +3235,7 @@ main (int argc, char **argv)
|
|||
}
|
||||
|
||||
if (opt.no_literal) {
|
||||
log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
|
||||
log_info(_("Note: %s is not for normal use!\n"), "--no-literal");
|
||||
if (opt.textmode)
|
||||
log_error(_("%s not allowed with %s!\n"),
|
||||
"--textmode", "--no-literal" );
|
||||
|
@ -3247,7 +3247,7 @@ main (int argc, char **argv)
|
|||
|
||||
|
||||
if (opt.set_filesize)
|
||||
log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
|
||||
log_info(_("Note: %s is not for normal use!\n"), "--set-filesize");
|
||||
if( opt.batch )
|
||||
tty_batchmode( 1 );
|
||||
|
||||
|
@ -3268,7 +3268,7 @@ main (int argc, char **argv)
|
|||
|
||||
for (i=0; i < argc; i++)
|
||||
if (argv[i][0] == '-' && argv[i][1] == '-')
|
||||
log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
|
||||
log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
|
||||
}
|
||||
|
||||
|
||||
|
@ -3353,7 +3353,7 @@ main (int argc, char **argv)
|
|||
log_error(_("invalid min-cert-level; must be 1, 2, or 3\n"));
|
||||
switch( opt.s2k_mode ) {
|
||||
case 0:
|
||||
log_info(_("NOTE: simple S2K mode (0) is strongly discouraged\n"));
|
||||
log_info(_("Note: simple S2K mode (0) is strongly discouraged\n"));
|
||||
break;
|
||||
case 1: case 3: break;
|
||||
default:
|
||||
|
|
|
@ -4263,7 +4263,7 @@ generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock)
|
|||
|
||||
if (pri_psk->version < 4)
|
||||
{
|
||||
log_info (_("NOTE: creating subkeys for v3 keys "
|
||||
log_info (_("Note: creating subkeys for v3 keys "
|
||||
"is not OpenPGP compliant\n"));
|
||||
err = gpg_error (GPG_ERR_CONFLICT);
|
||||
goto leave;
|
||||
|
@ -4386,7 +4386,7 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
|
|||
|
||||
if (pri_pk->version < 4)
|
||||
{
|
||||
log_info (_("NOTE: creating subkeys for v3 keys "
|
||||
log_info (_("Note: creating subkeys for v3 keys "
|
||||
"is not OpenPGP compliant\n"));
|
||||
err = gpg_error (GPG_ERR_NOT_SUPPORTED);
|
||||
goto leave;
|
||||
|
@ -4657,7 +4657,7 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
|
|||
|
||||
iobuf_close (fp);
|
||||
iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0, (char*)fname);
|
||||
log_info (_("NOTE: backup of card key saved to '%s'\n"), fname);
|
||||
log_info (_("Note: backup of card key saved to '%s'\n"), fname);
|
||||
|
||||
fingerprint_from_sk (sk, array, &n);
|
||||
p = fprbuf = xmalloc (MAX_FINGERPRINT_LEN*2 + 1 + 1);
|
||||
|
|
|
@ -623,7 +623,7 @@ proc_plaintext( CTX c, PACKET *pkt )
|
|||
literals_seen++;
|
||||
|
||||
if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) )
|
||||
log_info(_("NOTE: sender requested \"for-your-eyes-only\"\n"));
|
||||
log_info(_("Note: sender requested \"for-your-eyes-only\"\n"));
|
||||
else if( opt.verbose )
|
||||
log_info(_("original file name='%.*s'\n"), pt->namelen, pt->name);
|
||||
free_md_filter_context( &c->mfx );
|
||||
|
|
|
@ -375,14 +375,14 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid)
|
|||
BUG ();
|
||||
if (pk->expiredate && pk->expiredate <= make_timestamp ())
|
||||
{
|
||||
log_info (_("NOTE: secret key %s expired at %s\n"),
|
||||
log_info (_("Note: secret key %s expired at %s\n"),
|
||||
keystr (keyid), asctimestamp (pk->expiredate));
|
||||
}
|
||||
}
|
||||
|
||||
if (pk && pk->flags.revoked)
|
||||
{
|
||||
log_info (_("NOTE: key has been revoked"));
|
||||
log_info (_("Note: key has been revoked"));
|
||||
log_printf ("\n");
|
||||
show_revocation_reason (pk, 1);
|
||||
}
|
||||
|
|
|
@ -113,7 +113,7 @@ export_minimal_pk(IOBUF out,KBNODE keyblock,
|
|||
rc=build_packet(out,&pkt);
|
||||
if(rc)
|
||||
{
|
||||
log_error(_("build_packet failed: %s\n"), g10_errstr(rc) );
|
||||
log_error("build_packet failed: %s\n", g10_errstr(rc) );
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -235,7 +235,7 @@ do_check_messages( PKT_public_key *pk, PKT_signature *sig,
|
|||
if( pk->has_expired || (pk->expiredate && pk->expiredate < cur_time)) {
|
||||
char buf[11];
|
||||
if (opt.verbose)
|
||||
log_info(_("NOTE: signature key %s expired %s\n"),
|
||||
log_info(_("Note: signature key %s expired %s\n"),
|
||||
keystr_from_pk(pk), asctimestamp( pk->expiredate ) );
|
||||
sprintf(buf,"%lu",(ulong)pk->expiredate);
|
||||
write_status_text(STATUS_KEYEXPIRED,buf);
|
||||
|
@ -246,7 +246,7 @@ do_check_messages( PKT_public_key *pk, PKT_signature *sig,
|
|||
if (pk->flags.revoked)
|
||||
{
|
||||
if (opt.verbose)
|
||||
log_info (_("NOTE: signature key %s has been revoked\n"),
|
||||
log_info (_("Note: signature key %s has been revoked\n"),
|
||||
keystr_from_pk(pk));
|
||||
if (r_revoked)
|
||||
*r_revoked=1;
|
||||
|
|
|
@ -647,7 +647,7 @@ open_db()
|
|||
/* Take care of read-only trustdbs. */
|
||||
db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
|
||||
if (db_fd != -1 && !opt.quiet)
|
||||
log_info (_("NOTE: trustdb not writable\n"));
|
||||
log_info (_("Note: trustdb not writable\n"));
|
||||
}
|
||||
if ( db_fd == -1 )
|
||||
log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue