diff options
author | Werner Koch <[email protected]> | 2012-06-05 17:29:22 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2012-06-05 17:29:22 +0000 |
commit | 096e7457ec636bcfcf128678660eb2f2e19f113a (patch) | |
tree | b54df55112f195895d6d952ce3cfb3f4c98e7683 /dirmngr/dirmngr.c | |
parent | Print the hash algorithm in colon mode key listing. (diff) | |
download | gnupg-096e7457ec636bcfcf128678660eb2f2e19f113a.tar.gz gnupg-096e7457ec636bcfcf128678660eb2f2e19f113a.zip |
Change all quotes in strings and comments to the new GNU standard.
The asymmetric quotes used by GNU in the past (`...') don't render
nicely on modern systems. We now use two \x27 characters ('...').
The proper solution would be to use the correct Unicode symmetric
quotes here. However this has the disadvantage that the system
requires Unicode support. We don't want that today. If Unicode is
available a generated po file can be used to output proper quotes. A
simple sed script like the one used for en@quote is sufficient to
change them.
The changes have been done by applying
sed -i "s/\`\([^'\`]*\)'/'\1'/g"
to most files and fixing obvious problems by hand. The msgid strings in
the po files were fixed with a similar command.
Diffstat (limited to '')
-rw-r--r-- | dirmngr/dirmngr.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 9425cd16e..58bf948a7 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -363,7 +363,7 @@ set_debug (void) } else { - log_error (_("invalid debug-level `%s' given\n"), debug_level); + log_error (_("invalid debug-level '%s' given\n"), debug_level); log_info (_("valid debug levels are: %s\n"), "none, basic, advanced, expert, guru"); opt.debug = 0; /* Reset debugging, so that prior debug @@ -736,12 +736,12 @@ main (int argc, char **argv) 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) ); exit(2); } @@ -749,7 +749,7 @@ main (int argc, char **argv) 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; } @@ -854,7 +854,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]); } if (!access ("/etc/dirmngr", F_OK) && !strncmp (opt.homedir, "/etc/", 5)) @@ -862,7 +862,7 @@ main (int argc, char **argv) ("NOTE: DirMngr is now a proper part of GnuPG. The configuration and" " other directory names changed. Please check that no other version" " of dirmngr is still installed. To disable this warning, remove the" - " directory `/etc/dirmngr'.\n"); + " directory '/etc/dirmngr'.\n"); if (gnupg_faked_time_p ()) { @@ -993,7 +993,7 @@ main (int argc, char **argv) log_error (_("error getting nonce for the socket\n")); if (rc == -1) { - log_error (_("error binding socket to `%s': %s\n"), + log_error (_("error binding socket to '%s': %s\n"), serv_addr.sun_path, gpg_strerror (gpg_error_from_errno (errno))); assuan_sock_close (fd); dirmngr_exit (1); @@ -1008,7 +1008,7 @@ main (int argc, char **argv) } if (opt.verbose) - log_info (_("listening on socket `%s'\n"), socket_name ); + log_info (_("listening on socket '%s'\n"), socket_name ); es_fflush (NULL); @@ -1159,13 +1159,13 @@ main (int argc, char **argv) crl_cache_init (); rc = crl_fetch (&ctrlbuf, argv[0], &reader); if (rc) - log_error (_("fetching CRL from `%s' failed: %s\n"), + log_error (_("fetching CRL from '%s' failed: %s\n"), argv[0], gpg_strerror (rc)); else { rc = crl_cache_insert (&ctrlbuf, argv[0], reader); if (rc) - log_error (_("processing CRL from `%s' failed: %s\n"), + log_error (_("processing CRL from '%s' failed: %s\n"), argv[0], gpg_strerror (rc)); crl_close_reader (reader); } @@ -1369,7 +1369,7 @@ parse_ldapserver_file (const char* filename) fp = es_fopen (filename, "r"); if (!fp) { - log_error (_("error opening `%s': %s\n"), filename, strerror (errno)); + log_error (_("error opening '%s': %s\n"), filename, strerror (errno)); return NULL; } @@ -1407,7 +1407,7 @@ parse_ldapserver_file (const char* filename) } if (es_ferror (fp)) - log_error (_("error reading `%s': %s\n"), filename, strerror (errno)); + log_error (_("error reading '%s': %s\n"), filename, strerror (errno)); es_fclose (fp); return serverstart; @@ -1461,7 +1461,7 @@ parse_ocsp_signer (const char *string) if (!fp) { err = gpg_error_from_syserror (); - log_error (_("can't open `%s': %s\n"), fname, gpg_strerror (err)); + log_error (_("can't open '%s': %s\n"), fname, gpg_strerror (err)); xfree (fname); return NULL; } @@ -1567,7 +1567,7 @@ reread_configuration (void) fp = fopen (opt.config_filename, "r"); if (!fp) { - log_error (_("option file `%s': %s\n"), + log_error (_("option file '%s': %s\n"), opt.config_filename, strerror(errno) ); return; } |