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.

11 files changed, 39 insertions, 41 deletions

diff --git a/scd/apdu.c b/scd/apdu.c
index 8467b034c..7641e91b2 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1729,7 +1729,7 @@ open_pcsc_reader_direct (const char *portstr)
       if (!*p && !p[1])
         break;
       if (*p)
-        log_info ("detected reader `%s'\n", p);
+        log_info ("detected reader '%s'\n", p);
       if (nreader < (strlen (p)+1))
         {
           log_error ("invalid response from pcsc_list_readers\n");
@@ -1792,7 +1792,7 @@ open_pcsc_reader_wrapped (const char *portstr)
 
   if (access (wrapperpgm, X_OK))
     {
-      log_error ("can't run PC/SC access module `%s': %s\n",
+      log_error ("can't run PC/SC access module '%s': %s\n",
                  wrapperpgm, strerror (errno));
       return -1;
     }
@@ -1856,7 +1856,7 @@ open_pcsc_reader_wrapped (const char *portstr)
       /* Send stderr to the bit bucket. */
       fd = open ("/dev/null", O_WRONLY);
       if (fd == -1)
-        log_fatal ("can't open `/dev/null': %s", strerror (errno));
+        log_fatal ("can't open '/dev/null': %s", strerror (errno));
       if (fd != 2 && dup2 (fd, 2) == -1)
         log_fatal ("dup2 stderr failed: %s\n", strerror (errno));
 
@@ -2900,7 +2900,7 @@ apdu_open_reader (const char *portstr, int *r_no_service)
       handle = dlopen (opt.pcsc_driver, RTLD_LAZY);
       if (!handle)
         {
-          log_error ("apdu_open_reader: failed to open driver `%s': %s\n",
+          log_error ("apdu_open_reader: failed to open driver '%s': %s\n",
                      opt.pcsc_driver, dlerror ());
           return -1;
         }
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index e3a448413..0dd20e2c3 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -502,17 +502,17 @@ dump_all_do (int slot)
       if (gpg_err_code (rc) == GPG_ERR_NO_OBJ)
         ;
       else if (rc)
-        log_info ("DO `%s' not available: %s\n",
+        log_info ("DO '%s' not available: %s\n",
                   data_objects[i].desc, gpg_strerror (rc));
       else
         {
           if (data_objects[i].binary)
             {
-              log_info ("DO `%s': ", data_objects[i].desc);
+              log_info ("DO '%s': ", data_objects[i].desc);
               log_printhex ("", buffer, buflen);
             }
           else
-            log_info ("DO `%s': `%.*s'\n",
+            log_info ("DO '%s': '%.*s'\n",
                       data_objects[i].desc,
                       (int)buflen, buffer); /* FIXME: sanitize */
 
@@ -535,14 +535,14 @@ dump_all_do (int slot)
                     {
                       if (data_objects[j].binary)
                         {
-                          log_info ("DO `%s': ", data_objects[j].desc);
+                          log_info ("DO '%s': ", data_objects[j].desc);
                           if (valuelen > 200)
                             log_info ("[%u]\n", (unsigned int)valuelen);
                           else
                             log_printhex ("", value, valuelen);
                         }
                       else
-                        log_info ("DO `%s': `%.*s'\n",
+                        log_info ("DO '%s': '%.*s'\n",
                                   data_objects[j].desc,
                                   (int)valuelen, value); /* FIXME: sanitize */
                     }
@@ -1847,7 +1847,7 @@ do_setattr (app_t app, const char *name,
     exmode = 0;
   rc = iso7816_put_data (app->slot, exmode, table[idx].tag, value, valuelen);
   if (rc)
-    log_error ("failed to set `%s': %s\n", table[idx].name, gpg_strerror (rc));
+    log_error ("failed to set '%s': %s\n", table[idx].name, gpg_strerror (rc));
 
   if (table[idx].special == 1)
     app->force_chv1 = (valuelen && *value == 0);
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 8e3081409..1e922e722 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -3258,7 +3258,7 @@ read_home_df (int slot, int *r_belpic)
         {
           pp = find_tlv (p, n, 0x50, &nn);
           if (pp) /* fixme: Filter log value? */
-            log_info ("pkcs#15 application label from EF(DIR) is `%.*s'\n",
+            log_info ("pkcs#15 application label from EF(DIR) is '%.*s'\n",
                       (int)nn, pp);
           pp = find_tlv (p, n, 0x51, &nn);
           if (pp && nn == 4 && *pp == 0x3f && !pp[1])
diff --git a/scd/app.c b/scd/app.c
index 79e3eac0f..dfb59913d 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -137,13 +137,13 @@ app_dump_state (void)
           {
             log_printf (" app=%p", lock_table[slot].app);
             if (lock_table[slot].app->apptype)
-              log_printf (" type=`%s'", lock_table[slot].app->apptype);
+              log_printf (" type='%s'", lock_table[slot].app->apptype);
           }
         if (lock_table[slot].last_app)
           {
             log_printf (" lastapp=%p", lock_table[slot].last_app);
             if (lock_table[slot].last_app->apptype)
-              log_printf (" type=`%s'", lock_table[slot].last_app->apptype);
+              log_printf (" type='%s'", lock_table[slot].last_app->apptype);
           }
         log_printf ("\n");
       }
@@ -246,7 +246,7 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
       {
         unlock_reader (slot);
         if (app->apptype)
-          log_info ("application `%s' in use by reader %d - can't switch\n",
+          log_info ("application '%s' in use by reader %d - can't switch\n",
                     app->apptype, slot);
         return gpg_error (GPG_ERR_CONFLICT);
       }
@@ -255,7 +255,7 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
   if (app && app->no_reuse)
     {
       unlock_reader (slot);
-      log_info ("lingering application `%s' in use by reader %d"
+      log_info ("lingering application '%s' in use by reader %d"
                 " - can't switch\n",
                 app->apptype? app->apptype:"?", slot);
       return gpg_error (GPG_ERR_CONFLICT);
@@ -394,7 +394,7 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
   if (err)
     {
       if (name)
-        log_info ("can't select application `%s': %s\n",
+        log_info ("can't select application '%s': %s\n",
                   name, gpg_strerror (err));
       else
         log_info ("no supported card application found: %s\n",
diff --git a/scd/card.c b/scd/card.c
index 1fb554421..a582c500f 100644
--- a/scd/card.c
+++ b/scd/card.c
@@ -142,7 +142,7 @@ card_open (CARD *rcard)
       goto leave;
     }
   if (opt.verbose)
-    log_info ("connected to card in reader %d using driver `%s'\n",
+    log_info ("connected to card in reader %d using driver '%s'\n",
               card->reader, card->scard->driver->name);
 
   rc = sc_lock (card->scard);
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 8b2ee8f24..3fe932ca6 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -40,7 +40,7 @@
  *    products derived from this software without specific prior
  *    written permission.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
@@ -51,8 +51,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Date$
  */
 
 
@@ -1401,7 +1399,7 @@ scan_or_find_devices (int readerno, const char *readerid,
         }
       else if (fd == -1)
         {
-          DEBUGOUT_2 ("failed to open `%s': %s\n",
+          DEBUGOUT_2 ("failed to open '%s': %s\n",
                      transports[i].name, strerror (errno));
           continue;
         }
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h
index 8b709aee8..121cb945b 100644
--- a/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -38,7 +38,7 @@
  *    products derived from this software without specific prior
  *    written permission.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
diff --git a/scd/command.c b/scd/command.c
index 21c1b209d..102715804 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -2350,7 +2350,7 @@ update_reader_status_file (int set_card_removed_flag)
                 fname = make_filename (opt.homedir, "scd-event", NULL);
                 err = gnupg_spawn_process_detached (fname, args, envs);
                 if (err && gpg_err_code (err) != GPG_ERR_ENOENT)
-                  log_error ("failed to run event handler `%s': %s\n",
+                  log_error ("failed to run event handler '%s': %s\n",
                              fname, gpg_strerror (err));
                 xfree (fname);
                 xfree (envstr);
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index 73b25f4b3..d0c30d157 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -191,7 +191,7 @@ long (* pcsc_control) (unsigned long card,
 static void
 bad_request (const char *type)
 {
-  fprintf (stderr, PGM ": bad `%s' request\n", type);
+  fprintf (stderr, PGM ": bad '%s' request\n", type);
   exit (1);
 }
 
@@ -325,7 +325,7 @@ load_pcsc_driver (const char *libname)
   handle = dlopen (libname, RTLD_LAZY);
   if (!handle)
     {
-      fprintf (stderr, PGM ": failed to open driver `%s': %s",
+      fprintf (stderr, PGM ": failed to open driver '%s': %s",
                libname, dlerror ());
       exit (1);
     }
@@ -446,7 +446,7 @@ handle_open (unsigned char *argbuf, size_t arglen)
     {
       if (!*p && !p[1])
         break;
-      fprintf (stderr, PGM": detected reader `%s'\n", p);
+      fprintf (stderr, PGM": detected reader '%s'\n", p);
       if (nreader < (strlen (p)+1))
         {
           fprintf (stderr, PGM": invalid response from pcsc_list_readers\n");
diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c
index c30fd99f6..0056dd79a 100644
--- a/scd/sc-copykeys.c
+++ b/scd/sc-copykeys.c
@@ -183,14 +183,14 @@ read_file (const char *fname, size_t *r_length)
   fp = fname? fopen (fname, "rb") : stdin;
   if (!fp)
     {
-      log_error ("can't open `%s': %s\n",
+      log_error ("can't open '%s': %s\n",
                  fname? fname: "[stdin]", strerror (errno));
       return NULL;
     }
 
   if (fstat (fileno(fp), &st))
     {
-      log_error ("can't stat `%s': %s\n",
+      log_error ("can't stat '%s': %s\n",
                  fname? fname: "[stdin]", strerror (errno));
       if (fname)
         fclose (fp);
@@ -201,7 +201,7 @@ read_file (const char *fname, size_t *r_length)
   buf = xmalloc (buflen+1);
   if (fread (buf, buflen, 1, fp) != 1)
     {
-      log_error ("error reading `%s': %s\n",
+      log_error ("error reading '%s': %s\n",
                  fname? fname: "[stdin]", strerror (errno));
       if (fname)
         fclose (fp);
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 86d092b62..af4c9c1ce 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -316,7 +316,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);
       scd_exit(2);
     }
 
@@ -500,12 +500,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);
 	    }
@@ -513,7 +513,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;
     }
 
@@ -625,7 +625,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 (atexit (cleanup))
@@ -720,9 +720,9 @@ main (int argc, char **argv )
       if (allow_coredump)
         {
           if (chdir("/tmp"))
-            log_debug ("chdir to `/tmp' failed: %s\n", strerror (errno));
+            log_debug ("chdir to '/tmp' failed: %s\n", strerror (errno));
           else
-            log_debug ("changed working directory to `/tmp'\n");
+            log_debug ("changed working directory to '/tmp'\n");
         }
 
       /* In multi server mode we need to listen on an additional
@@ -775,7 +775,7 @@ main (int argc, char **argv )
     }
   else if (!is_daemon)
     {
-      log_info (_("please use the option `--daemon'"
+      log_info (_("please use the option '--daemon'"
                   " to run the program in the background\n"));
     }
   else
@@ -1043,7 +1043,7 @@ create_socket_name (int use_standard_socket,
       *p = 0;
       if (!mkdtemp (name))
 	{
-	  log_error (_("can't create directory `%s': %s\n"),
+	  log_error (_("can't create directory '%s': %s\n"),
 		     name, strerror (errno));
 	  scd_exit (2);
 	}
@@ -1052,7 +1052,7 @@ create_socket_name (int use_standard_socket,
 
   if (strchr (name, PATHSEP_C))
     {
-      log_error (("`%s' are not allowed in the socket name\n"), PATHSEP_S);
+      log_error (("'%s' are not allowed in the socket name\n"), PATHSEP_S);
       scd_exit (2);
     }
   if (strlen (name) + 1 >= DIMof (struct sockaddr_un, sun_path) )
@@ -1102,7 +1102,7 @@ create_server_socket (int is_standard_name, const char *name,
     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_syserror ()));
       assuan_sock_close (fd);
@@ -1118,7 +1118,7 @@ create_server_socket (int is_standard_name, const char *name,
     }
 
   if (opt.verbose)
-    log_info (_("listening on socket `%s'\n"), serv_addr->sun_path);
+    log_info (_("listening on socket '%s'\n"), serv_addr->sun_path);
 
   return fd;
 }