summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/call-agent.c2
-rw-r--r--g10/card-util.c10
-rw-r--r--g10/dearmor.c4
-rw-r--r--g10/decrypt.c8
-rw-r--r--g10/encrypt.c18
-rw-r--r--g10/exec.c16
-rw-r--r--g10/export.c2
-rw-r--r--g10/getkey.c4
-rw-r--r--g10/gpg.c72
-rw-r--r--g10/helptext.c2
-rw-r--r--g10/import.c14
-rw-r--r--g10/keydb.c16
-rw-r--r--g10/keyedit.c14
-rw-r--r--g10/keygen.c22
-rw-r--r--g10/keyring.c38
-rw-r--r--g10/keyserver.c10
-rw-r--r--g10/mainproc.c2
-rw-r--r--g10/misc.c14
-rw-r--r--g10/openfile.c26
-rw-r--r--g10/photoid.c4
-rw-r--r--g10/pkclist.c6
-rw-r--r--g10/plaintext.c36
-rw-r--r--g10/sign.c20
-rw-r--r--g10/tdbdump.c16
-rw-r--r--g10/tdbio.c20
-rw-r--r--g10/trustdb.c10
-rw-r--r--g10/verify.c4
27 files changed, 205 insertions, 205 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 445102951..55637e463 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -318,7 +318,7 @@ default_inq_cb (void *opaque, const char *line)
/* We do not pass errors to avoid breaking other code. */
}
else
- log_debug ("ignoring gpg-agent inquiry `%s'\n", line);
+ log_debug ("ignoring gpg-agent inquiry '%s'\n", line);
return 0;
}
diff --git a/g10/card-util.c b/g10/card-util.c
index 14268dfeb..533489cd9 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -794,7 +794,7 @@ get_data_from_file (const char *fname, size_t maxlen, char **r_buffer)
#endif
if (!fp)
{
- tty_printf (_("can't open `%s': %s\n"), fname, strerror (errno));
+ tty_printf (_("can't open '%s': %s\n"), fname, strerror (errno));
return -1;
}
@@ -813,7 +813,7 @@ get_data_from_file (const char *fname, size_t maxlen, char **r_buffer)
es_fclose (fp);
if (n < 0)
{
- tty_printf (_("error reading `%s': %s\n"), fname, strerror (errno));
+ tty_printf (_("error reading '%s': %s\n"), fname, strerror (errno));
xfree (data);
return -1;
}
@@ -840,13 +840,13 @@ put_data_to_file (const char *fname, const void *buffer, size_t length)
#endif
if (!fp)
{
- tty_printf (_("can't create `%s': %s\n"), fname, strerror (errno));
+ tty_printf (_("can't create '%s': %s\n"), fname, strerror (errno));
return -1;
}
if (length && es_fwrite (buffer, length, 1, fp) != 1)
{
- tty_printf (_("error writing `%s': %s\n"), fname, strerror (errno));
+ tty_printf (_("error writing '%s': %s\n"), fname, strerror (errno));
es_fclose (fp);
return -1;
}
@@ -1403,7 +1403,7 @@ generate_card_keys (ctrl_t ctrl)
{
tty_printf ("\n");
tty_printf (_("Please note that the factory settings of the PINs are\n"
- " PIN = `%s' Admin PIN = `%s'\n"
+ " PIN = '%s' Admin PIN = '%s'\n"
"You should change them using the command --change-pin\n"),
"123456", "12345678");
tty_printf ("\n");
diff --git a/g10/dearmor.c b/g10/dearmor.c
index e83447103..0f62f5465 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -57,7 +57,7 @@ dearmor_file( const char *fname )
}
if (!inp) {
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"), fname? fname: "[stdin]",
+ log_error(_("can't open '%s': %s\n"), fname? fname: "[stdin]",
strerror(errno) );
goto leave;
}
@@ -104,7 +104,7 @@ enarmor_file( const char *fname )
}
if (!inp) {
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"), fname? fname: "[stdin]",
+ log_error(_("can't open '%s': %s\n"), fname? fname: "[stdin]",
strerror(errno) );
goto leave;
}
diff --git a/g10/decrypt.c b/g10/decrypt.c
index e8c4563a6..f668ab83e 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -64,7 +64,7 @@ decrypt_message (ctrl_t ctrl, const char *filename)
if ( !fp )
{
rc = gpg_error_from_syserror ();
- log_error (_("can't open `%s': %s\n"), print_fname_stdin(filename),
+ log_error (_("can't open '%s': %s\n"), print_fname_stdin(filename),
gpg_strerror (rc));
release_progress_context (pfx);
return rc;
@@ -126,7 +126,7 @@ decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd)
err = gpg_error_from_syserror ();
snprintf (xname, sizeof xname, "[fd %d]", input_fd);
- log_error (_("can't open `%s': %s\n"), xname, gpg_strerror (err));
+ log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
release_progress_context (pfx);
return err;
}
@@ -143,7 +143,7 @@ decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd)
err = gpg_error_from_syserror ();
snprintf (xname, sizeof xname, "[fd %d]", output_fd);
- log_error (_("can't open `%s': %s\n"), xname, gpg_strerror (err));
+ log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
iobuf_close (fp);
release_progress_context (pfx);
return err;
@@ -237,7 +237,7 @@ decrypt_messages (ctrl_t ctrl, int nfiles, char *files[])
}
if (!fp)
{
- log_error(_("can't open `%s'\n"), print_fname_stdin(filename));
+ log_error(_("can't open '%s'\n"), print_fname_stdin(filename));
goto next_file;
}
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 83b43a89e..671f8f6df 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -195,7 +195,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
if (!inp)
{
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"), filename? filename: "[stdin]",
+ log_error(_("can't open '%s': %s\n"), filename? filename: "[stdin]",
strerror(errno) );
release_progress_context (pfx);
return rc;
@@ -260,7 +260,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
&& is_file_compressed(filename, &rc))
{
if (opt.verbose)
- log_info(_("`%s' already compressed\n"), filename);
+ log_info(_("'%s' already compressed\n"), filename);
do_compress = 0;
}
@@ -317,7 +317,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
if ( !(tmpsize = iobuf_get_filelength(inp, &overflow))
&& !overflow && opt.verbose)
- log_info(_("WARNING: `%s' is an empty file\n"), filename );
+ log_info(_("WARNING: '%s' is an empty file\n"), filename );
/* We can't encode the length of very large files because
OpenPGP uses only 32 bit for file sizes. So if the the
size of a file is larger than 2^32 minus some bytes for
@@ -544,13 +544,13 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
strcpy (xname, "[stdin]");
else
*xname = 0;
- log_error (_("can't open `%s': %s\n"),
+ log_error (_("can't open '%s': %s\n"),
*xname? xname : filename, gpg_strerror (rc) );
goto leave;
}
if (opt.verbose)
- log_info (_("reading from `%s'\n"), iobuf_get_fname_nonnull (inp));
+ log_info (_("reading from '%s'\n"), iobuf_get_fname_nonnull (inp));
handle_progress (pfx, inp, filename);
@@ -624,7 +624,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
if (do_compress && cfx.dek->use_mdc && is_file_compressed(filename, &rc2))
{
if (opt.verbose)
- log_info(_("`%s' already compressed\n"), filename);
+ log_info(_("'%s' already compressed\n"), filename);
do_compress = 0;
}
if (rc2)
@@ -659,7 +659,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
if ( !(tmpsize = iobuf_get_filelength(inp, &overflow))
&& !overflow && opt.verbose)
- log_info(_("WARNING: `%s' is an empty file\n"), filename );
+ log_info(_("WARNING: '%s' is an empty file\n"), filename );
/* We can't encode the length of very large files because
OpenPGP uses only 32 bit for file sizes. So if the the size
of a file is larger than 2^32 minus some bytes for packet
@@ -965,7 +965,7 @@ encrypt_crypt_files (ctrl_t ctrl, int nfiles, char **files, strlist_t remusr)
print_file_status(STATUS_FILE_START, line, 2);
rc = encrypt_crypt (ctrl, -1, line, remusr, 0, NULL, -1);
if (rc)
- log_error ("encryption of `%s' failed: %s\n",
+ log_error ("encryption of '%s' failed: %s\n",
print_fname_stdin(line), g10_errstr(rc) );
write_status( STATUS_FILE_DONE );
}
@@ -976,7 +976,7 @@ encrypt_crypt_files (ctrl_t ctrl, int nfiles, char **files, strlist_t remusr)
{
print_file_status(STATUS_FILE_START, *files, 2);
if ( (rc = encrypt_crypt (ctrl, -1, *files, remusr, 0, NULL, -1)) )
- log_error("encryption of `%s' failed: %s\n",
+ log_error("encryption of '%s' failed: %s\n",
print_fname_stdin(*files), g10_errstr(rc) );
write_status( STATUS_FILE_DONE );
files++;
diff --git a/g10/exec.c b/g10/exec.c
index 56e49ec34..0caa43ba4 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -193,7 +193,7 @@ make_tempdir(struct exec_info *info)
#endif
if(mkdtemp(info->tempdir)==NULL)
- log_error(_("can't create directory `%s': %s\n"),
+ log_error(_("can't create directory '%s': %s\n"),
info->tempdir,strerror(errno));
else
{
@@ -421,10 +421,10 @@ exec_write(struct exec_info **info,const char *program,
/* If we get this far the exec failed. Clean up and return. */
if(args_in==NULL)
- log_error(_("unable to execute program `%s': %s\n"),
+ log_error(_("unable to execute program '%s': %s\n"),
program,strerror(errno));
else
- log_error(_("unable to execute shell `%s': %s\n"),
+ log_error(_("unable to execute shell '%s': %s\n"),
shell,strerror(errno));
/* This mimics the POSIX sh behavior - 127 means "not found"
@@ -465,7 +465,7 @@ exec_write(struct exec_info **info,const char *program,
#endif /* !EXEC_TEMPFILE_ONLY */
if(DBG_EXTPROG)
- log_debug("using temp file `%s'\n",(*info)->tempfile_in);
+ log_debug("using temp file '%s'\n",(*info)->tempfile_in);
/* It's not fork/exec/pipe, so create a temp file */
if( is_secured_filename ((*info)->tempfile_in) )
@@ -478,7 +478,7 @@ exec_write(struct exec_info **info,const char *program,
if((*info)->tochild==NULL)
{
ret = gpg_error_from_syserror ();
- log_error(_("can't create `%s': %s\n"),
+ log_error(_("can't create '%s': %s\n"),
(*info)->tempfile_in,strerror(errno));
goto fail;
}
@@ -604,19 +604,19 @@ exec_finish(struct exec_info *info)
if(info->tempfile_in)
{
if(unlink(info->tempfile_in)==-1)
- log_info(_("WARNING: unable to remove tempfile (%s) `%s': %s\n"),
+ log_info(_("WARNING: unable to remove tempfile (%s) '%s': %s\n"),
"in",info->tempfile_in,strerror(errno));
}
if(info->tempfile_out)
{
if(unlink(info->tempfile_out)==-1)
- log_info(_("WARNING: unable to remove tempfile (%s) `%s': %s\n"),
+ log_info(_("WARNING: unable to remove tempfile (%s) '%s': %s\n"),
"out",info->tempfile_out,strerror(errno));
}
if(rmdir(info->tempdir)==-1)
- log_info(_("WARNING: unable to remove temp directory `%s': %s\n"),
+ log_info(_("WARNING: unable to remove temp directory '%s': %s\n"),
info->tempdir,strerror(errno));
}
diff --git a/g10/export.c b/g10/export.c
index 9a348523b..d8d9c05c2 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -586,7 +586,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
curveoidstr = gpg_curve_to_oid (curvename, NULL);
if (!curveoidstr)
{
- log_error ("no OID known for curve `%s'\n", curvename);
+ log_error ("no OID known for curve '%s'\n", curvename);
err = gpg_error (GPG_ERR_UNKNOWN_NAME);
goto leave;
}
diff --git a/g10/getkey.c b/g10/getkey.c
index b80695db4..929427302 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -872,12 +872,12 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
if (!rc)
{
/* Key found. */
- log_info (_("automatically retrieved `%s' via %s\n"),
+ log_info (_("automatically retrieved '%s' via %s\n"),
name, mechanism);
break;
}
if (rc != G10ERR_NO_PUBKEY || opt.verbose || no_fingerprint)
- log_info (_("error retrieving `%s' via %s: %s\n"),
+ log_info (_("error retrieving '%s' via %s: %s\n"),
name, mechanism,
no_fingerprint ? _("No fingerprint") : g10_errstr (rc));
}
diff --git a/g10/gpg.c b/g10/gpg.c
index f05fda944..c8dbbfe83 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1012,7 +1012,7 @@ set_debug (const char *level)
}
else
{
- log_error (_("invalid debug-level `%s' given\n"), level);
+ log_error (_("invalid debug-level '%s' given\n"), level);
g10_exit (2);
}
@@ -1127,8 +1127,8 @@ open_info_file (const char *fname, int for_write, int binary)
while (fd == -1 && errno == EINTR);
/* } */
if ( fd == -1)
- log_error ( for_write? _("can't create `%s': %s\n")
- : _("can't open `%s': %s\n"), fname, strerror(errno));
+ log_error ( for_write? _("can't create '%s': %s\n")
+ : _("can't open '%s': %s\n"), fname, strerror(errno));
return fd;
#endif
@@ -1181,7 +1181,7 @@ add_group(char *string)
name=strsep(&string,"=");
if(string==NULL)
{
- log_error(_("no = sign found in group definition `%s'\n"),name);
+ log_error(_("no = sign found in group definition '%s'\n"),name);
return;
}
@@ -1379,49 +1379,49 @@ check_permissions (const char *path, int item)
{
if(item==0)
log_info(_("WARNING: unsafe ownership on"
- " homedir `%s'\n"),tmppath);
+ " homedir '%s'\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe ownership on"
- " configuration file `%s'\n"),tmppath);
+ " configuration file '%s'\n"),tmppath);
else
log_info(_("WARNING: unsafe ownership on"
- " extension `%s'\n"),tmppath);
+ " extension '%s'\n"),tmppath);
}
if(perm)
{
if(item==0)
log_info(_("WARNING: unsafe permissions on"
- " homedir `%s'\n"),tmppath);
+ " homedir '%s'\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe permissions on"
- " configuration file `%s'\n"),tmppath);
+ " configuration file '%s'\n"),tmppath);
else
log_info(_("WARNING: unsafe permissions on"
- " extension `%s'\n"),tmppath);
+ " extension '%s'\n"),tmppath);
}
if(enc_dir_own)
{
if(item==0)
log_info(_("WARNING: unsafe enclosing directory ownership on"
- " homedir `%s'\n"),tmppath);
+ " homedir '%s'\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe enclosing directory ownership on"
- " configuration file `%s'\n"),tmppath);
+ " configuration file '%s'\n"),tmppath);
else
log_info(_("WARNING: unsafe enclosing directory ownership on"
- " extension `%s'\n"),tmppath);
+ " extension '%s'\n"),tmppath);
}
if(enc_dir_perm)
{
if(item==0)
log_info(_("WARNING: unsafe enclosing directory permissions on"
- " homedir `%s'\n"),tmppath);
+ " homedir '%s'\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe enclosing directory permissions on"
- " configuration file `%s'\n"),tmppath);
+ " configuration file '%s'\n"),tmppath);
else
log_info(_("WARNING: unsafe enclosing directory permissions on"
- " extension `%s'\n"),tmppath);
+ " extension '%s'\n"),tmppath);
}
}
@@ -1603,7 +1603,7 @@ list_config(char *items)
break;
if(!any)
- log_error(_("unknown configuration item `%s'\n"),name);
+ log_error(_("unknown configuration item '%s'\n"),name);
}
}
@@ -1805,7 +1805,7 @@ parse_trust_model(const char *model)
else if(ascii_strcasecmp(model,"auto")==0)
opt.trust_model=TM_AUTO;
else
- log_error("unknown trust model `%s'\n",model);
+ log_error("unknown trust model '%s'\n",model);
}
@@ -1865,7 +1865,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
@@ -2123,18 +2123,18 @@ 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 {
- log_error(_("option file `%s': %s\n"),
+ log_error(_("option file '%s': %s\n"),
configname, strerror(errno) );
g10_exit(2);
}
xfree(configname); configname = NULL;
}
if( parse_debug && configname )
- log_info(_("reading options from `%s'\n"), configname );
+ log_info(_("reading options from '%s'\n"), configname );
default_config = 0;
}
@@ -2366,7 +2366,7 @@ main (int argc, char **argv)
opt.force_ownertrust=string_to_trust_value(pargs.r.ret_str);
if(opt.force_ownertrust==-1)
{
- log_error("invalid ownertrust `%s'\n",pargs.r.ret_str);
+ log_error("invalid ownertrust '%s'\n",pargs.r.ret_str);
opt.force_ownertrust=0;
}
break;
@@ -2550,7 +2550,7 @@ main (int argc, char **argv)
if(*pargs.r.ret_str!='\0')
{
if(parse_expire_string(pargs.r.ret_str)==(u32)-1)
- log_error(_("`%s' is not a valid signature expiration\n"),
+ log_error(_("'%s' is not a valid signature expiration\n"),
pargs.r.ret_str);
else
opt.def_sig_expire=pargs.r.ret_str;
@@ -2562,7 +2562,7 @@ main (int argc, char **argv)
if(*pargs.r.ret_str!='\0')
{
if(parse_expire_string(pargs.r.ret_str)==(u32)-1)
- log_error(_("`%s' is not a valid signature expiration\n"),
+ log_error(_("'%s' is not a valid signature expiration\n"),
pargs.r.ret_str);
else
opt.def_cert_expire=pargs.r.ret_str;
@@ -2644,7 +2644,7 @@ main (int argc, char **argv)
case oNoMDCWarn: opt.no_mdc_warn=1; break;
case oDisplayCharset:
if( set_native_charset( pargs.r.ret_str ) )
- log_error(_("`%s' is not a valid character set\n"),
+ log_error(_("'%s' is not a valid character set\n"),
pargs.r.ret_str);
break;
case oNotDashEscaped: opt.not_dash_escaped = 1; break;
@@ -2927,7 +2927,7 @@ main (int argc, char **argv)
else if(ascii_strcasecmp(pargs.r.ret_str,"0xlong")==0)
opt.keyid_format=KF_0xLONG;
else
- log_error("unknown keyid-format `%s'\n",pargs.r.ret_str);
+ log_error("unknown keyid-format '%s'\n",pargs.r.ret_str);
break;
case oExitOnStatusWriteError:
@@ -3053,7 +3053,7 @@ main (int argc, char **argv)
}
if (opt.verbose > 2)
- log_info ("using character set `%s'\n", get_native_charset ());
+ log_info ("using character set '%s'\n", get_native_charset ());
if( may_coredump && !opt.quiet )
log_info(_("WARNING: program may create a core file!\n"));
@@ -3100,7 +3100,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]);
}
@@ -3356,17 +3356,17 @@ main (int argc, char **argv)
switch(badtype)
{
case PREFTYPE_SYM:
- log_info(_("you may not use cipher algorithm `%s'"
+ log_info(_("you may not use cipher algorithm '%s'"
" while in %s mode\n"),
badalg,compliance_option_string());
break;
case PREFTYPE_HASH:
- log_info(_("you may not use digest algorithm `%s'"
+ log_info(_("you may not use digest algorithm '%s'"
" while in %s mode\n"),
badalg,compliance_option_string());
break;
case PREFTYPE_ZIP:
- log_info(_("you may not use compression algorithm `%s'"
+ log_info(_("you may not use compression algorithm '%s'"
" while in %s mode\n"),
badalg,compliance_option_string());
break;
@@ -3473,14 +3473,14 @@ main (int argc, char **argv)
if( argc > 1 )
wrong_args(_("--store [filename]"));
if( (rc = encrypt_store(fname)) )
- log_error ("storing `%s' failed: %s\n",
+ log_error ("storing '%s' failed: %s\n",
print_fname_stdin(fname),g10_errstr(rc) );
break;
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
wrong_args(_("--symmetric [filename]"));
if( (rc = encrypt_symmetric(fname)) )
- log_error (_("symmetric encryption of `%s' failed: %s\n"),
+ log_error (_("symmetric encryption of '%s' failed: %s\n"),
print_fname_stdin(fname),g10_errstr(rc) );
break;
@@ -3925,7 +3925,7 @@ main (int argc, char **argv)
int algo = all_algos? 0 : gcry_md_map_name (*argv);
if( !algo && !all_algos )
- log_error(_("invalid hash algorithm `%s'\n"), *argv );
+ log_error(_("invalid hash algorithm '%s'\n"), *argv );
else {
argc--; argv++;
if( !argc )
@@ -4056,7 +4056,7 @@ main (int argc, char **argv)
gpg_err_set_errno (EPERM);
}
if( !a )
- log_error(_("can't open `%s'\n"), print_fname_stdin(fname));
+ log_error(_("can't open '%s'\n"), print_fname_stdin(fname));
else {
if( !opt.no_armor ) {
diff --git a/g10/helptext.c b/g10/helptext.c
index f1e01ca93..7bca1db5e 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -79,7 +79,7 @@ display_online_help( const char *keyword )
}
else
{
- tty_printf (_("No help available for `%s'"), keyword );
+ tty_printf (_("No help available for '%s'"), keyword );
}
if (need_final_lf)
tty_printf("\n");
diff --git a/g10/import.c b/g10/import.c
index c053e21ea..bfe02eb16 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -194,7 +194,7 @@ import_keys_internal (ctrl_t ctrl, iobuf_t inp, char **fnames, int nnames,
gpg_err_set_errno (EPERM);
}
if( !inp2 )
- log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
+ log_error(_("can't open '%s': %s\n"), fname, strerror(errno) );
else
{
rc = import (ctrl, inp2, fname, stats, fpr, fpr_len, options);
@@ -203,7 +203,7 @@ import_keys_internal (ctrl_t ctrl, iobuf_t inp, char **fnames, int nnames,
iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE,
0, (char*)fname);
if( rc )
- log_error("import from `%s' failed: %s\n", fname,
+ log_error("import from '%s' failed: %s\n", fname,
g10_errstr(rc) );
}
if( !fname )
@@ -314,7 +314,7 @@ import (ctrl_t ctrl, IOBUF inp, const char* fname,struct stats_s *stats,
if( rc == -1 )
rc = 0;
else if( rc && rc != G10ERR_INV_KEYRING )
- log_error( _("error reading `%s': %s\n"), fname, g10_errstr(rc));
+ log_error( _("error reading '%s': %s\n"), fname, g10_errstr(rc));
return rc;
}
@@ -880,11 +880,11 @@ import_one (ctrl_t ctrl,
return G10ERR_GENERAL;
}
if( opt.verbose > 1 )
- log_info (_("writing to `%s'\n"), keydb_get_resource_name (hd) );
+ log_info (_("writing to '%s'\n"), keydb_get_resource_name (hd) );
rc = keydb_insert_keyblock (hd, keyblock );
if (rc)
- log_error (_("error writing keyring `%s': %s\n"),
+ log_error (_("error writing keyring '%s': %s\n"),
keydb_get_resource_name (hd), g10_errstr(rc));
else
{
@@ -984,7 +984,7 @@ import_one (ctrl_t ctrl,
/* keyblock_orig has been updated; write */
rc = keydb_update_keyblock (hd, keyblock_orig);
if (rc)
- log_error (_("error writing keyring `%s': %s\n"),
+ log_error (_("error writing keyring '%s': %s\n"),
keydb_get_resource_name (hd), g10_errstr(rc) );
else if(non_self)
revalidation_mark ();
@@ -1726,7 +1726,7 @@ import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats )
/* and write the keyblock back */
rc = keydb_update_keyblock (hd, keyblock );
if (rc)
- log_error (_("error writing keyring `%s': %s\n"),
+ log_error (_("error writing keyring '%s': %s\n"),
keydb_get_resource_name (hd), g10_errstr(rc) );
keydb_release (hd); hd = NULL;
/* we are ready */
diff --git a/g10/keydb.c b/g10/keydb.c
index 9b9b2ed5f..75c036cf5 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -144,7 +144,7 @@ maybe_create_keyring (char *filename, int force)
sense if this is the case. An empty non-writable directory
with no keyring is not really useful at all. */
if (opt.verbose)
- log_info ("can't allocate lock for `%s'\n", filename );
+ log_info ("can't allocate lock for '%s'\n", filename );
if (!force)
return gpg_error (GPG_ERR_ENOENT);
@@ -155,7 +155,7 @@ maybe_create_keyring (char *filename, int force)
if ( dotlock_take (lockhd, -1) )
{
/* This is something bad. Probably a stale lockfile. */
- log_info ("can't lock `%s'\n", filename );
+ log_info ("can't lock '%s'\n", filename );
rc = G10ERR_GENERAL;
goto leave;
}
@@ -180,13 +180,13 @@ maybe_create_keyring (char *filename, int force)
if (!iobuf)
{
rc = gpg_error_from_syserror ();
- log_error ( _("error creating keyring `%s': %s\n"),
+ log_error ( _("error creating keyring '%s': %s\n"),
filename, strerror(errno));
goto leave;
}
if (!opt.quiet)
- log_info (_("keyring `%s' created\n"), filename);
+ log_info (_("keyring '%s' created\n"), filename);
iobuf_close (iobuf);
/* Must invalidate that ugly cache */
@@ -243,7 +243,7 @@ keydb_add_resource (const char *url, int flags)
#if !defined(HAVE_DRIVE_LETTERS) && !defined(__riscos__)
else if (strchr (resname, ':'))
{
- log_error ("invalid key resource URL `%s'\n", url );
+ log_error ("invalid key resource URL '%s'\n", url );
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
@@ -292,7 +292,7 @@ keydb_add_resource (const char *url, int flags)
switch (rt)
{
case KEYDB_RESOURCE_TYPE_NONE:
- log_error ("unknown type of key resource `%s'\n", url );
+ log_error ("unknown type of key resource '%s'\n", url );
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
@@ -326,7 +326,7 @@ keydb_add_resource (const char *url, int flags)
break;
default:
- log_error ("resource type of `%s' not supported\n", url);
+ log_error ("resource type of '%s' not supported\n", url);
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
@@ -335,7 +335,7 @@ keydb_add_resource (const char *url, int flags)
leave:
if (rc)
- log_error (_("keyblock resource `%s': %s\n"), filename, gpg_strerror (rc));
+ log_error (_("keyblock resource '%s': %s\n"), filename, gpg_strerror (rc));
else
any_public = 1;
xfree (filename);
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 26e05a02d..08b71d8b4 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -932,7 +932,7 @@ sign_uids (KBNODE keyblock, strlist_t locusr, int *ret_modified,
{
answer = cpr_get ("sign_uid.class",
_("Your selection? "
- "(enter `?' for more information): "));
+ "(enter '?' for more information): "));
if (answer[0] == '\0')
class = 0x10 + opt.def_cert_level; /* Default */
else if (ascii_strcasecmp (answer, "0") == 0)
@@ -1633,9 +1633,9 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
tty_printf ("\n");
tty_printf
- (_("* The `sign' command may be prefixed with an `l' for local "
+ (_("* The 'sign' command may be prefixed with an 'l' for local "
"signatures (lsign),\n"
- " a `t' for trust signatures (tsign), an `nr' for "
+ " a 't' for trust signatures (tsign), an 'nr' for "
"non-revocable signatures\n"
" (nrsign), or any combination thereof (ltsign, "
"tnrsign, etc.).\n"));
@@ -1717,7 +1717,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
if (!parse_sign_type
(answer, &localsig, &nonrevokesig, &trustsig))
{
- tty_printf (_("Unknown signature type `%s'\n"), answer);
+ tty_printf (_("Unknown signature type '%s'\n"), answer);
break;
}
@@ -1879,7 +1879,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
}
if (!a)
{
- tty_printf (_("Can't open `%s': %s\n"),
+ tty_printf (_("Can't open '%s': %s\n"),
fname, strerror (errno));
break;
}
@@ -1895,7 +1895,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
err = G10ERR_NO_SECKEY;
if (err)
{
- tty_printf (_("Error reading backup key from `%s': %s\n"),
+ tty_printf (_("Error reading backup key from '%s': %s\n"),
fname, g10_errstr (err));
free_packet (pkt);
xfree (pkt);
@@ -2256,7 +2256,7 @@ leave:
free_public_key (pk);
if (err)
{
- log_info ("error changing the passphrase for `%s': %s\n",
+ log_info ("error changing the passphrase for '%s': %s\n",
username, gpg_strerror (err));
write_status_error ("keyedit.passwd", err);
}
diff --git a/g10/keygen.c b/g10/keygen.c
index 2dae3fe2d..b5ccf0287 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -272,7 +272,7 @@ set_one_pref (int val, int type, const char *item, byte *buf, int *nbuf)
for (i=0; i < *nbuf; i++ )
if (buf[i] == val)
{
- log_info (_("preference `%s' duplicated\n"), item);
+ log_info (_("preference '%s' duplicated\n"), item);
return -1;
}
@@ -441,7 +441,7 @@ keygen_set_std_prefs (const char *string,int personal)
modify=0;
else
{
- log_info (_("invalid item `%s' in preference string\n"),tok);
+ log_info (_("invalid item '%s' in preference string\n"),tok);
rc=-1;
}
}
@@ -2387,7 +2387,7 @@ ask_user_id (int mode, KBNODE keyblock)
/* print a note in case that UTF8 mapping has to be done */
for(p=uid; *p; p++ ) {
if( *p & 0x80 ) {
- tty_printf(_("You are using the `%s' character set.\n"),
+ tty_printf(_("You are using the '%s' character set.\n"),
get_native_charset() );
break;
}
@@ -3091,7 +3091,7 @@ read_parameter_file( const char *fname )
gpg_err_set_errno (EPERM);
}
if (!fp) {
- log_error (_("can't open `%s': %s\n"), fname, strerror(errno) );
+ log_error (_("can't open '%s': %s\n"), fname, strerror(errno) );
return;
}
iobuf_ioctl (fp, IOBUF_IOCTL_NO_CACHE, 1, NULL);
@@ -3156,7 +3156,7 @@ read_parameter_file( const char *fname )
/* Ignore this command. */
}
else
- log_info("skipping control `%s' (%s)\n", keyword, value );
+ log_info("skipping control '%s' (%s)\n", keyword, value );
continue;
@@ -3584,7 +3584,7 @@ do_generate_keypair (struct para_data_s *para,
outctrl->pub.stream = iobuf_create( outctrl->pub.fname );
if (!outctrl->pub.stream)
{
- log_error(_("can't create `%s': %s\n"), outctrl->pub.newfname,
+ log_error(_("can't create '%s': %s\n"), outctrl->pub.newfname,
strerror(errno) );
return;
}
@@ -3596,7 +3596,7 @@ do_generate_keypair (struct para_data_s *para,
}
assert( outctrl->pub.stream );
if (opt.verbose)
- log_info (_("writing public key to `%s'\n"), outctrl->pub.fname );
+ log_info (_("writing public key to '%s'\n"), outctrl->pub.fname );
}
@@ -3732,7 +3732,7 @@ do_generate_keypair (struct para_data_s *para,
if (!err && opt.verbose)
{
- log_info (_("writing public key to `%s'\n"),
+ log_info (_("writing public key to '%s'\n"),
keydb_get_resource_name (pub_hd));
}
@@ -3740,7 +3740,7 @@ do_generate_keypair (struct para_data_s *para,
{
err = keydb_insert_keyblock (pub_hd, pub_root);
if (err)
- log_error (_("error writing public keyring `%s': %s\n"),
+ log_error (_("error writing public keyring '%s': %s\n"),
keydb_get_resource_name (pub_hd), g10_errstr(err));
}
@@ -4200,7 +4200,7 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
if (!fp)
{
rc = gpg_error_from_syserror ();
- log_error (_("can't create backup file `%s': %s\n"),
+ log_error (_("can't create backup file '%s': %s\n"),
fname, strerror(errno) );
xfree (fname);
free_secret_key (sk_unprotected);
@@ -4226,7 +4226,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);
diff --git a/g10/keyring.c b/g10/keyring.c
index 4eb26aab6..ae02f9d78 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -308,7 +308,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes)
if (!kr->lockhd) {
kr->lockhd = dotlock_create (kr->fname, 0);
if (!kr->lockhd) {
- log_info ("can't allocate lock for `%s'\n", kr->fname );
+ log_info ("can't allocate lock for '%s'\n", kr->fname );
rc = G10ERR_GENERAL;
}
}
@@ -323,7 +323,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes)
if (kr->is_locked)
;
else if (dotlock_take (kr->lockhd, -1) ) {
- log_info ("can't lock `%s'\n", kr->fname );
+ log_info ("can't lock '%s'\n", kr->fname );
rc = G10ERR_GENERAL;
}
else
@@ -338,7 +338,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes)
if (!kr->is_locked)
;
else if (dotlock_release (kr->lockhd))
- log_info ("can't unlock `%s'\n", kr->fname );
+ log_info ("can't unlock '%s'\n", kr->fname );
else
kr->is_locked = 0;
}
@@ -376,12 +376,12 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
a = iobuf_open (hd->found.kr->fname);
if (!a)
{
- log_error(_("can't open `%s'\n"), hd->found.kr->fname);
+ log_error(_("can't open '%s'\n"), hd->found.kr->fname);
return G10ERR_KEYRING_OPEN;
}
if (iobuf_seek (a, hd->found.offset) ) {
- log_error ("can't seek `%s'\n", hd->found.kr->fname);
+ log_error ("can't seek '%s'\n", hd->found.kr->fname);
iobuf_close(a);
return G10ERR_KEYRING_OPEN;
}
@@ -687,7 +687,7 @@ prepare_search (KEYRING_HANDLE hd)
if (!hd->current.iobuf)
{
hd->current.error = gpg_error_from_syserror ();
- log_error(_("can't open `%s'\n"), hd->current.kr->fname );
+ log_error(_("can't open '%s'\n"), hd->current.kr->fname );
return hd->current.error;
}
@@ -1210,7 +1210,7 @@ create_tmp_file (const char *template,
if (!*r_fp)
{
int rc = gpg_error_from_syserror ();
- log_error(_("can't create `%s': %s\n"), tmpfname, strerror(errno) );
+ log_error(_("can't create '%s': %s\n"), tmpfname, strerror(errno) );
xfree (tmpfname);
xfree (bakfname);
return rc;
@@ -1243,7 +1243,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname, const char *fname)
if (rename (fname, bakfname) )
{
rc = gpg_error_from_syserror ();
- log_error ("renaming `%s' to `%s' failed: %s\n",
+ log_error ("renaming '%s' to '%s' failed: %s\n",
fname, bakfname, strerror(errno) );
return rc;
}
@@ -1255,7 +1255,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname, const char *fname)
if (rename (tmpfname, fname) )
{
rc = gpg_error_from_syserror ();
- log_error (_("renaming `%s' to `%s' failed: %s\n"),
+ log_error (_("renaming '%s' to '%s' failed: %s\n"),
tmpfname, fname, strerror(errno) );
register_secured_file (fname);
goto fail;
@@ -1272,7 +1272,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname, const char *fname)
if (!stat (bakfname, &statbuf) && !chmod (fname, statbuf.st_mode))
;
else
- log_error ("WARNING: unable to restore permissions to `%s': %s",
+ log_error ("WARNING: unable to restore permissions to '%s': %s",
fname, strerror(errno));
}
#endif
@@ -1363,7 +1363,7 @@ keyring_rebuild_cache (void *token,int noisy)
if (iobuf_close (tmpfp))
{
rc = gpg_error_from_syserror ();
- log_error ("error closing `%s': %s\n",
+ log_error ("error closing '%s': %s\n",
tmpfilename, strerror (errno));
goto leave;
}
@@ -1379,7 +1379,7 @@ keyring_rebuild_cache (void *token,int noisy)
goto leave;
lastresname = resname;
if (noisy && !opt.quiet)
- log_info (_("caching keyring `%s'\n"), resname);
+ log_info (_("caching keyring '%s'\n"), resname);
rc = create_tmp_file (resname, &bakfilename, &tmpfilename, &tmpfp);
if (rc)
goto leave;
@@ -1401,7 +1401,7 @@ keyring_rebuild_cache (void *token,int noisy)
keyblock->pkt->pkttype, noisy? " - deleted":"");
if (noisy)
continue;
- log_info ("Hint: backup your keys and try running `%s'\n",
+ log_info ("Hint: backup your keys and try running '%s'\n",
"gpg --rebuild-keydb-caches");
rc = gpg_error (GPG_ERR_INV_KEYRING);
goto leave;
@@ -1456,7 +1456,7 @@ keyring_rebuild_cache (void *token,int noisy)
if (iobuf_close (tmpfp))
{
rc = gpg_error_from_syserror ();
- log_error ("error closing `%s': %s\n",
+ log_error ("error closing '%s': %s\n",
tmpfilename, strerror (errno));
goto leave;
}
@@ -1518,7 +1518,7 @@ do_copy (int mode, const char *fname, KBNODE root,
if( !newfp )
{
rc = gpg_error_from_syserror ();
- log_error (_("can't create `%s': %s\n"), fname, strerror(errno));
+ log_error (_("can't create '%s': %s\n"), fname, strerror(errno));
return rc;
}
if( !opt.quiet )
@@ -1544,7 +1544,7 @@ do_copy (int mode, const char *fname, KBNODE root,
if( !fp )
{
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
+ log_error(_("can't open '%s': %s\n"), fname, strerror(errno) );
goto leave;
}
@@ -1559,7 +1559,7 @@ do_copy (int mode, const char *fname, KBNODE root,
/* copy everything to the new file */
rc = copy_all_packets (fp, newfp);
if( rc != -1 ) {
- log_error("%s: copy to `%s' failed: %s\n",
+ log_error("%s: copy to '%s' failed: %s\n",
fname, tmpfname, g10_errstr(rc) );
iobuf_close(fp);
iobuf_cancel(newfp);
@@ -1572,7 +1572,7 @@ do_copy (int mode, const char *fname, KBNODE root,
/* copy first part to the new file */
rc = copy_some_packets( fp, newfp, start_offset );
if( rc ) { /* should never get EOF here */
- log_error ("%s: copy to `%s' failed: %s\n",
+ log_error ("%s: copy to '%s' failed: %s\n",
fname, tmpfname, g10_errstr(rc) );
iobuf_close(fp);
iobuf_cancel(newfp);
@@ -1603,7 +1603,7 @@ do_copy (int mode, const char *fname, KBNODE root,
/* copy the rest */
rc = copy_all_packets( fp, newfp );
if( rc != -1 ) {
- log_error("%s: copy to `%s' failed: %s\n",
+ log_error("%s: copy to '%s' failed: %s\n",
fname, tmpfname, g10_errstr(rc) );
iobuf_close(fp);
iobuf_cancel(newfp);
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 102f65d38..75234be26 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -173,7 +173,7 @@ parse_keyserver_options(char *options)
#ifdef EXEC_TEMPFILE_ONLY
if(ascii_strncasecmp(tok,"use-temp-files",14)==0 ||
ascii_strncasecmp(tok,"no-use-temp-files",17)==0)
- log_info(_("WARNING: keyserver option `%s' is not used"
+ log_info(_("WARNING: keyserver option '%s' is not used"
" on this platform\n"),tok);
#else
if(ascii_strncasecmp(tok,"use-temp-files",14)==0)
@@ -1417,13 +1417,13 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
/* switch(ret) */
/* { */
/* case KEYSERVER_SCHEME_NOT_FOUND: */
- /* log_error(_("no handler for keyserver scheme `%s'\n"), */
+ /* log_error(_("no handler for keyserver scheme '%s'\n"), */
/* opt.keyserver->scheme); */
/* break; */
/* case KEYSERVER_NOT_SUPPORTED: */
- /* log_error(_("action `%s' not supported with keyserver " */
- /* "scheme `%s'\n"), "search", opt.keyserver->scheme); */
+ /* log_error(_("action '%s' not supported with keyserver " */
+ /* "scheme '%s'\n"), "search", opt.keyserver->scheme); */
/* break; */
/* case KEYSERVER_TIMEOUT: */
@@ -1655,7 +1655,7 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist)
for (sl=urilist; sl; sl=sl->next)
{
if (!opt.quiet)
- log_info (_("requesting key from `%s'\n"), sl->d);
+ log_info (_("requesting key from '%s'\n"), sl->d);
err = gpg_dirmngr_ks_fetch (ctrl, sl->d, &datastream);
if (!err)
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 33855e1e7..d0d76ab9a 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -580,7 +580,7 @@ proc_encrypted( CTX c, PACKET *pkt )
sprintf ( buf, "%d:", c->dek->algo );
for(i=0; i < c->dek->keylen; i++ )
sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
- log_info( "session key: `%s'\n", buf );
+ log_info( "session key: '%s'\n", buf );
write_status_text ( STATUS_SESSION_KEY, buf );
}
}
diff --git a/g10/misc.c b/g10/misc.c
index 3bf550c0b..9f6ff1e6b 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -107,9 +107,9 @@ register_secured_file (const char *fname)
/* Note that we stop immediatley if something goes wrong here. */
if (stat (fname, &buf))
- log_fatal (_("fstat of `%s' failed in %s: %s\n"), fname,
+ log_fatal (_("fstat of '%s' failed in %s: %s\n"), fname,
"register_secured_file", strerror (errno));
-/* log_debug ("registering `%s' i=%lu.%lu\n", fname, */
+/* log_debug ("registering '%s' i=%lu.%lu\n", fname, */
/* (unsigned long)buf.st_dev, (unsigned long)buf.st_ino); */
for (sf=secured_files; sf; sf = sf->next)
{
@@ -137,11 +137,11 @@ unregister_secured_file (const char *fname)
if (stat (fname, &buf))
{
- log_error (_("fstat of `%s' failed in %s: %s\n"), fname,
+ log_error (_("fstat of '%s' failed in %s: %s\n"), fname,
"unregister_secured_file", strerror (errno));
return;
}
-/* log_debug ("unregistering `%s' i=%lu.%lu\n", fname, */
+/* log_debug ("unregistering '%s' i=%lu.%lu\n", fname, */
/* (unsigned long)buf.st_dev, (unsigned long)buf.st_ino); */
for (sfprev=NULL,sf=secured_files; sf; sfprev=sf, sf = sf->next)
{
@@ -213,7 +213,7 @@ is_secured_filename (const char *fname)
{
if (errno == ENOENT || errno == EPERM || errno == EACCES)
return 0;
- log_error (_("fstat of `%s' failed in %s: %s\n"), fname,
+ log_error (_("fstat of '%s' failed in %s: %s\n"), fname,
"is_secured_filename", strerror (errno));
return 1;
}
@@ -1215,7 +1215,7 @@ parse_options(char *str,unsigned int *options,
if(ascii_strncasecmp(opts[j].name,tok,toklen)==0)
{
if(noisy)
- log_info(_("ambiguous option `%s'\n"),otok);
+ log_info(_("ambiguous option '%s'\n"),otok);
return 0;
}
}
@@ -1240,7 +1240,7 @@ parse_options(char *str,unsigned int *options,
if(!opts[i].name)
{
if(noisy)
- log_info(_("unknown option `%s'\n"),otok);
+ log_info(_("unknown option '%s'\n"),otok);
return 0;
}
}
diff --git a/g10/openfile.c b/g10/openfile.c
index 114e0add9..704dcff5b 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -82,7 +82,7 @@ overwrite_filep( const char *fname )
if (opt.answer_no || opt.batch)
return 0; /* Do not overwrite. */
- tty_printf (_("File `%s' exists. "), fname);
+ tty_printf (_("File '%s' exists. "), fname);
if (cpr_enabled ())
tty_printf ("\n");
if (cpr_get_answer_is_yes ("openfile.overwrite.okay",
@@ -194,12 +194,12 @@ open_outfile (int inp_fd, const char *iname, int mode, iobuf_t *a)
{
rc = gpg_error_from_syserror ();
snprintf (xname, sizeof xname, "[fd %d]", inp_fd);
- log_error (_("can't open `%s': %s\n"), xname, gpg_strerror (rc));
+ log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (rc));
}
else if (opt.verbose)
{
snprintf (xname, sizeof xname, "[fd %d]", inp_fd);
- log_info (_("writing to `%s'\n"), xname);
+ log_info (_("writing to '%s'\n"), xname);
}
}
else if (iobuf_is_pipe_filename (iname) && !opt.outfile)
@@ -208,7 +208,7 @@ open_outfile (int inp_fd, const char *iname, int mode, iobuf_t *a)
if ( !*a )
{
rc = gpg_error_from_syserror ();
- log_error (_("can't open `%s': %s\n"), "[stdout]", strerror(errno) );
+ log_error (_("can't open '%s': %s\n"), "[stdout]", strerror(errno) );
}
else if ( opt.verbose )
log_info (_("writing to stdout\n"));
@@ -287,10 +287,10 @@ open_outfile (int inp_fd, const char *iname, int mode, iobuf_t *a)
if (!*a)
{
rc = gpg_error_from_syserror ();
- log_error(_("can't create `%s': %s\n"), name, strerror(errno) );
+ log_error(_("can't create '%s': %s\n"), name, strerror(errno) );
}
else if( opt.verbose )
- log_info (_("writing to `%s'\n"), name );
+ log_info (_("writing to '%s'\n"), name );
}
xfree(buf);
}
@@ -328,7 +328,7 @@ open_sigfile( const char *iname, progress_filter_context_t *pfx )
gpg_err_set_errno (EPERM);
}
if( a && opt.verbose )
- log_info(_("assuming signed data in `%s'\n"), buf );
+ log_info(_("assuming signed data in '%s'\n"), buf );
if (a && pfx)
handle_progress (pfx, a, buf);
xfree(buf);
@@ -365,7 +365,7 @@ copy_options_file( const char *destdir )
gpg_err_set_errno (EPERM);
}
if( !src ) {
- log_info (_("can't open `%s': %s\n"), fname, strerror(errno) );
+ log_info (_("can't open '%s': %s\n"), fname, strerror(errno) );
xfree(fname);
return;
}
@@ -380,7 +380,7 @@ copy_options_file( const char *destdir )
dst = fopen( fname, "w" );
umask(oldmask);
if( !dst ) {
- log_info (_("can't create `%s': %s\n"), fname, strerror(errno) );
+ log_info (_("can't create '%s': %s\n"), fname, strerror(errno) );
fclose( src );
xfree(fname);
return;
@@ -407,9 +407,9 @@ copy_options_file( const char *destdir )
}
fclose( dst );
fclose( src );
- log_info(_("new configuration file `%s' created\n"), fname );
+ log_info(_("new configuration file '%s' created\n"), fname );
if (any_option)
- log_info (_("WARNING: options in `%s'"
+ log_info (_("WARNING: options in '%s'"
" are not yet active during this run\n"),
fname);
xfree(fname);
@@ -441,10 +441,10 @@ try_make_homedir (const char *fname)
)
{
if (gnupg_mkdir (fname, "-rwx"))
- log_fatal ( _("can't create directory `%s': %s\n"),
+ log_fatal ( _("can't create directory '%s': %s\n"),
fname, strerror(errno) );
else if (!opt.quiet )
- log_info ( _("directory `%s' created\n"), fname );
+ log_info ( _("directory '%s' created\n"), fname );
copy_options_file( fname );
}
}
diff --git a/g10/photoid.c b/g10/photoid.c
index c3d2745a8..3728cd076 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -114,7 +114,7 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
}
if(!file)
{
- log_error(_("unable to open JPEG file `%s': %s\n"),
+ log_error(_("unable to open JPEG file '%s': %s\n"),
filename,strerror(errno));
xfree(filename);
filename=NULL;
@@ -143,7 +143,7 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
/* Is it a JPEG? */
if(photo[0]!=0xFF || photo[1]!=0xD8)
{
- log_error(_("`%s' is not a JPEG file\n"),filename);
+ log_error(_("'%s' is not a JPEG file\n"),filename);
xfree(photo);
photo=NULL;
xfree(filename);
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 295ee0628..c43c74c0b 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -414,7 +414,7 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel )
if( opt.trust_model==TM_ALWAYS )
{
if( opt.verbose )
- log_info("No trust check due to `--trust-model always' option\n");
+ log_info("No trust check due to '--trust-model always' option\n");
return 1;
}
@@ -572,14 +572,14 @@ check_signatures_trust( PKT_signature *sig )
{
okay = 1;
write_status_text (STATUS_PKA_TRUST_GOOD, sig->pka_info->email);
- log_info (_("Note: Verified signer's address is `%s'\n"),
+ log_info (_("Note: Verified signer's address is '%s'\n"),
sig->pka_info->email);
}
else
{
okay = 0;
write_status_text (STATUS_PKA_TRUST_BAD, sig->pka_info->email);
- log_info (_("Note: Signer's address `%s' "
+ log_info (_("Note: Signer's address '%s' "
"does not match DNS entry\n"), sig->pka_info->email);
}
diff --git a/g10/plaintext.c b/g10/plaintext.c
index e4e0ea10d..54541986a 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -157,7 +157,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
if (opt.outfp && is_secured_file (es_fileno (opt.outfp)))
{
err = gpg_error (GPG_ERR_EPERM);
- log_error (_("error creating `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err));
goto leave;
}
else if (fp || nooutput)
@@ -166,13 +166,13 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
{
gpg_err_set_errno (EPERM);
err = gpg_error_from_syserror ();
- log_error (_("error creating `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err));
goto leave;
}
else if (!(fp = es_fopen (fname, "wb")))
{
err = gpg_error_from_syserror ();
- log_error (_("error creating `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err));
goto leave;
}
#else /* __riscos__ */
@@ -195,7 +195,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
fp = fopen (fname, "wb");
if (!fp)
{
- log_error (_("error creating `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err));
err = G10ERR_CREATE_FILE;
if (errno == 106)
log_info ("Do output file and input file have the same name?\n");
@@ -245,7 +245,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
{
if (opt.max_output && (++count) > opt.max_output)
{
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, "exceeded --max-output limit\n");
err = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
@@ -256,7 +256,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
err = gpg_error_from_syserror ();
else
err = gpg_error (GPG_ERR_EOF);
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, gpg_strerror (err));
goto leave;
}
@@ -284,7 +284,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
{
if (opt.max_output && (count += len) > opt.max_output)
{
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, "exceeded --max-output limit\n");
err = gpg_error (GPG_ERR_TOO_LARGE);
xfree (buffer);
@@ -293,7 +293,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
else if (es_fwrite (buffer, 1, len, fp) != len)
{
err = gpg_error_from_syserror ();
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, gpg_strerror (err));
xfree (buffer);
goto leave;
@@ -320,7 +320,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
{
if (opt.max_output && (++count) > opt.max_output)
{
- log_error ("Error writing to `%s': %s\n",
+ log_error ("Error writing to '%s': %s\n",
fname, "exceeded --max-output limit\n");
err = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
@@ -331,7 +331,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
err = gpg_error_from_syserror ();
else
err = gpg_error (GPG_ERR_EOF);
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, gpg_strerror (err));
goto leave;
}
@@ -369,7 +369,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
{
if (opt.max_output && (count += len) > opt.max_output)
{
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, "exceeded --max-output limit\n");
err = gpg_error (GPG_ERR_TOO_LARGE);
xfree (buffer);
@@ -378,7 +378,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
else if (es_fwrite (buffer, 1, len, fp) != len)
{
err = gpg_error_from_syserror ();
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, gpg_strerror (err));
xfree (buffer);
goto leave;
@@ -399,7 +399,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
{
if (opt.max_output && (++count) > opt.max_output)
{
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, "exceeded --max-output limit\n");
err = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
@@ -407,7 +407,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
else if (es_putc (c, fp) == EOF)
{
err = gpg_error_from_syserror ();
- log_error ("error writing to `%s': %s\n",
+ log_error ("error writing to '%s': %s\n",
fname, gpg_strerror (err));
goto leave;
}
@@ -452,7 +452,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
if (fp && fp != es_stdout && fp != opt.outfp && es_fclose (fp))
{
err = gpg_error_from_syserror ();
- log_error ("error closing `%s': %s\n", fname, gpg_strerror (err));
+ log_error ("error closing '%s': %s\n", fname, gpg_strerror (err));
fp = NULL;
goto leave;
}
@@ -469,7 +469,7 @@ handle_plaintext (PKT_plaintext * pt, md_filter_context_t * mfx,
values is a good idea in any case. */
if (!err)
err = gpg_error_from_syserror ();
- log_error ("error flushing `%s': %s\n", "[stdout]",
+ log_error ("error flushing '%s': %s\n", "[stdout]",
gpg_strerror (err));
}
@@ -581,7 +581,7 @@ ask_for_detached_datafile (gcry_md_hd_t md, gcry_md_hd_t md2,
else if (!fp)
{
rc = gpg_error_from_syserror ();
- log_error (_("can't open `%s': %s\n"), answer,
+ log_error (_("can't open '%s': %s\n"), answer,
strerror (errno));
goto leave;
}
@@ -650,7 +650,7 @@ hash_datafiles (gcry_md_hd_t md, gcry_md_hd_t md2, strlist_t files,
if (!fp)
{
int rc = gpg_error_from_syserror ();
- log_error (_("can't open signed data `%s'\n"),
+ log_error (_("can't open signed data '%s'\n"),
print_fname_stdin (sl->d));
release_progress_context (pfx);
return rc;
diff --git a/g10/sign.c b/g10/sign.c
index b2c8f0e56..6238ce877 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -614,7 +614,7 @@ write_plaintext_packet (IOBUF out, IOBUF inp, const char *fname, int ptmode)
if( !(tmpsize = iobuf_get_filelength(inp, &overflow))
&& !overflow && opt.verbose)
- log_info (_("WARNING: `%s' is an empty file\n"), fname);
+ log_info (_("WARNING: '%s' is an empty file\n"), fname);
/* We can't encode the length of very large files because
OpenPGP uses only 32 bit for file sizes. So if the size of
@@ -839,7 +839,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
if( !inp )
{
rc = gpg_error_from_syserror ();
- log_error (_("can't open `%s': %s\n"), fname? fname: "[stdin]",
+ log_error (_("can't open '%s': %s\n"), fname? fname: "[stdin]",
strerror(errno) );
goto leave;
}
@@ -857,11 +857,11 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
if( !out )
{
rc = gpg_error_from_syserror ();
- log_error(_("can't create `%s': %s\n"), outfile, strerror(errno) );
+ log_error(_("can't create '%s': %s\n"), outfile, strerror(errno) );
goto leave;
}
else if( opt.verbose )
- log_info(_("writing to `%s'\n"), outfile );
+ log_info(_("writing to '%s'\n"), outfile );
}
else if( (rc = open_outfile (GNUPG_INVALID_FD, fname,
opt.armor? 1: detached? 2:0, &out )))
@@ -1039,13 +1039,13 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
if( !inp )
{
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"),
+ log_error(_("can't open '%s': %s\n"),
sl->d,strerror(errno));
goto leave;
}
handle_progress (pfx, inp, sl->d);
if( opt.verbose )
- fprintf(stderr, " `%s'", sl->d );
+ fprintf(stderr, " '%s'", sl->d );
if(opt.textmode)
{
memset( &tfx, 0, sizeof tfx);
@@ -1157,7 +1157,7 @@ clearsign_file( const char *fname, strlist_t locusr, const char *outfile )
}
if( !inp ) {
rc = gpg_error_from_syserror ();
- log_error (_("can't open `%s': %s\n"),
+ log_error (_("can't open '%s': %s\n"),
fname? fname: "[stdin]", strerror(errno) );
goto leave;
}
@@ -1173,11 +1173,11 @@ clearsign_file( const char *fname, strlist_t locusr, const char *outfile )
if( !out )
{
rc = gpg_error_from_syserror ();
- log_error(_("can't create `%s': %s\n"), outfile, strerror(errno) );
+ log_error(_("can't create '%s': %s\n"), outfile, strerror(errno) );
goto leave;
}
else if( opt.verbose )
- log_info(_("writing to `%s'\n"), outfile );
+ log_info(_("writing to '%s'\n"), outfile );
}
else if( (rc = open_outfile (GNUPG_INVALID_FD, fname, 1, &out )) )
goto leave;
@@ -1315,7 +1315,7 @@ sign_symencrypt_file (const char *fname, strlist_t locusr)
}
if( !inp ) {
rc = gpg_error_from_syserror ();
- log_error (_("can't open `%s': %s\n"),
+ log_error (_("can't open '%s': %s\n"),
fname? fname: "[stdin]", strerror(errno) );
goto leave;
}
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 25a916e5b..92d70a734 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -139,7 +139,7 @@ import_ownertrust( const char *fname )
is_stdin = 1;
}
else if( !(fp = fopen( fname, "r" )) ) {
- log_error ( _("can't open `%s': %s\n"), fname, strerror(errno) );
+ log_error ( _("can't open '%s': %s\n"), fname, strerror(errno) );
return;
}
@@ -147,7 +147,7 @@ import_ownertrust( const char *fname )
{
fclose (fp);
gpg_err_set_errno (EPERM);
- log_error (_("can't open `%s': %s\n"), fname, strerror(errno) );
+ log_error (_("can't open '%s': %s\n"), fname, strerror(errno) );
return;
}
@@ -158,7 +158,7 @@ import_ownertrust( const char *fname )
continue;
n = strlen(line);
if( line[n-1] != '\n' ) {
- log_error (_("error in `%s': %s\n"), fname, _("line too long") );
+ log_error (_("error in '%s': %s\n"), fname, _("line too long") );
/* ... or last line does not have a LF */
break; /* can't continue */
}
@@ -166,17 +166,17 @@ import_ownertrust( const char *fname )
if( !hexdigitp(p) )
break;
if( *p != ':' ) {
- log_error (_("error in `%s': %s\n"), fname, _("colon missing") );
+ log_error (_("error in '%s': %s\n"), fname, _("colon missing") );
continue;
}
fprlen = p - line;
if( fprlen != 32 && fprlen != 40 ) {
- log_error (_("error in `%s': %s\n"),
+ log_error (_("error in '%s': %s\n"),
fname, _("invalid fingerprint") );
continue;
}
if( sscanf(p, ":%u:", &otrust ) != 1 ) {
- log_error (_("error in `%s': %s\n"),
+ log_error (_("error in '%s': %s\n"),
fname, _("ownertrust value missing"));
continue;
}
@@ -213,11 +213,11 @@ import_ownertrust( const char *fname )
any = 1;
}
else /* error */
- log_error (_("error finding trust record in `%s': %s\n"),
+ log_error (_("error finding trust record in '%s': %s\n"),
fname, g10_errstr(rc));
}
if( ferror(fp) )
- log_error ( _("read error in `%s': %s\n"), fname, strerror(errno) );
+ log_error ( _("read error in '%s': %s\n"), fname, strerror(errno) );
if( !is_stdin )
fclose(fp);
diff --git a/g10/tdbio.c b/g10/tdbio.c
index ef05cf2a8..43e04b755 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -511,7 +511,7 @@ tdbio_set_dbname( const char *new_dbname, int create )
gpg_err_set_errno (EIO);
#endif /*HAVE_W32CE_SYSTEM*/
if( errno != ENOENT ) {
- log_error( _("can't access `%s': %s\n"), fname, strerror(errno) );
+ log_error( _("can't access '%s': %s\n"), fname, strerror(errno) );
xfree(fname);
return G10ERR_TRUSTDB;
}
@@ -548,9 +548,9 @@ tdbio_set_dbname( const char *new_dbname, int create )
if( !lockhandle )
lockhandle = dotlock_create (db_name, 0);
if( !lockhandle )
- log_fatal( _("can't create lock for `%s'\n"), db_name );
+ log_fatal( _("can't create lock for '%s'\n"), db_name );
if( dotlock_make (lockhandle, -1) )
- log_fatal( _("can't lock `%s'\n"), db_name );
+ log_fatal( _("can't lock '%s'\n"), db_name );
#endif /* __riscos__ */
oldmask=umask(077);
if (is_secured_filename (fname)) {
@@ -561,17 +561,17 @@ tdbio_set_dbname( const char *new_dbname, int create )
fp =fopen( fname, "wb" );
umask(oldmask);
if( !fp )
- log_fatal( _("can't create `%s': %s\n"), fname, strerror(errno) );
+ log_fatal( _("can't create '%s': %s\n"), fname, strerror(errno) );
fclose(fp);
db_fd = open( db_name, O_RDWR | MY_O_BINARY );
if( db_fd == -1 )
- log_fatal( _("can't open `%s': %s\n"), db_name, strerror(errno) );
+ log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) );
#ifndef __riscos__
if( !lockhandle )
lockhandle = dotlock_create (db_name, 0);
if( !lockhandle )
- log_fatal( _("can't create lock for `%s'\n"), db_name );
+ log_fatal( _("can't create lock for '%s'\n"), db_name );
#endif /* !__riscos__ */
rc = create_version_record ();
@@ -612,10 +612,10 @@ open_db()
if (!lockhandle )
lockhandle = dotlock_create (db_name, 0);
if (!lockhandle )
- log_fatal( _("can't create lock for `%s'\n"), db_name );
+ log_fatal( _("can't create lock for '%s'\n"), db_name );
#ifdef __riscos__
if (dotlock_take (lockhandle, -1) )
- log_fatal( _("can't lock `%s'\n"), db_name );
+ log_fatal( _("can't lock '%s'\n"), db_name );
#endif /* __riscos__ */
#ifdef HAVE_W32CE_SYSTEM
{
@@ -629,7 +629,7 @@ open_db()
xfree (wname);
}
if (db_fd == -1)
- log_fatal ("can't open `%s': %d, %d\n", db_name,
+ log_fatal ("can't open '%s': %d, %d\n", db_name,
(int)prevrc, (int)GetLastError ());
}
#else /*!HAVE_W32CE_SYSTEM*/
@@ -646,7 +646,7 @@ open_db()
log_info (_("NOTE: trustdb not writable\n"));
}
if ( db_fd == -1 )
- log_fatal( _("can't open `%s': %s\n"), db_name, strerror(errno) );
+ log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) );
#endif /*!HAVE_W32CE_SYSTEM*/
register_secured_file (db_name);
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 63b03c4f7..0f13dc159 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -220,7 +220,7 @@ register_trusted_key( const char *string )
err = classify_user_id (string, &desc, 1);
if (err || desc.mode != KEYDB_SEARCH_MODE_LONG_KID )
{
- log_error(_("`%s' is not a valid long keyID\n"), string );
+ log_error(_("'%s' is not a valid long keyID\n"), string );
return;
}
@@ -606,7 +606,7 @@ check_trustdb ()
validate_keys (0);
}
else
- log_info (_("no need for a trustdb check with `%s' trust model\n"),
+ log_info (_("no need for a trustdb check with '%s' trust model\n"),
trust_model_string());
}
@@ -621,7 +621,7 @@ update_trustdb()
if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)
validate_keys (1);
else
- log_info (_("no need for a trustdb update with `%s' trust model\n"),
+ log_info (_("no need for a trustdb update with '%s' trust model\n"),
trust_model_string());
}
@@ -1885,7 +1885,7 @@ check_regexp(const char *expr,const char *string)
#endif
if(DBG_TRUST)
- log_debug("regexp `%s' (`%s') on `%s': %s\n",
+ log_debug("regexp '%s' ('%s') on '%s': %s\n",
regexp,expr,string,ret==0?"YES":"NO");
xfree(regexp);
@@ -2374,7 +2374,7 @@ validate_keys (int interactive)
{
if(DBG_TRUST)
log_debug("key %08lX%08lX:"
- " overriding ownertrust `%s' with `%s'\n",
+ " overriding ownertrust '%s' with '%s'\n",
(ulong)k->kid[0],(ulong)k->kid[1],
trust_value_to_string(k->ownertrust),
trust_value_to_string(min));
diff --git a/g10/verify.c b/g10/verify.c
index ed6ab4a43..2d5aab418 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -95,7 +95,7 @@ verify_signatures (ctrl_t ctrl, int nfiles, char **files )
}
if( !fp ) {
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"),
+ log_error(_("can't open '%s': %s\n"),
print_fname_stdin(sigfile), gpg_strerror (rc));
goto leave;
}
@@ -158,7 +158,7 @@ verify_one_file (ctrl_t ctrl, const char *name )
}
if( !fp ) {
rc = gpg_error_from_syserror ();
- log_error(_("can't open `%s': %s\n"),
+ log_error(_("can't open '%s': %s\n"),
print_fname_stdin(name), strerror (errno));
print_file_status( STATUS_FILE_ERROR, name, 1 );
goto leave;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 11:26:29 +0100