Consistently use proper quotation marks all over the place

That is "" or '', and not the unbalanced `' pair.

TODO

@@ -156,5 +156,5 @@ other stuff unlikely to get done soon
 
  * floppy map (where are the files)
  * how to change case of package names
- * `fake' or `null' packages
+ * 'fake' or 'null' packages
  * dpkg --query | -Q

debian/changelog

@@ -141,6 +141,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Improve dselect color-spec --help output.
     - Move "(default)" annotations in scripts --help output after option
       description.
+    - Consistently use proper quotation marks ("" or '', and not the
+      unbalanced `' pair) all over the place.
 
   [ Raphaël Hertzog ]
   * Drop myself from Uploaders.

debian/dpkg-dev.preinst

@@ -35,7 +35,7 @@ case "$1" in
 
 
     *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
+	echo "$0 called with unknown argument '$1'" 1>&2
 	exit 1
 	;;
 esac

debian/dpkg.postinst

@@ -82,7 +82,7 @@ case "$1" in
 	;;
 
     *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
+	echo "$0 called with unknown argument '$1'" 1>&2
 	exit 1
 	;;
 esac

debian/dpkg.postrm

@@ -66,7 +66,7 @@ case "$1" in
 
 
     *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
+	echo "$0 called with unknown argument '$1'" 1>&2
 	exit 1
 	;;
 esac

debian/dpkg.preinst

@@ -80,7 +80,7 @@ case "$1" in
 
 
     *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
+	echo "$0 called with unknown argument '$1'" 1>&2
 	exit 1
 	;;
 esac

debian/dpkg.prerm

@@ -156,7 +156,7 @@ case "$1" in
         ;;
 
     *)
-        echo "$0 called with unknown argument \`$1'" 1>&2
+        echo "$0 called with unknown argument '$1'" 1>&2
         exit 1
         ;;
 esac

debian/dselect.preinst

@@ -35,7 +35,7 @@ case "$1" in
 
 
     *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
+	echo "$0 called with unknown argument '$1'" 1>&2
 	exit 1
 	;;
 esac

dpkg-deb/build.c

@@ -183,7 +183,7 @@ file_treewalk_feed(const char *dir, int fd_out)
     close(pipefd[1]);
 
     if (chdir(dir))
-      ohshite(_("failed to chdir to `%.255s'"), dir);
+      ohshite(_("failed to chdir to '%.255s'"), dir);
 
     execlp(FIND, "find", ".", "-path", "./" BUILDCONTROLDIR, "-prune", "-o",
            "-print0", NULL);
@@ -249,14 +249,14 @@ check_file_perms(const char *dir)
       if (S_ISLNK(mscriptstab.st_mode))
         continue;
       if (!S_ISREG(mscriptstab.st_mode))
-        ohshit(_("maintainer script `%.50s' is not a plain file or symlink"),
+        ohshit(_("maintainer script '%.50s' is not a plain file or symlink"),
                *mscriptp);
       if ((mscriptstab.st_mode & 07557) != 0555)
-        ohshit(_("maintainer script `%.50s' has bad permissions %03lo "
+        ohshit(_("maintainer script '%.50s' has bad permissions %03lo "
                  "(must be >=0555 and <=0775)"),
                *mscriptp, (unsigned long)(mscriptstab.st_mode & 07777));
     } else if (errno != ENOENT) {
-      ohshite(_("maintainer script `%.50s' is not stattable"), *mscriptp);
+      ohshite(_("maintainer script '%.50s' is not stattable"), *mscriptp);
     }
   }
 
@@ -305,9 +305,9 @@ check_conffiles(const char *dir)
         if ((n > 1) && c_isspace(conffilename[n - 2]))
           warning(_("conffile filename '%s' contains trailing white spaces"),
                   conffilename);
-        ohshit(_("conffile `%.250s' does not appear in package"), conffilename);
+        ohshit(_("conffile '%.250s' does not appear in package"), conffilename);
       } else
-        ohshite(_("conffile `%.250s' is not stattable"), conffilename);
+        ohshite(_("conffile '%.250s' is not stattable"), conffilename);
     } else if (!S_ISREG(controlstab.st_mode)) {
       warning(_("conffile '%s' is not a plain file"), conffilename);
     }
@@ -347,7 +347,7 @@ check_control_file(const char *dir)
 
   if (strspn(pkg->set->name, "abcdefghijklmnopqrstuvwxyz0123456789+-.") !=
       strlen(pkg->set->name))
-    ohshit(_("package name has characters that aren't lowercase alphanums or `-+.'"));
+    ohshit(_("package name has characters that aren't lowercase alphanums or '-+.'"));
   if (pkg->priority == PKG_PRIO_OTHER)
     warning(_("'%s' contains user-defined Priority value '%s'"),
             controlfile, pkg->otherpriority);
@@ -401,7 +401,7 @@ gen_dest_pathname(const char *dir, const char *dest)
 
     if (stat(dest, &dest_stab)) {
       if (errno != ENOENT)
-        ohshite(_("unable to check for existence of archive `%.250s'"), dest);
+        ohshite(_("unable to check for existence of archive '%.250s'"), dest);
     } else if (S_ISDIR(dest_stab.st_mode)) {
       /* Need to compute the destination name from the package control file. */
       return NULL;
@@ -482,7 +482,7 @@ do_build(const char *const *argv)
     pkg = check_control_area(dir);
     if (debar == NULL)
       debar = gen_dest_pathname_from_pkg(dest, pkg);
-    printf(_("dpkg-deb: building package `%s' in `%s'.\n"),
+    printf(_("dpkg-deb: building package '%s' in '%s'.\n"),
            pkg->set->name, debar);
   }
   m_output(stdout, _("<standard output>"));
@@ -491,7 +491,7 @@ do_build(const char *const *argv)
    * build something. Let's start by making the ar-wrapper. */
   arfd = creat(debar, 0644);
   if (arfd < 0)
-    ohshite(_("unable to create `%.255s'"), debar);
+    ohshite(_("unable to create '%.255s'"), debar);
   /* Fork a tar to package the control-section of the package. */
   unsetenv("TAR_OPTIONS");
   m_pipe(p1);
@@ -499,9 +499,9 @@ do_build(const char *const *argv)
   if (!c1) {
     m_dup2(p1[1],1); close(p1[0]); close(p1[1]);
     if (chdir(dir))
-      ohshite(_("failed to chdir to `%.255s'"), dir);
+      ohshite(_("failed to chdir to '%.255s'"), dir);
     if (chdir(BUILDCONTROLDIR))
-      ohshite(_("failed to chdir to `%.255s'"), ".../DEBIAN");
+      ohshite(_("failed to chdir to '%.255s'"), ".../DEBIAN");
     execlp(TAR, "tar", "-cf", "-", "--format=gnu", ".", NULL);
     ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
   }
@@ -550,7 +550,7 @@ do_build(const char *const *argv)
     sprintf(versionbuf, "%-8s\n%jd\n", OLDARCHIVEVERSION,
             (intmax_t)controlstab.st_size);
     if (fd_write(arfd, versionbuf, strlen(versionbuf)) < 0)
-      ohshite(_("error writing `%s'"), debar);
+      ohshite(_("error writing '%s'"), debar);
     if (fd_fd_copy(gzfd, arfd, -1, &err) < 0)
       ohshit(_("cannot copy '%s' into archive '%s': %s"), _("control member"),
              debar, err.str);
@@ -599,7 +599,7 @@ do_build(const char *const *argv)
     m_dup2(p1[0],0); close(p1[0]); close(p1[1]);
     m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
     if (chdir(dir))
-      ohshite(_("failed to chdir to `%.255s'"), dir);
+      ohshite(_("failed to chdir to '%.255s'"), dir);
     execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-unquote",
                        "-T", "-", "--no-recursion", NULL);
     ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);

dpkg-deb/extract.c

@@ -128,7 +128,7 @@ extracthalf(const char *debar, const char *dir,
   else
     arfd = open(debar, O_RDONLY);
   if (arfd < 0)
-    ohshite(_("failed to read archive `%.255s'"), debar);
+    ohshite(_("failed to read archive '%.255s'"), debar);
   if (fstat(arfd, &stab))
     ohshite(_("failed to fstat archive"));
 
@@ -155,7 +155,8 @@ extracthalf(const char *debar, const char *dir,
         char *infobuf;
 
         if (strncmp(arh.ar_name, DEBMAGIC, sizeof(arh.ar_name)) != 0)
-          ohshit(_("file `%.250s' is not a debian binary archive (try dpkg-split?)"),debar);
+          ohshit(_("file '%.250s' is not a debian binary archive (try dpkg-split?)"),
+                 debar);
         infobuf= m_malloc(memberlen+1);
         r = fd_read(arfd, infobuf, memberlen + (memberlen & 1));
         if (r != (memberlen + (memberlen & 1)))
@@ -277,7 +278,7 @@ extracthalf(const char *debar, const char *dir,
                " corrupted by being downloaded in ASCII mode"));
     }
 
-    ohshit(_("`%.255s' is not a debian format archive"),debar);
+    ohshit(_("'%.255s' is not a debian format archive"), debar);
   }
 
   m_pipe(p1);

dpkg-deb/info.c

@@ -102,7 +102,7 @@ info_spew(const char *debar, const char *dir, const char *const *argv)
              debar, component);
       re++;
     } else {
-      ohshite(_("open component `%.255s' (in %.255s) failed in an unexpected way"),
+      ohshite(_("open component '%.255s' (in %.255s) failed in an unexpected way"),
               component, dir);
     }
   }
@@ -127,7 +127,7 @@ info_list(const char *debar, const char *dir)
 
   cdn = scandir(dir, &cdlist, &ilist_select, alphasort);
   if (cdn == -1)
-    ohshite(_("cannot scan directory `%.255s'"), dir);
+    ohshite(_("cannot scan directory '%.255s'"), dir);
 
   for (n = 0; n < cdn; n++) {
     cdep = cdlist[n];
@@ -136,11 +136,11 @@ info_list(const char *debar, const char *dir)
     varbuf_printf(&controlfile, "%s/%s", dir, cdep->d_name);
 
     if (stat(controlfile.buf, &stab))
-      ohshite(_("cannot stat `%.255s' (in `%.255s')"), cdep->d_name, dir);
+      ohshite(_("cannot stat '%.255s' (in '%.255s')"), cdep->d_name, dir);
     if (S_ISREG(stab.st_mode)) {
       cc = fopen(controlfile.buf, "r");
       if (!cc)
-        ohshite(_("cannot open `%.255s' (in `%.255s')"), cdep->d_name, dir);
+        ohshite(_("cannot open '%.255s' (in '%.255s')"), cdep->d_name, dir);
       lines = 0;
       interpreter[0] = '\0';
       if (getc(cc) == '#') {
@@ -155,8 +155,8 @@ info_list(const char *debar, const char *dir)
         }
       }
       while ((c= getc(cc))!= EOF) { if (c == '\n') lines++; }
-      if (ferror(cc)) ohshite(_("failed to read `%.255s' (in `%.255s')"),
-                              cdep->d_name, dir);
+      if (ferror(cc))
+        ohshite(_("failed to read '%.255s' (in '%.255s')"), cdep->d_name, dir);
       fclose(cc);
       printf(_(" %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"),
              (intmax_t)stab.st_size, lines, S_IXUSR & stab.st_mode ? '*' : ' ',
@@ -173,8 +173,8 @@ info_list(const char *debar, const char *dir)
   cc = fopen(controlfile.buf, "r");
   if (!cc) {
     if (errno != ENOENT)
-      ohshite(_("failed to read `%.255s' (in `%.255s')"), CONTROLFILE, dir);
-    fputs(_("(no `control' file in control archive!)\n"), stdout);
+      ohshite(_("failed to read '%.255s' (in '%.255s')"), CONTROLFILE, dir);
+    fputs(_("(no 'control' file in control archive!)\n"), stdout);
   } else {
     lines= 1;
     while ((c= getc(cc))!= EOF) {
@@ -187,7 +187,7 @@ info_list(const char *debar, const char *dir)
       putc('\n', stdout);
 
     if (ferror(cc))
-      ohshite(_("failed to read `%.255s' (in `%.255s')"), CONTROLFILE, dir);
+      ohshite(_("failed to read '%.255s' (in '%.255s')"), CONTROLFILE, dir);
     fclose(cc);
   }
 

dpkg-deb/main.c

@@ -51,7 +51,7 @@ const char *showformat = "${Package}\t${Version}\n";
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)
 {
-  printf(_("Debian `%s' package archive backend version %s.\n"),
+  printf(_("Debian '%s' package archive backend version %s.\n"),
          BACKEND, DPKG_VERSION_ARCH);
   printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -93,7 +93,7 @@ usage(const struct cmdinfo *cip, const char *value)
   printf(_(
 "<deb> is the filename of a Debian format archive.\n"
 "<cfile> is the name of an administrative file component.\n"
-"<cfield> is the name of a field in the main `control' file.\n"
+"<cfield> is the name of a field in the main 'control' file.\n"
 "\n"));
 
   printf(_(
@@ -212,7 +212,7 @@ set_compress_type(const struct cmdinfo *cip, const char *value)
 {
   compress_params.type = compressor_find_by_name(value);
   if (compress_params.type == COMPRESSOR_TYPE_UNKNOWN)
-    ohshit(_("unknown compression type `%s'!"), value);
+    ohshit(_("unknown compression type '%s'!"), value);
   if (compress_params.type == COMPRESSOR_TYPE_LZMA)
     warning(_("deprecated compression type '%s'; use xz instead"), value);
   if (compress_params.type == COMPRESSOR_TYPE_BZIP2)

dpkg-split/info.c

@@ -52,7 +52,8 @@ parse_intmax(const char *value, const char *fn, const char *what)
   errno = 0;
   r = strtoimax(value, &endp, 10);
   if (value == endp || *endp)
-    ohshit(_("file `%.250s' is corrupt - bad digit (code %d) in %s"),fn,*endp,what);
+    ohshit(_("file '%.250s' is corrupt - bad digit (code %d) in %s"),
+           fn, *endp, what);
   if (r < 0 || errno == ERANGE)
     ohshit(_("file '%s' is corrupt; out of range integer in %s"), fn, what);
   return r;
@@ -62,10 +63,12 @@ static char *nextline(char **ripp, const char *fn, const char *what) {
   char *newline, *rip;
 
   rip= *ripp;
-  if (!rip) ohshit(_("file `%.250s' is corrupt - %.250s missing"),fn,what);
+  if (!rip)
+    ohshit(_("file '%.250s' is corrupt - %.250s missing"), fn, what);
   newline= strchr(rip,'\n');
   if (!newline)
-    ohshit(_("file `%.250s' is corrupt - missing newline after %.250s"),fn,what);
+    ohshit(_("file '%.250s' is corrupt - missing newline after %.250s"),
+           fn, what);
   *ripp= newline+1;
   while (newline > rip && c_isspace(newline[-1]))
     newline--;
@@ -107,7 +110,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
   if (strncmp(arh.ar_name, PARTMAGIC, sizeof(arh.ar_name)) != 0)
     return NULL;
   if (dpkg_ar_member_is_illegal(&arh))
-    ohshit(_("file `%.250s' is corrupt - bad magic at end of first header"),fn);
+    ohshit(_("file '%.250s' is corrupt - bad magic at end of first header"), fn);
   thisilen = dpkg_ar_member_get_size(fn, &arh);
   if (thisilen >= readinfobuflen) {
     readinfobuflen= thisilen+1;
@@ -117,11 +120,12 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
   if (thisilen & 1) {
     c= getc(partfile);  if (c==EOF) rerreof(partfile,fn);
     if (c != '\n')
-      ohshit(_("file `%.250s' is corrupt - bad padding character (code %d)"),fn,c);
+      ohshit(_("file '%.250s' is corrupt - bad padding character (code %d)"),
+             fn, c);
   }
   readinfobuf[thisilen] = '\0';
   if (memchr(readinfobuf,0,thisilen))
-    ohshit(_("file `%.250s' is corrupt - nulls in info section"),fn);
+    ohshit(_("file '%.250s' is corrupt - nulls in info section"), fn);
 
   ir->filename= fn;
 
@@ -139,7 +143,8 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
   ir->md5sum = nfstrsave(nextline(&rip, fn, _("package file MD5 checksum")));
   if (strlen(ir->md5sum) != MD5HASHLEN ||
       strspn(ir->md5sum, "0123456789abcdef") != MD5HASHLEN)
-    ohshit(_("file `%.250s' is corrupt - bad MD5 checksum `%.250s'"),fn,ir->md5sum);
+    ohshit(_("file '%.250s' is corrupt - bad MD5 checksum '%.250s'"),
+           fn, ir->md5sum);
 
   ir->orglength = parse_intmax(nextline(&rip, fn, _("archive total size")),
                                fn, _("archive total size"));
@@ -158,7 +163,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
   ir->maxpartn= templong;
   templong = parse_intmax(partnums, fn, _("archive parts number"));
   if (templong <= 0 || templong > ir->maxpartn)
-    ohshit(_("file '%.250s' is corrupt - bad archive part number"),fn);
+    ohshit(_("file '%.250s' is corrupt - bad archive part number"), fn);
   ir->thispartn= templong;
 
   /* If the package was created with dpkg 1.16.1 or later it will include
@@ -173,30 +178,31 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
   dpkg_ar_normalize_name(&arh);
 
   if (dpkg_ar_member_is_illegal(&arh))
-    ohshit(_("file `%.250s' is corrupt - bad magic at end of second header"),fn);
+    ohshit(_("file '%.250s' is corrupt - bad magic at end of second header"), fn);
   if (strncmp(arh.ar_name,"data",4))
-    ohshit(_("file `%.250s' is corrupt - second member is not data member"),fn);
+    ohshit(_("file '%.250s' is corrupt - second member is not data member"), fn);
 
   ir->thispartlen = dpkg_ar_member_get_size(fn, &arh);
   ir->thispartoffset= (ir->thispartn-1)*ir->maxpartlen;
 
   if (ir->maxpartn != (ir->orglength+ir->maxpartlen-1)/ir->maxpartlen)
-    ohshit(_("file `%.250s' is corrupt - wrong number of parts for quoted sizes"),fn);
+    ohshit(_("file '%.250s' is corrupt - wrong number of parts for quoted sizes"), fn);
   if (ir->thispartlen !=
       (ir->thispartn == ir->maxpartn
        ? ir->orglength - ir->thispartoffset : ir->maxpartlen))
-    ohshit(_("file `%.250s' is corrupt - size is wrong for quoted part number"),fn);
+    ohshit(_("file '%.250s' is corrupt - size is wrong for quoted part number"), fn);
 
   ir->filesize = (strlen(DPKG_AR_MAGIC) +
                   sizeof(arh) + thisilen + (thisilen & 1) +
                   sizeof(arh) + ir->thispartlen + (ir->thispartlen & 1));
 
-  if (fstat(fileno(partfile),&stab)) ohshite(_("unable to fstat part file `%.250s'"),fn);
+  if (fstat(fileno(partfile), &stab))
+    ohshite(_("unable to fstat part file '%.250s'"), fn);
   if (S_ISREG(stab.st_mode)) {
     /* Don't do this check if it's coming from a pipe or something.  It's
      * only an extra sanity check anyway. */
     if (stab.st_size < ir->filesize)
-      ohshit(_("file `%.250s' is corrupt - too short"),fn);
+      ohshit(_("file '%.250s' is corrupt - too short"), fn);
   }
 
   ir->headerlen = strlen(DPKG_AR_MAGIC) +
@@ -209,9 +215,10 @@ void mustgetpartinfo(const char *filename, struct partinfo *ri) {
   FILE *part;
 
   part= fopen(filename,"r");
-  if (!part) ohshite(_("cannot open archive part file `%.250s'"),filename);
+  if (!part)
+    ohshite(_("cannot open archive part file '%.250s'"), filename);
   if (!read_info(part,filename,ri))
-    ohshite(_("file `%.250s' is not an archive part"),filename);
+    ohshite(_("file '%.250s' is not an archive part"), filename);
   fclose(part);
 }
 
@@ -256,13 +263,14 @@ do_info(const char *const *argv)
 
   while ((thisarg= *argv++)) {
     part= fopen(thisarg,"r");
-    if (!part) ohshite(_("cannot open archive part file `%.250s'"),thisarg);
+    if (!part)
+      ohshite(_("cannot open archive part file '%.250s'"), thisarg);
     pi= read_info(part,thisarg,&ps);
     fclose(part);
     if (pi) {
       print_info(pi);
     } else {
-      printf(_("file `%s' is not an archive part\n"),thisarg);
+      printf(_("file '%s' is not an archive part\n"), thisarg);
     }
     m_output(stdout, _("<standard output>"));
   }

dpkg-split/join.c

@@ -49,13 +49,13 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
 
   fd_out = creat(outputfile, 0644);
   if (fd_out < 0)
-    ohshite(_("unable to open output file `%.250s'"), outputfile);
+    ohshite(_("unable to open output file '%.250s'"), outputfile);
   for (i=0; i<partlist[0]->maxpartn; i++) {
     struct partinfo *pi = partlist[i];
 
     fd_in = open(pi->filename, O_RDONLY);
     if (fd_in < 0)
-      ohshite(_("unable to (re)open input part file `%.250s'"), pi->filename);
+      ohshite(_("unable to (re)open input part file '%.250s'"), pi->filename);
     if (fd_skip(fd_in, pi->headerlen, &err) < 0)
       ohshit(_("cannot skip split package header for '%s': %s"), pi->filename,
              err.str);
@@ -87,12 +87,12 @@ void addtopartlist(struct partinfo **partlist,
       pi->maxpartlen != refi->maxpartlen) {
     print_info(pi);
     print_info(refi);
-    ohshit(_("files `%.250s' and `%.250s' are not parts of the same file"),
+    ohshit(_("files '%.250s' and '%.250s' are not parts of the same file"),
            pi->filename,refi->filename);
   }
   i= pi->thispartn-1;
   if (partlist[i])
-    ohshit(_("there are several versions of part %d - at least `%.250s' and `%.250s'"),
+    ohshit(_("there are several versions of part %d - at least '%.250s' and '%.250s'"),
            pi->thispartn, pi->filename, partlist[i]->filename);
   partlist[i]= pi;
 }

dpkg-split/main.c

@@ -45,7 +45,7 @@
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)
 {
-  printf(_("Debian `%s' package split/join tool; version %s.\n"),
+  printf(_("Debian '%s' package split/join tool; version %s.\n"),
          SPLITTER, DPKG_VERSION_ARCH);
 
   printf(_(
@@ -124,7 +124,7 @@ set_part_size(const struct cmdinfo *cip, const char *value)
   errno = 0;
   newpartsize = strtoimax(value, &endp, 10);
   if (value == endp || *endp)
-    badusage(_("invalid integer for --%s: `%.250s'"), cip->olong, value);
+    badusage(_("invalid integer for --%s: '%.250s'"), cip->olong, value);
   if (newpartsize <= 0 || newpartsize > (INT_MAX >> 10) || errno == ERANGE)
     badusage(_("part size is far too large or is not positive"));
 

dpkg-split/queue.c

@@ -92,7 +92,7 @@ scandepot(void)
 
   depot = opendir(opt_depotdir);
   if (!depot)
-    ohshite(_("unable to read depot directory `%.250s'"), opt_depotdir);
+    ohshite(_("unable to read depot directory '%.250s'"), opt_depotdir);
   while ((de= readdir(depot))) {
     struct partqueue *pq;
     char *p;
@@ -149,10 +149,11 @@ do_auto(const char *const *argv)
 
   refi= nfmalloc(sizeof(struct partqueue));
   part= fopen(partfile,"r");
-  if (!part) ohshite(_("unable to read part file `%.250s'"),partfile);
+  if (!part)
+    ohshite(_("unable to read part file '%.250s'"), partfile);
   if (!read_info(part,partfile,refi)) {
     if (!opt_npquiet)
-      printf(_("File `%.250s' is not part of a multipart archive.\n"),partfile);
+      printf(_("File '%.250s' is not part of a multipart archive.\n"), partfile);
     m_output(stdout, _("<standard output>"));
     return 1;
   }
@@ -190,10 +191,10 @@ do_auto(const char *const *argv)
 
     fd_src = open(partfile, O_RDONLY);
     if (fd_src < 0)
-      ohshite(_("unable to reopen part file `%.250s'"), partfile);
+      ohshite(_("unable to reopen part file '%.250s'"), partfile);
     fd_dst = creat(p, 0644);
     if (fd_dst < 0)
-      ohshite(_("unable to open new depot file `%.250s'"), p);
+      ohshite(_("unable to open new depot file '%.250s'"), p);
 
     if (fd_fd_copy(fd_src, fd_dst, refi->filesize, &err) < 0)
       ohshit(_("cannot extract split package part '%s': %s"),
@@ -205,7 +206,8 @@ do_auto(const char *const *argv)
       ohshite(_("unable to close file '%s'"), p);
     close(fd_src);
 
-    if (rename(p,q)) ohshite(_("unable to rename new depot file `%.250s' to `%.250s'"),p,q);
+    if (rename(p, q))
+      ohshite(_("unable to rename new depot file '%.250s' to '%.250s'"), p, q);
     free(q);
     free(p);
 
@@ -227,7 +229,8 @@ do_auto(const char *const *argv)
     for (i=0; i<refi->maxpartn; i++)
       if (partlist[i])
         if (unlink(partlist[i]->filename))
-          ohshite(_("unable to delete used-up depot file `%.250s'"),partlist[i]->filename);
+          ohshite(_("unable to delete used-up depot file '%.250s'"),
+                  partlist[i]->filename);
 
   }
 
@@ -255,7 +258,7 @@ do_queue(const char *const *argv)
     if (pq->info.md5sum) continue;
     fputs(gettext(head),stdout); head= "";
     if (lstat(pq->info.filename,&stab))
-      ohshit(_("unable to stat `%.250s'"),pq->info.filename);
+      ohshit(_("unable to stat '%.250s'"), pq->info.filename);
     if (S_ISREG(stab.st_mode)) {
       bytes= stab.st_size;
       printf(_(" %s (%jd bytes)\n"), pq->info.filename, (intmax_t)bytes);
@@ -284,9 +287,9 @@ do_queue(const char *const *argv)
       if (qq) {
         printf("%d ",i+1);
         if (lstat(qq->info.filename,&stab))
-          ohshite(_("unable to stat `%.250s'"),qq->info.filename);
+          ohshite(_("unable to stat '%.250s'"), qq->info.filename);
         if (!S_ISREG(stab.st_mode))
-          ohshit(_("part file `%.250s' is not a plain file"),qq->info.filename);
+          ohshit(_("part file '%.250s' is not a plain file"), qq->info.filename);
         bytes+= stab.st_size;
 
         /* Don't find this package again. */
@@ -326,7 +329,7 @@ discard_parts(struct partqueue *queue, enum discard_which which,
       internerr("unknown discard_which '%d'", which);
     }
     if (unlink(pq->info.filename))
-      ohshite(_("unable to discard `%.250s'"),pq->info.filename);
+      ohshite(_("unable to discard '%.250s'"), pq->info.filename);
     printf(_("Deleted %s.\n"),pq->info.filename);
   }
 }

dpkg-split/split.c

@@ -129,11 +129,11 @@ mksplit(const char *file_src, const char *prefix, off_t maxpartsize,
 
 	fd_src = open(file_src, O_RDONLY);
 	if (fd_src < 0)
-		ohshite(_("unable to open source file `%.250s'"), file_src);
+		ohshite(_("unable to open source file '%.250s'"), file_src);
 	if (fstat(fd_src, &st))
 		ohshite(_("unable to fstat source file"));
 	if (!S_ISREG(st.st_mode))
-		ohshit(_("source file `%.250s' not a plain file"), file_src);
+		ohshit(_("source file '%.250s' not a plain file"), file_src);
 
 	if (fd_md5(fd_src, hash, -1, &err) < 0)
 		ohshit(_("cannot compute MD5 hash for file '%s': %s"),

dselect/basecmds.cc

@@ -198,8 +198,8 @@ _("Press ? for help menu, . for next topic, <space> to exit help."));
         mvaddstr(i+3,6, gettext(hme->msg->title));
       }
       mvaddstr(i+4,1,
-               _("Press a key from the list above, <space> or `q' to exit help,\n"
-               "  or `.' (full stop) to read each help page in turn. "));
+               _("Press a key from the list above, <space> or 'q' to exit help,\n"
+                 "  or '.' (full stop) to read each help page in turn. "));
       nextkey= helpmenu[0].key;
     }
     refresh();

dselect/helpmsgs.cc

@@ -57,20 +57,20 @@ Welcome to dselect's main package listing.\n\n\
 \
 You will be presented with a list of packages which are installed or available\n\
 for installation.  You can navigate around the list using the cursor keys,\n\
-mark packages for installation (using `+') or deinstallation (using `-').\n\
+mark packages for installation (using '+') or deinstallation (using '-').\n\
 Packages can be marked either singly or in groups; initially you will see that\n\
-the line `All packages' is selected.  `+', `-' and so on will affect all the\n\
+the line 'All packages' is selected.  '+', '-' and so on will affect all the\n\
 packages described by the highlighted line.\n\n\
 \
 Some of your choices will cause conflicts or dependency problems; you will be\n\
 given a sub-list of the relevant packages, so that you can solve the problems.\n\n\
 \
 You should read the list of keys and the explanations of the display.\n\
-Much on-line help is available, please make use of it - press `?' at\n\
+Much on-line help is available, please make use of it - press '?' at\n\
 any time for help.\n\n\
 \
 When you have finished selecting packages, press <enter> to confirm changes,\n\
-or `X' to quit without saving changes. A final check on conflicts and\n\
+or 'X' to quit without saving changes. A final check on conflicts and\n\
 dependencies will be done - here too you may see a sublist.\n\n\
 \
 Press <space> to leave help and enter the list now.\n")
@@ -83,14 +83,14 @@ Welcome to dselect's main package listing.\n\n\
 You will be presented with a list of packages which are installed or available\n\
 for installation.  Since you do not have the privilege necessary to update\n\
 package states, you are in a read-only mode.  You can navigate around the\n\
-list using the cursor keys (please see the `Keystrokes' help screen), observe\n\
+list using the cursor keys (please see the 'Keystrokes' help screen), observe\n\
 the status of the packages and read information about them.\n\n\
 \
 You should read the list of keys and the explanations of the display.\n\
-Much on-line help is available, please make use of it - press `?' at\n\
+Much on-line help is available, please make use of it - press '?' at\n\
 any time for help.\n\n\
 \
-When you have finished browsing, press `Q' or <enter> to quit.\n\n\
+When you have finished browsing, press 'Q' or <enter> to quit.\n\n\
 \
 Press <space> to leave help and enter the list now.\n")
 };
@@ -104,45 +104,45 @@ some packages should only be installed in conjunction with certain others, and\n
 some combinations of packages may not be installed together.\n\n\
 \
 You will see a sub-list containing the packages involved.  The bottom half of\n\
-the display shows relevant conflicts and dependencies; use `i' to cycle between\n\
+the display shows relevant conflicts and dependencies; use 'i' to cycle between\n\
 that, the package descriptions and the internal control information.\n\n\
 \
-A set of `suggested' packages has been calculated, and the initial markings in\n\
+A set of 'suggested' packages has been calculated, and the initial markings in\n\
 this sub-list have been set to match those, so you can just hit Return to\n\
 accept the suggestions if you wish.  You may abort the change(s) which caused\n\
-the problem(s), and go back to the main list, by pressing capital `X'.\n\n\
+the problem(s), and go back to the main list, by pressing capital 'X'.\n\n\
 \
 You can also move around the list and change the markings so that they are more\n\
-like what you want, and you can `reject' my suggestions by using the capital\n\
-`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n\
+like what you want, and you can 'reject' my suggestions by using the capital\n\
+'D' or 'R' keys (see the keybindings help screen).  You can use capital 'Q' to\n\
 force me to accept the situation currently displayed, in case you want to\n\
 override a recommendation or think that the program is mistaken.\n\n\
 \
-Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n")
+Press <space> to leave help and enter the sub-list; remember: press '?' for help.\n")
 };
 
 const struct helpmessage hlp_displayexplain1 = {
   N_("Display, part 1: package listing and status chars"), N_("\
 The top half of the screen shows a list of packages.  For each package you see\n\
 four columns for its current status on the system and mark.  In terse mode (use\n\
-`v' to toggle verbose display) these are single characters, from left to right:\n\n\
+'v' to toggle verbose display) these are single characters, from left to right:\n\n\
 \
  Error flag: Space - no error (but package may be in broken state - see below)\n\
-              `R'  - serious error during installation, needs reinstallation;\n\
+              'R'  - serious error during installation, needs reinstallation;\n\
  Installed state:     Space    - not installed;\n\
-                       `*'     - installed;\n\
-                       `-'     - not installed but config files remain;\n\
-   packages in these { `U'     - unpacked but not yet configured;\n\
-   states are not    { `C'     - half-configured (an error happened);\n\
-   (quite) properly  { `I'     - half-installed (an error happened);\n\
-   installed         { `W',`t' - triggers are awaited resp. pending.\n\
+                       '*'     - installed;\n\
+                       '-'     - not installed but config files remain;\n\
+   packages in these { 'U'     - unpacked but not yet configured;\n\
+   states are not    { 'C'     - half-configured (an error happened);\n\
+   (quite) properly  { 'I'     - half-installed (an error happened);\n\
+   installed         { 'W','t' - triggers are awaited resp. pending.\n\
  Old mark: what was requested for this package before presenting this list;\n\
  Mark: what is requested for this package:\n\
-  `*': marked for installation or upgrade;\n\
-  `-': marked for removal, but any configuration files will remain;\n\
-  `=': on hold: package will not be processed at all;\n\
-  `_': marked for purge completely - even remove configuration;\n\
-  `n': package is new and has yet to be marked for install/remove/&c.\n\n\
+  '*': marked for installation or upgrade;\n\
+  '-': marked for removal, but any configuration files will remain;\n\
+  '=': on hold: package will not be processed at all;\n\
+  '_': marked for purge completely - even remove configuration;\n\
+  'n': package is new and has yet to be marked for install/remove/&c.\n\n\
 \
 Also displayed are each package's Priority, Section, name, installed and\n\
 available version numbers (shift-V to display/hide) and summary description.\n")
@@ -151,14 +151,14 @@ available version numbers (shift-V to display/hide) and summary description.\n")
 const struct helpmessage hlp_displayexplain2 = {
   N_("Display, part 2: list highlight; information display"), N_("\
 * Highlight: One line in the package list will be highlighted.  It indicates\n\
-  which package(s) will be affected by presses of `+', `-' and `_'.\n\n\
+  which package(s) will be affected by presses of '+', '-' and '_'.\n\n\
 \
 * The dividing line in the middle of the screen shows a brief explanation of\n\
   the status of the currently-highlighted package, or a description of which\n\
   group is highlighted if a group line is.  If you don't understand the\n\
   meaning of some of the status characters displayed, go to the relevant\n\
-  package and look at this divider line, or use the `v' key for a verbose\n\
-  display (press `v' again to go back to the terse display).\n\n\
+  package and look at this divider line, or use the 'v' key for a verbose\n\
+  display (press 'v' again to go back to the terse display).\n\n\
 \
 * The bottom of the screen shows more information about the\n\
   currently-highlighted package (if there is only one).\n\n\
@@ -168,7 +168,7 @@ const struct helpmessage hlp_displayexplain2 = {
   package), or information about conflicts and dependencies involving the\n\
   current package (in conflict/dependency resolution sublists).\n\n\
 \
-  Use the `i' key to cycle through the displays, and `I' to hide the\n\
+  Use the 'i' key to cycle through the displays, and 'I' to hide the\n\
   information display or expand it to use almost all of the screen.\n")
 };
 
@@ -185,11 +185,11 @@ be prompted for the information required to do the installation.\n\n\
 As you move the highlight a description of each method, where available, is\n\
 displayed in the bottom half of the screen.\n\n\
 \
-If you wish to quit without changing anything use the `x' key while in the list\n\
+If you wish to quit without changing anything use the 'x' key while in the list\n\
 of installation methods.\n\n\
 \
-A full list of keystrokes is available by pressing `k' now, or from the help\n\
-menu reachable by pressing `?'.\n")
+A full list of keystrokes is available by pressing 'k' now, or from the help\n\
+menu reachable by pressing '?'.\n")
 };
 
 const struct helpmessage hlp_methkeys = {

dselect/main.cc

@@ -154,7 +154,7 @@ static const menuentry menuentries[]= {
 };
 
 static const char programdesc[]=
-      N_("Debian `%s' package handling frontend version %s.\n");
+      N_("Debian '%s' package handling frontend version %s.\n");
 
 static const char licensestring[]= N_(
       "This is free software; see the GNU General Public License version 2 or\n"
@@ -231,7 +231,7 @@ extern "C" {
 
     fp = fopen(v, "a");
     if (!fp)
-      ohshite(_("couldn't open debug file `%.255s'\n"), v);
+      ohshite(_("couldn't open debug file '%.255s'\n"), v);
 
     debug_set_output(fp, v);
     debug_set_mask(dbg_general | dbg_depcon);
@@ -537,7 +537,8 @@ main(int, const char *const *argv)
       const menuentry *me = menuentries;
       while (me->command && strcmp(me->command, a))
         me++;
-      if (!me->command) badusage(_("unknown action string `%.50s'"),a);
+      if (!me->command)
+        badusage(_("unknown action string '%.50s'"), a);
       me->fn();
     }
   } else {

dselect/methlist.cc

@@ -79,7 +79,7 @@ void methodlist::redrawthisstate() {
   if (!thisstate_height) return;
   mywerase(thisstatepad);
   wprintw(thisstatepad,
-          _("Access method `%s'."),
+          _("Access method '%s'."),
           table[cursorline]->name);
   pnoutrefresh(thisstatepad, 0,0, thisstate_row,0,
                thisstate_row, min(total_width - 1, xmax - 1));

dselect/methods/multicd/install

@@ -176,7 +176,7 @@ Perhaps you downloaded it with an unexpected name, or something.
 In any case, you must find the file(s) and then either place it with
 the correct filename(s) (as listed in the Packages.cd file or in
 /var/lib/dpkg/available) and rerun the installation, or upgrade the
-package by using `dpkg --install --auto-deconfigure'\'' by hand.
+package by using '\''dpkg --install --auto-deconfigure'\'' by hand.
 
 ";
 				exit(1);

dselect/methparse.cc

@@ -50,13 +50,14 @@ struct method *methods = nullptr;
 static void DPKG_ATTR_NORET
 badmethod(const char *pathname, const char *why)
 {
-  ohshit(_("syntax error in method options file `%.250s' -- %s"), pathname, why);
+  ohshit(_("syntax error in method options file '%.250s' -- %s"), pathname, why);
 }
 
 static void DPKG_ATTR_NORET
 eofmethod(const char *pathname, FILE *f, const char *why)
 {
-  if (ferror(f)) ohshite(_("error reading options file `%.250s'"),pathname);
+  if (ferror(f))
+    ohshite(_("error reading options file '%.250s'"), pathname);
   badmethod(pathname,why);
 }
 
@@ -90,7 +91,8 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
       delete[] pathbuf;
       return;
     }
-    ohshite(_("unable to read `%.250s' directory for reading methods"),pathbuf);
+    ohshite(_("unable to read '%.250s' directory for reading methods"),
+            pathbuf);
   }
 
   debug(dbg_general, "readmethods('%s',...) directory open", pathbase);
@@ -107,7 +109,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
     if (c) continue;
     methodlen= strlen(dent->d_name);
     if (methodlen > IMETHODMAXLEN)
-      ohshit(_("method `%.250s' has name that is too long (%d > %d characters)"),
+      ohshit(_("method '%.250s' has name that is too long (%d > %d characters)"),
              dent->d_name, methodlen, IMETHODMAXLEN);
     /* Check if there is a localized version of this method */
 
@@ -118,13 +120,14 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
     for (ccpp= methodprograms; *ccpp; ccpp++) {
       strcpy(pathinmeth,*ccpp);
       if (access(pathbuf,R_OK|X_OK))
-        ohshite(_("unable to access method script `%.250s'"),pathbuf);
+        ohshite(_("unable to access method script '%.250s'"), pathbuf);
     }
     debug(dbg_general, " readmethods('%s',...) scripts ok", pathbase);
 
     strcpy(pathinmeth,METHODOPTIONSFILE);
     names= fopen(pathbuf,"r");
-    if (!names) ohshite(_("unable to read method options file `%.250s'"),pathbuf);
+    if (!names)
+      ohshite(_("unable to read method options file '%.250s'"), pathbuf);
 
     meth= new method;
     meth->name= new char[strlen(dent->d_name)+1];
@@ -199,18 +202,18 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
       descfile= fopen(pathbuf,"r");
       if (!descfile) {
         if (errno != ENOENT)
-          ohshite(_("unable to open option description file `%.250s'"),pathbuf);
+          ohshite(_("unable to open option description file '%.250s'"), pathbuf);
         opt->description = nullptr;
       } else { /* descfile != 0 */
         if (fstat(fileno(descfile),&stab))
-          ohshite(_("unable to stat option description file `%.250s'"),pathbuf);
+          ohshite(_("unable to stat option description file '%.250s'"), pathbuf);
         opt->description= new char[stab.st_size+1];  errno=0;
         size_t filelen = stab.st_size;
         if (fread(opt->description,1,stab.st_size+1,descfile) != filelen)
-          ohshite(_("failed to read option description file `%.250s'"),pathbuf);
+          ohshite(_("failed to read option description file '%.250s'"), pathbuf);
         opt->description[stab.st_size]= 0;
         if (ferror(descfile))
-          ohshite(_("error during read of option description file `%.250s'"),pathbuf);
+          ohshite(_("error during read of option description file '%.250s'"), pathbuf);
         fclose(descfile);
       }
       strcpy(pathinmeth,METHODOPTIONSFILE);
@@ -233,7 +236,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
       (*nread)++;
     }
     if (ferror(names))
-      ohshite(_("error during read of method options file `%.250s'"),pathbuf);
+      ohshite(_("error during read of method options file '%.250s'"), pathbuf);
     fclose(names);
   }
   closedir(dir);
@@ -256,7 +259,7 @@ void getcurrentopt() {
   cmo= fopen(methoptfile,"r");
   if (!cmo) {
     if (errno == ENOENT) return;
-    ohshite(_("unable to open current option file `%.250s'"),methoptfile);
+    ohshite(_("unable to open current option file '%.250s'"), methoptfile);
   }
   debug(dbg_general, "getcurrentopt() cmethopt open");
   if (!fgets(methoptbuf,sizeof(methoptbuf),cmo)) { fclose(cmo); return; }
@@ -292,7 +295,7 @@ void writecurrentopt() {
   file = atomic_file_new(methoptfile, (enum atomic_file_flags)0);
   atomic_file_open(file);
   if (fprintf(file->fp, "%s %s\n", coption->meth->name, coption->name) == EOF)
-    ohshite(_("unable to write new option to `%.250s'"), file->name_new);
+    ohshite(_("unable to write new option to '%.250s'"), file->name_new);
   atomic_file_close(file);
   atomic_file_commit(file);
   atomic_file_free(file);

dselect/pkginfo.cc

@@ -88,7 +88,7 @@ void packagelist::severalinfoblurb()
      "If you move the highlight to a line for a particular package "
      "you will see information about that package displayed here."
      "\n"
-     "You can use `o' and `O' to change the sort order and give yourself "
+     "You can use 'o' and 'O' to change the sort order and give yourself "
      "the opportunity to mark packages in different kinds of groups."));
   wordwrapinfo(0,vb.string());
 }

lib/dpkg/arch.c

@@ -70,8 +70,8 @@ dpkg_arch_name_is_illegal(const char *name)
 	if (*p == '\0')
 		return NULL;
 
-	snprintf(buf, sizeof(buf), _("character `%c' not allowed (only "
-	                             "letters, digits and characters `%s')"),
+	snprintf(buf, sizeof(buf), _("character '%c' not allowed (only "
+	                             "letters, digits and characters '%s')"),
 	         *p, "-");
 	return buf;
 }

lib/dpkg/atomic-file.c

@@ -78,7 +78,7 @@ atomic_file_close(struct atomic_file *file)
 	pop_cleanup(ehflag_normaltidy); /* fopen */
 
 	if (fclose(file->fp))
-		ohshite(_("unable to close new file `%.250s'"), file->name_new);
+		ohshite(_("unable to close new file '%.250s'"), file->name_new);
 }
 
 static void
@@ -100,9 +100,9 @@ void
 atomic_file_remove(struct atomic_file *file)
 {
 	if (unlink(file->name_new))
-		ohshite(_("cannot remove `%.250s'"), file->name_new);
+		ohshite(_("cannot remove '%.250s'"), file->name_new);
 	if (unlink(file->name) && errno != ENOENT)
-		ohshite(_("cannot remove `%.250s'"), file->name);
+		ohshite(_("cannot remove '%.250s'"), file->name);
 }
 
 void

lib/dpkg/dbmodify.c

@@ -67,7 +67,7 @@ static int ulist_select(const struct dirent *de) {
     if (!c_isdigit(*p))
       return 0;
   if (l > IMPORTANTMAXLEN)
-    ohshit(_("updates directory contains file `%.250s' whose name is too long "
+    ohshit(_("updates directory contains file '%.250s' whose name is too long "
            "(length=%d, max=%d)"), de->d_name, l, IMPORTANTMAXLEN);
   if (updateslength == -1) updateslength= l;
   else if (l != updateslength)
@@ -85,7 +85,8 @@ static void cleanupdates(void) {
   *updatefnrest = '\0';
   updateslength= -1;
   cdn= scandir(updatefnbuf, &cdlist, &ulist_select, alphasort);
-  if (cdn == -1) ohshite(_("cannot scan updates directory `%.255s'"),updatefnbuf);
+  if (cdn == -1)
+    ohshite(_("cannot scan updates directory '%.255s'"), updatefnbuf);
 
   if (cdn) {
     for (i=0; i<cdn; i++) {
@@ -120,7 +121,7 @@ static void createimptmp(void) {
 
   importanttmp= fopen(importanttmpfile,"w");
   if (!importanttmp)
-    ohshite(_("unable to create `%.255s'"), importanttmpfile);
+    ohshite(_("unable to create '%.255s'"), importanttmpfile);
   setcloexec(fileno(importanttmp),importanttmpfile);
   for (i=0; i<512; i++) fputs("#padding\n",importanttmp);
   if (ferror(importanttmp))
@@ -352,23 +353,23 @@ modstatdb_note_core(struct pkginfo *pkg)
   varbufrecord(&uvb, pkg, &pkg->installed);
 
   if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used)
-    ohshite(_("unable to write updated status of `%.250s'"),
+    ohshite(_("unable to write updated status of '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
   if (fflush(importanttmp))
-    ohshite(_("unable to flush updated status of `%.250s'"),
+    ohshite(_("unable to flush updated status of '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
   if (ftruncate(fileno(importanttmp), uvb.used))
-    ohshite(_("unable to truncate for updated status of `%.250s'"),
+    ohshite(_("unable to truncate for updated status of '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
   if (fsync(fileno(importanttmp)))
-    ohshite(_("unable to fsync updated status of `%.250s'"),
+    ohshite(_("unable to fsync updated status of '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
   if (fclose(importanttmp))
-    ohshite(_("unable to close updated status of `%.250s'"),
+    ohshite(_("unable to close updated status of '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
   sprintf(updatefnrest, IMPORTANTFMT, nextupdate);
   if (rename(importanttmpfile, updatefnbuf))
-    ohshite(_("unable to install updated status of `%.250s'"),
+    ohshite(_("unable to install updated status of '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
 
   dir_sync_path(updatesdir);

lib/dpkg/dump.c

@@ -468,7 +468,7 @@ writerecord(FILE *file, const char *filename,
     varbuf_add_pkgbin_name(&pkgname, pkg, pkgbin, pnaw_nonambig);
 
     errno = errno_saved;
-    ohshite(_("failed to write details of `%.50s' to `%.250s'"),
+    ohshite(_("failed to write details of '%.50s' to '%.250s'"),
             pkgname.buf, filename);
   }
 

lib/dpkg/fields.c

@@ -118,10 +118,10 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin,
   int allowextend;
 
   if (!*value)
-    parse_error(ps, _("empty file details field `%s'"), fip->name);
+    parse_error(ps, _("empty file details field '%s'"), fip->name);
   if (!(ps->flags & pdb_recordavailable))
     parse_error(ps,
-                _("file details field `%s' not allowed in status file"),
+                _("file details field '%s' not allowed in status file"),
                fip->name);
   allowextend = !pkg->files;
   fdpp = &pkg->files;
@@ -136,7 +136,7 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin,
     if (!fdp) {
       if (!allowextend)
         parse_error(ps,
-                    _("too many values in file details field `%s' "
+                    _("too many values in file details field '%s' "
                       "(compared to others)"), fip->name);
       fdp= nfmalloc(sizeof(struct filedetails));
       fdp->next= NULL;
@@ -151,7 +151,7 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin,
   }
   if (*fdpp)
     parse_error(ps,
-                _("too few values in file details field `%s' "
+                _("too few values in file details field '%s' "
                   "(compared to others)"), fip->name);
 }
 
@@ -426,7 +426,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
       depnamelength= p - depnamestart ;
       if (depnamelength == 0)
         parse_error(ps,
-                    _("`%s' field, missing package name, or garbage where "
+                    _("'%s' field, missing package name, or garbage where "
                       "package name expected"), fip->name);
 
       varbuf_reset(&depname);
@@ -436,7 +436,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
       emsg = pkg_name_is_illegal(depname.buf);
       if (emsg)
         parse_error(ps,
-                    _("`%s' field, invalid package name `%.255s': %s"),
+                    _("'%s' field, invalid package name '%.255s': %s"),
                     fip->name, depname.buf, emsg);
       dop= nfmalloc(sizeof(struct deppossi));
       dop->up= dyp;
@@ -515,14 +515,14 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
             p++;
           } else if (c2 == '<' || c2 == '>') {
             parse_error(ps,
-                        _("`%s' field, reference to `%.255s':\n"
+                        _("'%s' field, reference to '%.255s':\n"
                           " bad version relationship %c%c"),
                         fip->name, depname.buf, c1, c2);
             dop->verrel = DPKG_RELATION_NONE;
           } else {
             parse_warn(ps,
-                       _("`%s' field, reference to `%.255s':\n"
-                         " `%c' is obsolete, use `%c=' or `%c%c' instead"),
+                       _("'%s' field, reference to '%.255s':\n"
+                         " '%c' is obsolete, use '%c=' or '%c%c' instead"),
                        fip->name, depname.buf, c1, c1, c1, c1);
             dop->verrel |= DPKG_RELATION_EQ;
           }
@@ -531,9 +531,9 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
           p++;
         } else {
           parse_warn(ps,
-                     _("`%s' field, reference to `%.255s':\n"
+                     _("'%s' field, reference to '%.255s':\n"
                        " implicit exact match on version number, "
-                       "suggest using `=' instead"),
+                       "suggest using '=' instead"),
                      fip->name, depname.buf);
           dop->verrel = DPKG_RELATION_EQ;
         }
@@ -544,7 +544,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
         if (!c_isspace(*p) && !c_isalnum(*p)) {
           parse_warn(ps,
-                     _("`%s' field, reference to `%.255s':\n"
+                     _("'%s' field, reference to '%.255s':\n"
                        " version value starts with non-alphanumeric, "
                        "suggest adding a space"),
                      fip->name, depname.buf);
@@ -564,15 +564,15 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
           p++;
         if (*p == '(')
           parse_error(ps,
-                      _("`%s' field, reference to `%.255s': "
-                        "version contains `%c'"), fip->name, depname.buf, ')');
+                      _("'%s' field, reference to '%.255s': "
+                        "version contains '%c'"), fip->name, depname.buf, ')');
         else if (*p != ')')
           parse_error(ps,
-                      _("`%s' field, reference to `%.255s': "
-                        "version contains `%c'"), fip->name, depname.buf, ' ');
+                      _("'%s' field, reference to '%.255s': "
+                        "version contains '%c'"), fip->name, depname.buf, ' ');
         else if (*p == '\0')
           parse_error(ps,
-                      _("`%s' field, reference to `%.255s': "
+                      _("'%s' field, reference to '%.255s': "
                         "version unterminated"), fip->name, depname.buf);
         varbuf_reset(&version);
         varbuf_add_buf(&version, versionstart, versionlength);
@@ -590,14 +590,14 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
       if (!*p || *p == ',') break;
       if (*p != '|')
         parse_error(ps,
-                    _("`%s' field, syntax error after reference to package `%.255s'"),
+                    _("'%s' field, syntax error after reference to package '%.255s'"),
                     fip->name, dop->ed->name);
       if (fip->integer == dep_conflicts ||
           fip->integer == dep_breaks ||
           fip->integer == dep_provides ||
           fip->integer == dep_replaces)
         parse_error(ps,
-                    _("alternatives (`|') not allowed in %s field"), fip->name);
+                    _("alternatives ('|') not allowed in %s field"), fip->name);
       p++;
       while (c_isspace(*p))
         p++;
@@ -662,11 +662,11 @@ f_trigpend(struct pkginfo *pend, struct pkgbin *pkgbin,
     emsg = trig_name_is_illegal(word);
     if (emsg)
       parse_error(ps,
-                  _("illegal pending trigger name `%.255s': %s"), word, emsg);
+                  _("illegal pending trigger name '%.255s': %s"), word, emsg);
 
     if (!trig_note_pend_core(pend, nfstrsave(word)))
       parse_error(ps,
-                  _("duplicate pending trigger `%.255s'"), word);
+                  _("duplicate pending trigger '%.255s'"), word);
   }
 }
 
@@ -689,12 +689,12 @@ f_trigaw(struct pkginfo *aw, struct pkgbin *pkgbin,
     pend = pkg_spec_parse_pkg(word, &err);
     if (pend == NULL)
       parse_error(ps,
-                  _("illegal package name in awaited trigger `%.255s': %s"),
+                  _("illegal package name in awaited trigger '%.255s': %s"),
                   word, err.str);
 
     if (!trig_note_aw(pend, aw))
       parse_error(ps,
-                  _("duplicate awaited trigger package `%.255s'"), word);
+                  _("duplicate awaited trigger package '%.255s'"), word);
 
     trig_awaited_pend_enqueue(pend);
   }

lib/dpkg/options.c

@@ -137,8 +137,10 @@ dpkg_options_load_file(const char *fn, const struct cmdinfo *cmdinfos)
         *cip->iassignto = cip->arg_int;
     }
   }
-  if (ferror(file)) ohshite(_("read error in configuration file `%.255s'"), fn);
-  if (fclose(file)) ohshite(_("error closing configuration file `%.255s'"), fn);
+  if (ferror(file))
+    ohshite(_("read error in configuration file '%.255s'"), fn);
+  if (fclose(file))
+    ohshite(_("error closing configuration file '%.255s'"), fn);
 }
 
 static int
@@ -286,7 +288,7 @@ dpkg_options_parse_arg_int(const struct cmdinfo *cmd, const char *str)
   errno = 0;
   value = strtol(str, &end, 0);
   if (str == end || *end || value < 0 || value > INT_MAX || errno != 0)
-    badusage(_("invalid integer for --%s: `%.250s'"), cmd->olong, str);
+    badusage(_("invalid integer for --%s: '%.250s'"), cmd->olong, str);
 
   return value;
 }

lib/dpkg/parse.c

@@ -137,7 +137,7 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs,
   if (fip->name) {
     if ((*ip)++)
       parse_error(ps,
-                  _("duplicate value for `%s' field"), fip->name);
+                  _("duplicate value for '%s' field"), fip->name);
 
     varbuf_reset(&fs->value);
     varbuf_add_buf(&fs->value, fs->valuestart, fs->valuelen);
@@ -149,14 +149,14 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs,
 
     if (fs->fieldlen < 2)
       parse_error(ps,
-                  _("user-defined field name `%.*s' too short"),
+                  _("user-defined field name '%.*s' too short"),
                   fs->fieldlen, fs->fieldstart);
     larpp = &pkg_obj->pkgbin->arbs;
     while ((arp = *larpp) != NULL) {
       if (strncasecmp(arp->name, fs->fieldstart, fs->fieldlen) == 0 &&
           strlen(arp->name) == (size_t)fs->fieldlen)
         parse_error(ps,
-                   _("duplicate value for user-defined field `%.*s'"),
+                   _("duplicate value for user-defined field '%.*s'"),
                    fs->fieldlen, fs->fieldstart);
       larpp = &arp->next;
     }
@@ -542,7 +542,7 @@ parsedb_open(const char *filename, enum parsedbflags flags)
 
   fd = open(filename, O_RDONLY);
   if (fd == -1)
-    ohshite(_("failed to open package info file `%.255s' for reading"),
+    ohshite(_("failed to open package info file '%.255s' for reading"),
             filename);
 
   ps = parsedb_new(filename, fd, flags | pdb_close_fd);
@@ -561,7 +561,7 @@ parsedb_load(struct parsedb_state *ps)
   struct stat st;
 
   if (fstat(ps->fd, &st) == -1)
-    ohshite(_("can't stat package info file `%.255s'"), ps->filename);
+    ohshite(_("can't stat package info file '%.255s'"), ps->filename);
 
   if (S_ISFIFO(st.st_mode)) {
     struct varbuf buf = VARBUF_INIT;
@@ -580,7 +580,7 @@ parsedb_load(struct parsedb_state *ps)
 #ifdef USE_MMAP
     ps->dataptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, ps->fd, 0);
     if (ps->dataptr == MAP_FAILED)
-      ohshite(_("can't mmap package info file `%.255s'"), ps->filename);
+      ohshite(_("can't mmap package info file '%.255s'"), ps->filename);
 #else
     ps->dataptr = m_malloc(st.st_size);
 
@@ -640,13 +640,13 @@ parse_stanza(struct parsedb_state *ps, struct field_state *fs,
                   fs->fieldlen, fs->fieldstart);
     if (c == '\n')
       parse_error(ps,
-                  _("newline in field name `%.*s'"), fs->fieldlen, fs->fieldstart);
+                  _("newline in field name '%.*s'"), fs->fieldlen, fs->fieldstart);
     if (c == MSDOS_EOF_CHAR)
       parse_error(ps, _("MSDOS end of file (^Z) in field name '%.*s'"),
                   fs->fieldlen, fs->fieldstart);
     if (c != ':')
       parse_error(ps,
-                  _("field name `%.*s' must be followed by colon"),
+                  _("field name '%.*s' must be followed by colon"),
                   fs->fieldlen, fs->fieldstart);
 
     /* Skip space after ‘:’ but before value and EOL. */
@@ -722,7 +722,7 @@ parsedb_close(struct parsedb_state *ps)
     pop_cleanup(ehflag_normaltidy);
 
     if (close(ps->fd))
-      ohshite(_("failed to close after read: `%.255s'"), ps->filename);
+      ohshite(_("failed to close after read: '%.255s'"), ps->filename);
   }
 
   if (ps->data != NULL) {
@@ -805,7 +805,7 @@ parsedb_parse(struct parsedb_state *ps, struct pkginfo **donep)
 
   varbuf_destroy(&fs.value);
   if (donep && !pdone)
-    ohshit(_("no package information in `%.255s'"), ps->filename);
+    ohshit(_("no package information in '%.255s'"), ps->filename);
 
   return pdone;
 }

lib/dpkg/parsehelp.c

@@ -118,7 +118,7 @@ pkg_name_is_illegal(const char *p)
   if (!c) return NULL;
 
   snprintf(buf, sizeof(buf), _(
-	   "character `%c' not allowed (only letters, digits and characters `%s')"),
+	   "character '%c' not allowed (only letters, digits and characters '%s')"),
 	   c, alsoallowed);
   return buf;
 }

lib/dpkg/trigdeferred.l

@@ -72,8 +72,8 @@ static const struct trigdefmeths *trigdef;
 <midline>[ \t]	/* whitespace */
 <midline>[-0-9a-z][-:+.0-9a-z]*	{
 	if (trigdef_yytext[0] == '-' && trigdef_yytext[1])
-		ohshit(_("invalid package name `%.250s' in triggers deferred "
-		         "file `%.250s'"), trigdef_yytext, fn.buf);
+		ohshit(_("invalid package name '%.250s' in triggers deferred "
+		         "file '%.250s'"), trigdef_yytext, fn.buf);
 	trigdef->package(trigdef_yytext);
 	}
 <midline>\n|#.*\n	{
@@ -81,12 +81,12 @@ static const struct trigdefmeths *trigdef;
 	BEGIN(0);
 	}
 <midline><<EOF>>	{
-	ohshit(_("truncated triggers deferred file `%.250s'"), fn.buf);
+	ohshit(_("truncated triggers deferred file '%.250s'"), fn.buf);
 	}
 
 <*>.	{
-	ohshit(_("syntax error in triggers deferred file `%.250s' at "
-	         "character `%s'%s"),
+	ohshit(_("syntax error in triggers deferred file '%.250s' at "
+	         "character '%s'%s"),
 	       fn.buf, yytext, YY_START == midline ? " midline": "");
 	}
 
@@ -132,7 +132,7 @@ trigdef_update_start(enum trigdef_update_flags uf)
 			if (lock_fd == -1) {
 				if (!(errno == ENOENT && (uf & TDUF_NO_LOCK_OK)))
 					ohshite(_("unable to open/create "
-					          "triggers lockfile `%.250s'"),
+					          "triggers lockfile '%.250s'"),
 					        fn.buf);
 				return TDUS_ERROR_NO_DIR;
 			}
@@ -151,7 +151,7 @@ trigdef_update_start(enum trigdef_update_flags uf)
 	old_deferred = fopen(fn.buf, "r");
 	if (!old_deferred) {
 		if (errno != ENOENT)
-			ohshite(_("unable to open triggers deferred file `%.250s'"),
+			ohshite(_("unable to open triggers deferred file '%.250s'"),
 			        fn.buf);
 		if (!(uf & TDUF_WRITE_IF_ENOENT)) {
 			pop_cleanup(ehflag_normaltidy);
@@ -165,7 +165,7 @@ trigdef_update_start(enum trigdef_update_flags uf)
 
 		rc = fstat(fileno(old_deferred), &stab);
 		if (rc < 0)
-			ohshite(_("unable to stat triggers deferred file `%.250s'"),
+			ohshite(_("unable to stat triggers deferred file '%.250s'"),
 			        fn.buf);
 
 		if (stab.st_size == 0 && !(uf & TDUF_WRITE_IF_EMPTY)) {
@@ -180,7 +180,7 @@ trigdef_update_start(enum trigdef_update_flags uf)
 			fclose(trig_new_deferred);
 		trig_new_deferred = fopen(newfn.buf, "w");
 		if (!trig_new_deferred)
-			ohshite(_("unable to open/create new triggers deferred file `%.250s'"),
+			ohshite(_("unable to open/create new triggers deferred file '%.250s'"),
 			        newfn.buf);
 
 		setcloexec(fileno(trig_new_deferred), newfn.buf);
@@ -218,7 +218,7 @@ trigdef_process_done(void)
 
 	if (old_deferred) {
 		if (ferror(old_deferred))
-			ohshite(_("error reading triggers deferred file `%.250s'"),
+			ohshite(_("error reading triggers deferred file '%.250s'"),
 			        fn.buf);
 		fclose(old_deferred);
 		old_deferred = NULL;
@@ -227,16 +227,16 @@ trigdef_process_done(void)
 	if (trig_new_deferred) {
 		if (ferror(trig_new_deferred))
 			ohshite(_("unable to write new triggers deferred "
-			          "file `%.250s'"), newfn.buf);
+			          "file '%.250s'"), newfn.buf);
 		r = fclose(trig_new_deferred);
 		trig_new_deferred = NULL;
 		if (r)
 			ohshite(_("unable to close new triggers deferred "
-			          "file `%.250s'"), newfn.buf);
+			          "file '%.250s'"), newfn.buf);
 
 		if (rename(newfn.buf, fn.buf))
 			ohshite(_("unable to install new triggers deferred "
-			          "file `%.250s'"), fn.buf);
+			          "file '%.250s'"), fn.buf);
 
 		dir_sync_path(triggersdir);
 	}

lib/dpkg/triglib.c

@@ -226,8 +226,8 @@ trk_unknown_interest_change(const char *trig, struct pkginfo *pkg,
                             struct pkgbin *pkgbin, int signum,
                             enum trig_options opts)
 {
-	ohshit(_("invalid or unknown syntax in trigger name `%.250s'"
-	         " (in trigger interests for package `%.250s')"),
+	ohshit(_("invalid or unknown syntax in trigger name '%.250s'"
+	         " (in trigger interests for package '%.250s')"),
 	       trig, pkgbin_name(pkg, pkgbin, pnaw_nonambig));
 }
 
@@ -267,7 +267,7 @@ trk_explicit_start(const char *trig)
 	trk_explicit_f = fopen(trk_explicit_fn.buf, "r");
 	if (!trk_explicit_f) {
 		if (errno != ENOENT)
-			ohshite(_("failed to open trigger interest list file `%.250s'"),
+			ohshite(_("failed to open trigger interest list file '%.250s'"),
 			        trk_explicit_fn.buf);
 	}
 }
@@ -295,7 +295,7 @@ trk_explicit_activate_awaiter(struct pkginfo *aw)
 		return;
 
 	if (fseek(trk_explicit_f, 0, SEEK_SET))
-		ohshite(_("failed to rewind trigger interest file `%.250s'"),
+		ohshite(_("failed to rewind trigger interest file '%.250s'"),
 		        trk_explicit_fn.buf);
 
 	while (trk_explicit_fgets(buf, sizeof(buf)) >= 0) {
@@ -314,8 +314,8 @@ trk_explicit_activate_awaiter(struct pkginfo *aw)
 
 		pend = pkg_spec_parse_pkg(buf, &err);
 		if (pend == NULL)
-			ohshit(_("trigger interest file `%.250s' syntax error; "
-			         "illegal package name `%.250s': %.250s"),
+			ohshit(_("trigger interest file '%.250s' syntax error; "
+			         "illegal package name '%.250s': %.250s"),
 			       trk_explicit_fn.buf, buf, err.str);
 
 		trig_record_activation(pend, noawait ? NULL : aw,
@@ -432,8 +432,8 @@ trk_file_interest_change(const char *trig, struct pkginfo *pkg,
 found:
 	tfi->options = opts;
 	if (signum > 1)
-		ohshit(_("duplicate file trigger interest for filename `%.250s' "
-		         "and package `%.250s'"), trig,
+		ohshit(_("duplicate file trigger interest for filename '%.250s' "
+		         "and package '%.250s'"), trig,
 		       pkgbin_name(pkg, pkgbin, pnaw_nonambig));
 	if (signum > 0)
 		return;
@@ -449,7 +449,7 @@ static void
 trig_file_interests_remove(void)
 {
 	if (unlink(triggersfilefile) && errno != ENOENT)
-		ohshite(_("cannot remove `%.250s'"), triggersfilefile);
+		ohshite(_("cannot remove '%.250s'"), triggersfilefile);
 }
 
 static void
@@ -503,7 +503,7 @@ trig_file_interests_ensure(void)
 	if (!f) {
 		if (errno == ENOENT)
 			goto ok;
-		ohshite(_("unable to read file triggers file `%.250s'"),
+		ohshite(_("unable to read file triggers file '%.250s'"),
 		        triggersfilefile);
 	}
 
@@ -514,7 +514,7 @@ trig_file_interests_ensure(void)
 		enum trig_options trig_opts = TRIG_AWAIT;
 		space = strchr(linebuf, ' ');
 		if (!space || linebuf[0] != '/')
-			ohshit(_("syntax error in file triggers file `%.250s'"),
+			ohshit(_("syntax error in file triggers file '%.250s'"),
 			       triggersfilefile);
 		*space++ = '\0';
 
@@ -531,8 +531,8 @@ trig_file_interests_ensure(void)
 		pkg = pkg_spec_parse_pkg(space, &err);
 		if (pkg == NULL)
 			ohshit(_("file triggers record mentions illegal "
-			         "package name `%.250s' (for interest in file "
-			         "`%.250s'): %.250s"), space, linebuf, err.str);
+			         "package name '%.250s' (for interest in file "
+			         "'%.250s'): %.250s"), space, linebuf, err.str);
 		pkgbin = &pkg->installed;
 
 		trk_file_interest_change(linebuf, pkg, pkgbin, +2, trig_opts);
@@ -669,8 +669,8 @@ parse_ci_call(const char *file, const char *cmd, trig_parse_cicb *cb,
 
 	emsg = trig_name_is_illegal(trig);
 	if (emsg)
-		ohshit(_("triggers ci file `%.250s' contains illegal trigger "
-		         "syntax in trigger name `%.250s': %.250s"),
+		ohshit(_("triggers ci file '%.250s' contains illegal trigger "
+		         "syntax in trigger name '%.250s': %.250s"),
 		       file, trig, emsg);
 	if (cb)
 		cb(trig, pkg, pkgbin, opts);
@@ -689,7 +689,7 @@ trig_parse_ci(const char *file, trig_parse_cicb *interest,
 	if (!f) {
 		if (errno == ENOENT)
 			return; /* No file is just like an empty one. */
-		ohshite(_("unable to open triggers ci file `%.250s'"), file);
+		ohshite(_("unable to open triggers ci file '%.250s'"), file);
 	}
 	push_cleanup(cu_closestream, ~0, NULL, 0, 1, f);
 
@@ -719,7 +719,7 @@ trig_parse_ci(const char *file, trig_parse_cicb *interest,
 		} else if (strcmp(cmd, "activate-noawait") == 0) {
 			parse_ci_call(file, cmd, activate, spc, pkg, pkgbin, TRIG_NOAWAIT);
 		} else {
-			ohshit(_("triggers ci file contains unknown directive `%.250s'"),
+			ohshit(_("triggers ci file contains unknown directive '%.250s'"),
 			       cmd);
 		}
 	}
@@ -786,10 +786,10 @@ trig_incorporate(enum modstatdb_rw cstatus)
 		if (mkdir(triggersdir, 0755)) {
 			if (errno != EEXIST)
 				ohshite(_("unable to create triggers state"
-				          " directory `%.250s'"), triggersdir);
+				          " directory '%.250s'"), triggersdir);
 		} else if (chown(triggersdir, 0, 0)) {
 			ohshite(_("unable to set ownership of triggers state"
-			          " directory `%.250s'"), triggersdir);
+			          " directory '%.250s'"), triggersdir);
 		}
 		ur = trigdef_update_start(tduf);
 	}

lib/dpkg/utils.c

@@ -30,14 +30,14 @@ fgets_checked(char *buf, size_t bufsz, FILE *f, const char *fn)
 
 	if (!fgets(buf, bufsz, f)) {
 		if (ferror(f))
-			ohshite(_("read error in `%.250s'"), fn);
+			ohshite(_("read error in '%.250s'"), fn);
 		return -1;
 	}
 	l = strlen(buf);
 	if (l == 0)
-		ohshit(_("fgets gave an empty string from `%.250s'"), fn);
+		ohshit(_("fgets gave an empty string from '%.250s'"), fn);
 	if (buf[--l] != '\n')
-		ohshit(_("too-long line or missing newline in `%.250s'"), fn);
+		ohshit(_("too-long line or missing newline in '%.250s'"), fn);
 	buf[l] = '\0';
 
 	return l;

scripts/Dpkg/Changelog/Entry/Debian.pm

@@ -128,7 +128,7 @@ sub check_header {
 	my %optdone;
 	foreach my $opt (split(/\s*,\s*/, $options)) {
 	    unless ($opt =~ m/^([-0-9a-z]+)\=\s*(.*\S)$/i) {
-		push @errors, sprintf(g_("bad key-value after \`;': \`%s'"), $opt);
+		push @errors, sprintf(g_("bad key-value after ';': '%s'"), $opt);
 		next;
 	    }
 	    my ($k, $v) = (field_capitalize($1), $2);

scripts/Dpkg/Control/HashCore.pm

@@ -243,7 +243,7 @@ sub parse {
 		s/\s*\n$//;
 		unless (m/^-----BEGIN PGP SIGNATURE-----$/) {
 		    $self->parse_error($desc, g_('expected OpenPGP signature, ' .
-		                                 "found something else \`%s'"), $_);
+		                                 "found something else '%s'"), $_);
                 }
 		# Skip OpenPGP signature
 		while (<$fh>) {

scripts/Dpkg/Source/Functions.pm

@@ -43,7 +43,7 @@ sub erasedir {
         return if $! == ENOENT;
         syserr(g_("unable to check for removal of directory '%s'"), $dir);
     }
-    error(g_("rm -rf failed to remove `%s'"), $dir);
+    error(g_("rm -rf failed to remove '%s'"), $dir);
 }
 
 sub fixperms {

scripts/Dpkg/Source/Package.pm

@@ -289,7 +289,7 @@ sub upgrade_object_type {
         }
         bless $self, $module;
     } else {
-        error(g_("invalid Format field `%s'"), $format);
+        error(g_("invalid Format field '%s'"), $format);
     }
 }
 

scripts/Dpkg/Source/Package/V1.pm

@@ -131,7 +131,7 @@ sub do_extract {
         erasedir($newdirectory);
         if (-e $expectprefix) {
             rename($expectprefix, "$newdirectory.tmp-keep")
-                or syserr(g_("unable to rename `%s' to `%s'"), $expectprefix,
+                or syserr(g_("unable to rename '%s' to '%s'"), $expectprefix,
                           "$newdirectory.tmp-keep");
         }
 
@@ -211,7 +211,7 @@ sub do_build {
     my $origtargz = $self->get_basename() . '.orig.tar.gz';
     if (-e $origtargz) {
         unless (-f $origtargz) {
-            error(g_("packed orig `%s' exists but is not a plain file"), $origtargz);
+            error(g_("packed orig '%s' exists but is not a plain file"), $origtargz);
         }
     } else {
         $origtargz = undef;
@@ -262,12 +262,12 @@ sub do_build {
 	} else {
 	    if (stat($origdir)) {
 		unless (-d _) {
-                    error(g_("unpacked orig `%s' exists but is not a directory"),
+                    error(g_("unpacked orig '%s' exists but is not a directory"),
 		          $origdir);
                 }
 		$sourcestyle =~ y/aA/rR/; # .orig directory
 	    } elsif ($! != ENOENT) {
-		syserr(g_("unable to stat putative unpacked orig `%s'"), $origdir);
+		syserr(g_("unable to stat putative unpacked orig '%s'"), $origdir);
 	    } else {
 		$sourcestyle =~ y/aA/nn/; # Native tar.gz
 	    }
@@ -306,11 +306,11 @@ sub do_build {
     } elsif ($sourcestyle =~ m/[nurUR]/) {
         if (stat($tarname)) {
             unless ($sourcestyle =~ m/[nUR]/) {
-		error(g_("tarfile `%s' already exists, not overwriting, " .
+		error(g_("tarfile '%s' already exists, not overwriting, " .
 		         'giving up; use -sU or -sR to override'), $tarname);
             }
         } elsif ($! != ENOENT) {
-	    syserr(g_("unable to check for existence of `%s'"), $tarname);
+	    syserr(g_("unable to check for existence of '%s'"), $tarname);
         }
 
 	info(g_('building %s in %s'),
@@ -325,10 +325,10 @@ sub do_build {
 	$tar->add_directory($tardirname);
 	$tar->finish();
 	rename($newtar, $tarname)
-	    or syserr(g_("unable to rename `%s' (newly created) to `%s'"),
+	    or syserr(g_("unable to rename '%s' (newly created) to '%s'"),
 	              $newtar, $tarname);
 	chmod(0666 &~ umask(), $tarname)
-	    or syserr(g_("unable to change permission of `%s'"), $tarname);
+	    or syserr(g_("unable to change permission of '%s'"), $tarname);
     } else {
 	info(g_('building %s using existing %s'),
 	     $sourcepackage, $tarname);
@@ -389,10 +389,10 @@ sub do_build {
 	}
 
 	rename($newdiffgz, $diffname)
-	    or syserr(g_("unable to rename `%s' (newly created) to `%s'"),
+	    or syserr(g_("unable to rename '%s' (newly created) to '%s'"),
 	              $newdiffgz, $diffname);
 	chmod(0666 &~ umask(), $diffname)
-	    or syserr(g_("unable to change permission of `%s'"), $diffname);
+	    or syserr(g_("unable to change permission of '%s'"), $diffname);
 
 	$self->add_file($diffname);
     }

scripts/Dpkg/Source/Package/V2.pm

@@ -173,7 +173,8 @@ sub do_extract {
         my $file = $addonfile{$subdir};
         info(g_('unpacking %s'), $file);
         if (-e "$newdirectory/$subdir") {
-            warning(g_("required removal of `%s' installed by original tarball"), $subdir);
+            warning(g_("required removal of '%s' installed by original tarball"),
+                    $subdir);
             erasedir("$newdirectory/$subdir");
         }
         $tar = Dpkg::Source::Archive->new(filename => "$dscdir$file");
@@ -440,7 +441,7 @@ sub do_build {
     my ($self, $dir) = @_;
     my @argv = @{$self->{options}{ARGV}};
     if (scalar(@argv)) {
-        usageerr(g_("-b takes only one parameter with format `%s'"),
+        usageerr(g_("-b takes only one parameter with format '%s'"),
                  $self->{fields}{'Format'});
     }
     $self->prepare_build($dir);
@@ -477,13 +478,13 @@ sub do_build {
         my $reldir = File::Spec->abs2rel($File::Find::dir, $dir);
         my $cwd = getcwd();
         # Apply the pattern both from the top dir and from the inspected dir
-        chdir($dir) or syserr(g_("unable to chdir to `%s'"), $dir);
+        chdir $dir or syserr(g_("unable to chdir to '%s'"), $dir);
         $exclude{$_} = 1 foreach glob($tar_ignore_glob);
-        chdir($cwd) or syserr(g_("unable to chdir to `%s'"), $cwd);
+        chdir $cwd or syserr(g_("unable to chdir to '%s'"), $cwd);
         chdir($File::Find::dir)
-            or syserr(g_("unable to chdir to `%s'"), $File::Find::dir);
+            or syserr(g_("unable to chdir to '%s'"), $File::Find::dir);
         $exclude{$_} = 1 foreach glob($tar_ignore_glob);
-        chdir($cwd) or syserr(g_("unable to chdir to `%s'"), $cwd);
+        chdir $cwd or syserr(g_("unable to chdir to '%s'"), $cwd);
         my @result;
         foreach my $fn (@_) {
             unless (exists $exclude{$fn} or exists $exclude{"$reldir/$fn"}) {
@@ -611,7 +612,7 @@ sub register_patch {
         copy($patch_file, $patch)
             or syserr(g_('failed to copy %s to %s'), $patch_file, $patch);
         chmod(0666 & ~ umask(), $patch)
-            or syserr(g_("unable to change permission of `%s'"), $patch);
+            or syserr(g_("unable to change permission of '%s'"), $patch);
         my $applied = File::Spec->catfile($dir, 'debian', 'patches', '.dpkg-source-applied');
         open(my $applied_fh, '>>', $applied)
             or syserr(g_('cannot write %s'), $applied);

scripts/Dpkg/Source/Package/V3/Bzr.pm

@@ -96,7 +96,7 @@ sub do_build {
     my ($dirname, $updir) = fileparse($dir);
 
     if (scalar(@argv)) {
-        usageerr(g_("-b takes only one parameter with format `%s'"),
+        usageerr(g_("-b takes only one parameter with format '%s'"),
                  $self->{fields}{'Format'});
     }
 
@@ -109,7 +109,7 @@ sub do_build {
     sanity_check($dir);
 
     my $old_cwd = getcwd();
-    chdir($dir) or syserr(g_("unable to chdir to `%s'"), $dir);
+    chdir $dir or syserr(g_("unable to chdir to '%s'"), $dir);
 
     local $_;
 
@@ -133,7 +133,7 @@ sub do_build {
               join(' ', @files));
     }
 
-    chdir($old_cwd) or syserr(g_("unable to chdir to `%s'"), $old_cwd);
+    chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd);
 
     my $tmp = tempdir("$dirname.bzr.XXXXXX", DIR => $updir);
     push_exit_handler(sub { erasedir($tmp) });
@@ -199,13 +199,13 @@ sub do_extract {
 
     my $old_cwd = getcwd();
     chdir($newdirectory)
-        or syserr(g_("unable to chdir to `%s'"), $newdirectory);
+        or syserr(g_("unable to chdir to '%s'"), $newdirectory);
 
     # Reconstitute the working tree.
     system('bzr', 'checkout');
     subprocerr('bzr checkout') if $?;
 
-    chdir($old_cwd) or syserr(g_("unable to chdir to `%s'"), $old_cwd);
+    chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd);
 }
 
 1;

scripts/Dpkg/Source/Package/V3/Custom.pm

@@ -36,7 +36,7 @@ sub parse_cmdline_option {
     return 0;
 }
 sub do_extract {
-    error(g_("Format `3.0 (custom)' is only used to create source packages"));
+    error(g_("Format '3.0 (custom)' is only used to create source packages"));
 }
 
 sub can_build {

scripts/Dpkg/Source/Package/V3/Git.pm

@@ -102,7 +102,7 @@ sub do_build {
     sanity_check($dir);
 
     my $old_cwd = getcwd();
-    chdir($dir) or syserr(g_("unable to chdir to `%s'"), $dir);
+    chdir $dir or syserr(g_("unable to chdir to '%s'"), $dir);
 
     # Check for uncommitted files.
     # To support dpkg-source -i, get a list of files
@@ -142,7 +142,7 @@ sub do_build {
     my $tmp;
     my $shallowfile;
     if ($self->{options}{git_depth}) {
-        chdir($old_cwd) or syserr(g_("unable to chdir to `%s'"), $old_cwd);
+        chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd);
         $tmp = tempdir("$dirname.git.XXXXXX", DIR => $updir);
         push_exit_handler(sub { erasedir($tmp) });
         my $clone_dir = "$tmp/repo.git";
@@ -154,7 +154,7 @@ sub do_build {
                '--quiet', '--bare', 'file://' . abs_path($dir), $clone_dir);
         subprocerr('git clone') if $?;
         chdir($clone_dir)
-            or syserr(g_("unable to chdir to `%s'"), $clone_dir);
+            or syserr(g_("unable to chdir to '%s'"), $clone_dir);
         $shallowfile = "$basenamerev.gitshallow";
         system('cp', '-f', 'shallow', "$old_cwd/$shallowfile");
         subprocerr('cp shallow') if $?;
@@ -172,7 +172,7 @@ sub do_build {
     );
     subprocerr('git bundle') if $?;
 
-    chdir($old_cwd) or syserr(g_("unable to chdir to `%s'"), $old_cwd);
+    chdir $old_cwd or syserr(g_("unable to chdir to '%s'"), $old_cwd);
 
     if (defined $tmp) {
         erasedir($tmp);

scripts/Dpkg/Source/Package/V3/Native.pm

@@ -80,7 +80,7 @@ sub do_build {
     my @argv = @{$self->{options}{ARGV}};
 
     if (scalar(@argv)) {
-        usageerr(g_("-b takes only one parameter with format `%s'"),
+        usageerr(g_("-b takes only one parameter with format '%s'"),
                  $self->{fields}{'Format'});
     }
 
@@ -102,11 +102,11 @@ sub do_build {
     $tar->add_directory($dirname);
     $tar->finish();
     rename($newtar, $tarname)
-        or syserr(g_("unable to rename `%s' (newly created) to `%s'"),
+        or syserr(g_("unable to rename '%s' (newly created) to '%s'"),
                   $newtar, $tarname);
     pop_exit_handler();
     chmod(0666 &~ umask(), $tarname)
-        or syserr(g_("unable to change permission of `%s'"), $tarname);
+        or syserr(g_("unable to change permission of '%s'"), $tarname);
 
     $self->add_file($tarname);
 }

scripts/Dpkg/Source/Package/V3/Quilt.pm

@@ -230,7 +230,7 @@ sub register_patch {
         copy($tmpdiff, $patch)
             or syserr(g_('failed to copy %s to %s'), $tmpdiff, $patch);
         chmod(0666 & ~ umask(), $patch)
-            or syserr(g_("unable to change permission of `%s'"), $patch);
+            or syserr(g_("unable to change permission of '%s'"), $patch);
     } elsif (-e $patch) {
         unlink($patch) or syserr(g_('cannot remove %s'), $patch);
     }

scripts/Dpkg/Source/Patch.pm

@@ -120,7 +120,7 @@ sub add_diff_file {
                        'original or modified version)'), $new);
         } else {
             chomp;
-            error(g_("unknown line from diff -u on %s: `%s'"), $new, $_);
+            error(g_("unknown line from diff -u on %s: '%s'"), $new, $_);
         }
 	if (*$self->{empty} and defined(*$self->{header})) {
 	    $self->print(*$self->{header}) or syserr(g_('failed to write'));
@@ -419,7 +419,7 @@ sub analyze {
 	$diff_count++;
 	# read file header (---/+++ pair)
 	unless ($line =~ s/^--- //) {
-	    error(g_("expected ^--- in line %d of diff `%s'"), $., $diff);
+	    error(g_("expected ^--- in line %d of diff '%s'"), $., $diff);
 	}
 	$path{old} = $line = _fetch_filename($diff, $line);
 	if ($line ne '/dev/null' and $line =~ s{^[^/]*/+}{$destdir/}) {
@@ -432,10 +432,12 @@ sub analyze {
 
 	$line = _getline($self);
 	unless (defined $line) {
-	    error(g_("diff `%s' finishes in middle of ---/+++ (line %d)"), $diff, $.);
+	    error(g_("diff '%s' finishes in middle of ---/+++ (line %d)"),
+	          $diff, $.);
 	}
 	unless ($line =~ s/^\+\+\+ //) {
-	    error(g_("line after --- isn't as expected in diff `%s' (line %d)"), $diff, $.);
+	    error(g_("line after --- isn't as expected in diff '%s' (line %d)"),
+	          $diff, $.);
 	}
 	$path{new} = $line = _fetch_filename($diff, $line);
 	if ($line ne '/dev/null' and $line =~ s{^[^/]*/+}{$destdir/}) {
@@ -465,10 +467,10 @@ sub analyze {
 	}
 
         if ($path{old} eq '/dev/null' and $path{new} eq '/dev/null') {
-            error(g_("original and modified files are /dev/null in diff `%s' (line %d)"),
+            error(g_("original and modified files are /dev/null in diff '%s' (line %d)"),
                   $diff, $.);
         } elsif ($path{new} eq '/dev/null') {
-            error(g_("file removal without proper filename in diff `%s' (line %d)"),
+            error(g_("file removal without proper filename in diff '%s' (line %d)"),
                   $diff, $. - 1) unless defined $fn{old};
             if ($opts{verbose}) {
                 warning(g_('diff %s removes a non-existing file %s (line %d)'),
@@ -483,11 +485,12 @@ sub analyze {
 	}
 
 	if (-e $fn and not -f _) {
-	    error(g_("diff `%s' patches something which is not a plain file"), $diff);
+	    error(g_("diff '%s' patches something which is not a plain file"),
+	          $diff);
 	}
 
 	if ($filepatched{$fn}) {
-	    warning(g_("diff `%s' patches file %s twice"), $diff, $fn)
+	    warning(g_("diff '%s' patches file %s twice"), $diff, $fn)
 		if $opts{verbose};
 	} else {
 	    $filepatched{$fn} = 1;
@@ -505,11 +508,11 @@ sub analyze {
 	    while ($olines || $nlines) {
 		unless (defined($line = _getline($self))) {
                     if (($olines == $nlines) and ($olines < 3)) {
-                        warning(g_("unexpected end of diff `%s'"), $diff)
+                        warning(g_("unexpected end of diff '%s'"), $diff)
                             if $opts{verbose};
                         last;
                     } else {
-                        error(g_("unexpected end of diff `%s'"), $diff);
+                        error(g_("unexpected end of diff '%s'"), $diff);
                     }
 		}
 		next if $line =~ /^\\ /;
@@ -522,19 +525,19 @@ sub analyze {
 		} elsif ($line =~ /^\+/) {
 		    --$nlines;
 		} else {
-		    error(g_("expected [ +-] at start of line %d of diff `%s'"),
+		    error(g_("expected [ +-] at start of line %d of diff '%s'"),
 		          $., $diff);
 		}
 	    }
 	    $hunk++;
 	}
 	unless ($hunk) {
-	    error(g_("expected ^\@\@ at line %d of diff `%s'"), $., $diff);
+	    error(g_("expected ^\@\@ at line %d of diff '%s'"), $., $diff);
 	}
     }
     close($self);
     unless ($diff_count) {
-	warning(g_("diff `%s' doesn't contain any patch"), $diff)
+	warning(g_("diff '%s' doesn't contain any patch"), $diff)
 	    if $opts{verbose};
     }
     *$self->{analysis}{$destdir}{dirtocreate} = \%dirtocreate;

scripts/Dpkg/Source/Quilt.pm

@@ -375,7 +375,7 @@ sub restore_quilt_backup_files {
                     copy($_, $target)
                         or syserr(g_('failed to copy %s to %s'), $_, $target);
                     chmod((stat(_))[2], $target)
-                        or syserr(g_("unable to change permission of `%s'"), $target);
+                        or syserr(g_("unable to change permission of '%s'"), $target);
                 }
             } else {
                 # empty files are "backups" for new files that patch created

scripts/Dpkg/Substvars.pm

@@ -280,7 +280,7 @@ sub substvars {
 
         if ($count >= $maxsubsts) {
             error($opts{msg_prefix} .
-	          g_("too many substitutions - recursive ? - in \`%s'"), $v);
+                  g_("too many substitutions - recursive ? - in '%s'"), $v);
         }
         $lhs = $1; $vn = $2; $rhs = $3;
         if (defined($self->{vars}{$vn})) {

scripts/Dpkg/Version.pm

@@ -422,7 +422,7 @@ sub version_check($) {
         return 0;
     }
     if ($str =~ m/([^-+:.0-9a-zA-Z~])/o) {
-        my $msg = sprintf(g_("version number contains illegal character `%s'"), $1);
+        my $msg = sprintf g_("version number contains illegal character '%s'"), $1;
         return (0, $msg) if wantarray;
         return 0;
     }

scripts/dpkg-architecture.pl

@@ -226,7 +226,7 @@ while (@ARGV) {
         version();
        exit 0;
     } else {
-        usageerr(g_("unknown option \`%s'"), $arg);
+        usageerr(g_("unknown option '%s'"), $arg);
     }
 }
 

scripts/dpkg-buildflags.pl

@@ -91,7 +91,7 @@ while (@ARGV) {
         version();
         exit 0;
     } else {
-	usageerr(g_("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option '%s'"), $_);
     }
 }
 

scripts/dpkg-distaddfile.pl

@@ -67,7 +67,7 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     } elsif (m/^--$/) {
         last;
     } else {
-        usageerr(g_("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option '%s'"), $_);
     }
 }
 usageerr(g_('need exactly a filename, section and priority')) if @ARGV != 3;

scripts/dpkg-genchanges.pl

@@ -213,7 +213,7 @@ while (@ARGV) {
 	version();
 	exit(0);
     } else {
-        usageerr(g_("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option '%s'"), $_);
     }
 }
 

scripts/dpkg-gencontrol.pl

@@ -139,7 +139,7 @@ while (@ARGV) {
         version();
         exit(0);
     } else {
-        usageerr(g_("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option '%s'"), $_);
     }
 }
 
@@ -214,10 +214,10 @@ foreach (keys %{$pkg}) {
 	} else {
 	    my @archlist = split(/\s+/, $v);
 	    my @invalid_archs = grep { m/[^\w-]/ } @archlist;
-	    warning(P_("`%s' is not a legal architecture string.",
-	               "`%s' are not legal architecture strings.",
+	    warning(P_("'%s' is not a legal architecture string.",
+	               "'%s' are not legal architecture strings.",
 	               scalar(@invalid_archs)),
-		    join("' `", @invalid_archs))
+	            join("' '", @invalid_archs))
 		if @invalid_archs >= 1;
 	    if (none { debarch_is($host_arch, $_) } @archlist) {
 		error(g_("current host architecture '%s' does not " .
@@ -416,7 +416,7 @@ my $fh_output;
 if (!$stdout) {
     $cf = $outputfile // "$packagebuilddir/DEBIAN/control";
     open($fh_output, '>', "$cf.new")
-        or syserr(g_("cannot open new output control file \`%s'"), "$cf.new");
+        or syserr(g_("cannot open new output control file '%s'"), "$cf.new");
 } else {
     $fh_output = \*STDOUT;
 }
@@ -427,7 +427,7 @@ $fields->output($fh_output);
 if (!$stdout) {
     close($fh_output) or syserr(g_('cannot close %s'), "$cf.new");
     rename("$cf.new", "$cf")
-        or syserr(g_("cannot install output control file \`%s'"), $cf);
+        or syserr(g_("cannot install output control file '%s'"), $cf);
 }
 
 $substvars->warn_about_unused();

scripts/dpkg-gensymbols.pl

@@ -137,7 +137,7 @@ while (@ARGV) {
 	version();
 	exit(0);
     } else {
-	usageerr(g_("unknown option \`%s'"), $_);
+	usageerr(g_("unknown option '%s'"), $_);
     }
 }
 

scripts/dpkg-name.pl

@@ -242,7 +242,7 @@ while (@ARGV) {
         push @files, @ARGV;
         last;
     } elsif (m/^-/) {
-        usageerr(g_("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option '%s'"), $_);
     } else {
         push @files, $_;
     }

scripts/dpkg-parsechangelog.pl

@@ -118,7 +118,7 @@ while (@ARGV) {
     } elsif ($arg eq '--version') {
 	version(); exit(0);
     } else {
-	usageerr(g_("unknown option \`%s'"), $arg);
+	usageerr(g_("unknown option '%s'"), $arg);
     }
 }
 usageerr(g_('takes no non-option arguments')) if @ARGV;

scripts/dpkg-scanpackages.pl

@@ -208,7 +208,7 @@ FILE:
 	    or error(g_("couldn't parse control information from %s"), $fn);
 	wait_child($pid, nocheck => 1);
 	if ($?) {
-	    warning(g_("\`dpkg-deb -I %s control' exited with %d, skipping package"),
+	    warning(g_("'dpkg-deb -I %s control' exited with %d, skipping package"),
 	            $fn, $?);
 	    next;
 	}

scripts/dpkg-scansources.pl

@@ -101,7 +101,7 @@ See the man page for the full documentation.
 
 sub close_msg {
     my $name = shift;
-    return sprintf(g_("error closing %s (\$? %d, \$! `%s')"),
+    return sprintf(g_("error closing %s (\$? %d, \$! '%s')"),
                    $name, $?, $!)."\n";
 }
 

scripts/dpkg-shlibdeps.pl

@@ -130,7 +130,7 @@ foreach (@ARGV) {
     } elsif (m/^-x(.*)$/) {
 	push @exclude, $1;
     } elsif (m/^-/) {
-	usageerr(g_("unknown option \`%s'"), $_);
+	usageerr(g_("unknown option '%s'"), $_);
     } else {
 	if (exists $exec{$_}) {
 	    # Affect the binary to the most important field
@@ -452,14 +452,14 @@ if ($stdout) {
     $fh = \*STDOUT;
 } else {
     open(my $new_fh, '>', "$varlistfile.new")
-        or syserr(g_("open new substvars file \`%s'"), "$varlistfile.new");
+        or syserr(g_("open new substvars file '%s'"), "$varlistfile.new");
     if (-e $varlistfile) {
 	open(my $old_fh, '<', $varlistfile)
-	    or syserr(g_("open old varlist file \`%s' for reading"), $varlistfile);
+	    or syserr(g_("open old varlist file '%s' for reading"), $varlistfile);
 	while (my $entry = <$old_fh>) {
 	    next if $entry =~ m/^\Q$varnameprefix\E:/;
 	    print { $new_fh } $entry
-	        or syserr(g_("copy old entry to new varlist file \`%s'"),
+	        or syserr(g_("copy old entry to new varlist file '%s'"),
 	                  "$varlistfile.new");
 	}
 	close($old_fh);
@@ -534,7 +534,7 @@ foreach my $field (reverse @depfields) {
 if (!$stdout) {
     close($fh) or syserr(g_('cannot close %s'), "$varlistfile.new");
     rename "$varlistfile.new", $varlistfile
-        or syserr(g_("install new varlist file \`%s'"), $varlistfile);
+        or syserr(g_("install new varlist file '%s'"), $varlistfile);
 }
 
 ##
@@ -686,13 +686,13 @@ sub extract_from_shlibs {
     }
     # Open shlibs file
     open(my $shlibs_fh, '<', $shlibfile)
-        or syserr(g_("unable to open shared libs info file \`%s'"), $shlibfile);
+        or syserr(g_("unable to open shared libs info file '%s'"), $shlibfile);
     my $dep;
     while (<$shlibs_fh>) {
 	s/\s*\n$//;
 	next if m/^\#/;
 	if (!m/^\s*(?:(\S+):\s+)?(\S+)\s+(\S+)(?:\s+(\S.*\S))?\s*$/) {
-	    warning(g_("shared libs info file \`%s' line %d: bad line \`%s'"),
+	    warning(g_("shared libs info file '%s' line %d: bad line '%s'"),
 	            $shlibfile, $., $_);
 	    next;
 	}

scripts/dpkg-source.pl

@@ -116,7 +116,7 @@ if (defined($options{opmode}) &&
     if ($dir eq '.') {
 	# . is never correct, adjust automatically
 	$dir = basename(cwd());
-	chdir('..') or syserr(g_("unable to chdir to `%s'"), '..');
+	chdir '..' or syserr(g_("unable to chdir to '%s'"), '..');
     }
     # --format options are not allowed, they would take precedence
     # over real command line options, debian/source/format should be used
@@ -309,11 +309,11 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
                     push(@sourcearch, $v) unless $archadded{$v}++;
                 } else {
                     for my $a (split(/\s+/, $v)) {
-                        error(g_("`%s' is not a legal architecture string"),
+                        error(g_("'%s' is not a legal architecture string"),
                               $a)
                             unless $a =~ /^[\w-]+$/;
                         error(g_('architecture %s only allowed on its ' .
-                                 "own (list for package %s is `%s')"),
+                                 "own (list for package %s is '%s')"),
                               $a, $p, $a)
                             if $a eq 'any' or $a eq 'all';
                         push(@sourcearch, $a) unless $archadded{$a}++;
@@ -423,7 +423,7 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
     error(g_("can't build with source format '%s': %s"), $build_format, $msg) unless $res;
 
     # Only -b left
-    info(g_("using source format `%s'"), $fields->{'Format'});
+    info(g_("using source format '%s'"), $fields->{'Format'});
     run_vendor_hook('before-source-build', $srcpkg);
     # Build the files (.tar.gz, .diff.gz, etc)
     $srcpkg->build($dir);

scripts/dpkg-vendor.pl

@@ -73,7 +73,7 @@ while (@ARGV) {
         version();
         exit 0;
     } else {
-	usageerr(g_("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option '%s'"), $_);
     }
 }
 

src/archives.c

@@ -324,7 +324,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
      * it until we apply the proper mode, which might be a statoverride. */
     fd = open(path, O_CREAT | O_EXCL | O_WRONLY, 0);
     if (fd < 0)
-      ohshite(_("unable to create `%.255s' (while processing `%.255s')"),
+      ohshite(_("unable to create '%.255s' (while processing '%.255s')"),
               path, te->name);
     push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
     debug(dbg_eachfiledetail, "tarobject file open size=%jd",
@@ -353,9 +353,9 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
             namenode->statoverride->gid,
             namenode->statoverride->mode);
     if (fchown(fd, st->uid, st->gid))
-      ohshite(_("error setting ownership of `%.255s'"), te->name);
+      ohshite(_("error setting ownership of '%.255s'"), te->name);
     if (fchmod(fd, st->mode & ~S_IFMT))
-      ohshite(_("error setting permissions of `%.255s'"), te->name);
+      ohshite(_("error setting permissions of '%.255s'"), te->name);
 
     /* Postpone the fsync, to try to avoid massive I/O degradation. */
     if (!fc_unsafe_io)
@@ -363,21 +363,21 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
 
     pop_cleanup(ehflag_normaltidy); /* fd = open(path) */
     if (close(fd))
-      ohshite(_("error closing/writing `%.255s'"), te->name);
+      ohshite(_("error closing/writing '%.255s'"), te->name);
     break;
   case TAR_FILETYPE_FIFO:
     if (mkfifo(path, 0))
-      ohshite(_("error creating pipe `%.255s'"), te->name);
+      ohshite(_("error creating pipe '%.255s'"), te->name);
     debug(dbg_eachfiledetail, "tarobject fifo");
     break;
   case TAR_FILETYPE_CHARDEV:
     if (mknod(path, S_IFCHR, te->dev))
-      ohshite(_("error creating device `%.255s'"), te->name);
+      ohshite(_("error creating device '%.255s'"), te->name);
     debug(dbg_eachfiledetail, "tarobject chardev");
     break;
   case TAR_FILETYPE_BLOCKDEV:
     if (mknod(path, S_IFBLK, te->dev))
-      ohshite(_("error creating device `%.255s'"), te->name);
+      ohshite(_("error creating device '%.255s'"), te->name);
     debug(dbg_eachfiledetail, "tarobject blockdev");
     break;
   case TAR_FILETYPE_HARDLINK:
@@ -390,20 +390,20 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
       varbuf_add_str(&hardlinkfn, DPKGNEWEXT);
     varbuf_end_str(&hardlinkfn);
     if (link(hardlinkfn.buf, path))
-      ohshite(_("error creating hard link `%.255s'"), te->name);
+      ohshite(_("error creating hard link '%.255s'"), te->name);
     namenode->newhash = linknode->newhash;
     debug(dbg_eachfiledetail, "tarobject hardlink hash=%s", namenode->newhash);
     break;
   case TAR_FILETYPE_SYMLINK:
     /* We've already checked for an existing directory. */
     if (symlink(te->linkname, path))
-      ohshite(_("error creating symbolic link `%.255s'"), te->name);
+      ohshite(_("error creating symbolic link '%.255s'"), te->name);
     debug(dbg_eachfiledetail, "tarobject symlink creating");
     break;
   case TAR_FILETYPE_DIR:
     /* We've already checked for an existing directory. */
     if (mkdir(path, 0))
-      ohshite(_("error creating directory `%.255s'"), te->name);
+      ohshite(_("error creating directory '%.255s'"), te->name);
     debug(dbg_eachfiledetail, "tarobject directory creating");
     break;
   default:
@@ -450,11 +450,11 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
   if (te->type == TAR_FILETYPE_SYMLINK) {
 #ifdef HAVE_LUTIMES
     if (lutimes(path, tv) && errno != ENOSYS)
-      ohshite(_("error setting timestamps of `%.255s'"), path);
+      ohshite(_("error setting timestamps of '%.255s'"), path);
 #endif
   } else {
     if (utimes(path, tv))
-      ohshite(_("error setting timestamps of `%.255s'"), path);
+      ohshite(_("error setting timestamps of '%.255s'"), path);
   }
 }
 
@@ -466,12 +466,12 @@ tarobject_set_perms(struct tar_entry *te, const char *path, struct file_stat *st
 
   if (te->type == TAR_FILETYPE_SYMLINK) {
     if (lchown(path, st->uid, st->gid))
-      ohshite(_("error setting ownership of symlink `%.255s'"), path);
+      ohshite(_("error setting ownership of symlink '%.255s'"), path);
   } else {
     if (chown(path, st->uid, st->gid))
-      ohshite(_("error setting ownership of `%.255s'"), path);
+      ohshite(_("error setting ownership of '%.255s'"), path);
     if (chmod(path, st->mode & ~S_IFMT))
-      ohshite(_("error setting permissions of `%.255s'"), path);
+      ohshite(_("error setting permissions of '%.255s'"), path);
   }
 }
 
@@ -504,7 +504,7 @@ tarobject_matches(struct tarcontext *tc,
     linkname = m_malloc(stab->st_size + 1);
     linksize = readlink(fn_old, linkname, stab->st_size + 1);
     if (linksize < 0)
-      ohshite(_("unable to read link `%.255s'"), fn_old);
+      ohshite(_("unable to read link '%.255s'"), fn_old);
     else if (linksize != stab->st_size)
       ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
              fn_old, stab->st_size, linksize);
@@ -600,7 +600,7 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
   statr= stat(fname, &oldstab);
   if (statr) {
     if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
-      ohshite(_("failed to stat (dereference) existing symlink `%.250s'"),
+      ohshite(_("failed to stat (dereference) existing symlink '%.250s'"),
               fname);
     return false;
   }
@@ -623,7 +623,7 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
   if (statr) {
     if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
       ohshite(_("failed to stat (dereference) proposed new symlink target"
-                " `%.250s' for symlink `%.250s'"), symlinkfn->buf, fname);
+                " '%.250s' for symlink '%.250s'"), symlinkfn->buf, fname);
     return false;
   }
   if (!S_ISDIR(newstab.st_mode))
@@ -682,14 +682,14 @@ tarobject(void *ctx, struct tar_entry *ti)
 
     if (divpkgset) {
       forcibleerr(fc_overwritediverted,
-                  _("trying to overwrite `%.250s', which is the "
-                    "diverted version of `%.250s' (package: %.100s)"),
+                  _("trying to overwrite '%.250s', which is the "
+                    "diverted version of '%.250s' (package: %.100s)"),
                   nifd->namenode->name, nifd->namenode->divert->camefrom->name,
                   divpkgset->name);
     } else {
       forcibleerr(fc_overwritediverted,
-                  _("trying to overwrite `%.250s', which is the "
-                    "diverted version of `%.250s'"),
+                  _("trying to overwrite '%.250s', which is the "
+                    "diverted version of '%.250s'"),
                   nifd->namenode->name, nifd->namenode->divert->camefrom->name);
     }
   }
@@ -718,7 +718,7 @@ tarobject(void *ctx, struct tar_entry *ti)
   if (statr) {
     /* The lstat failed. */
     if (errno != ENOENT && errno != ENOTDIR)
-      ohshite(_("unable to stat `%.255s' (which I was about to install)"),
+      ohshite(_("unable to stat '%.255s' (which I was about to install)"),
               ti->name);
     /* OK, so it doesn't exist.
      * However, it's possible that we were in the middle of some other
@@ -726,14 +726,15 @@ tarobject(void *ctx, struct tar_entry *ti)
      * So, we see if we have .dpkg-tmp, and if so we restore it. */
     if (rename(fnametmpvb.buf,fnamevb.buf)) {
       if (errno != ENOENT && errno != ENOTDIR)
-        ohshite(_("unable to clean up mess surrounding `%.255s' before "
+        ohshite(_("unable to clean up mess surrounding '%.255s' before "
                   "installing another version"), ti->name);
       debug(dbg_eachfiledetail,"tarobject nonexistent");
     } else {
       debug(dbg_eachfiledetail,"tarobject restored tmp to main");
       statr= lstat(fnamevb.buf,&stab);
-      if (statr) ohshite(_("unable to stat restored `%.255s' before installing"
-                           " another version"), ti->name);
+      if (statr)
+        ohshite(_("unable to stat restored '%.255s' before installing"
+                  " another version"), ti->name);
     }
   } else {
     debug(dbg_eachfiledetail,"tarobject already exists");
@@ -768,7 +769,7 @@ tarobject(void *ctx, struct tar_entry *ti)
   case TAR_FILETYPE_HARDLINK:
     break;
   default:
-    ohshit(_("archive contained object `%.255s' of unknown type 0x%x"),
+    ohshit(_("archive contained object '%.255s' of unknown type 0x%x"),
            ti->name, ti->type);
   }
 
@@ -997,7 +998,7 @@ tarobject(void *ctx, struct tar_entry *ti)
       debug(dbg_eachfiledetail,"tarobject directory, nonatomic");
       nifd->namenode->flags |= fnnf_no_atomic_overwrite;
       if (rename(fnamevb.buf,fnametmpvb.buf))
-        ohshite(_("unable to move aside `%.255s' to install new version"),
+        ohshite(_("unable to move aside '%.255s' to install new version"),
                 ti->name);
     } else if (S_ISLNK(stab.st_mode)) {
       /* We can't make a symlink with two hardlinks, so we'll have to
@@ -1007,21 +1008,21 @@ tarobject(void *ctx, struct tar_entry *ti)
       varbuf_grow(&symlinkfn, stab.st_size + 1);
       r = readlink(fnamevb.buf, symlinkfn.buf, symlinkfn.size);
       if (r < 0)
-        ohshite(_("unable to read link `%.255s'"), ti->name);
+        ohshite(_("unable to read link '%.255s'"), ti->name);
       else if (r != stab.st_size)
         ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
                fnamevb.buf, stab.st_size, r);
       varbuf_trunc(&symlinkfn, r);
       varbuf_end_str(&symlinkfn);
       if (symlink(symlinkfn.buf,fnametmpvb.buf))
-        ohshite(_("unable to make backup symlink for `%.255s'"), ti->name);
+        ohshite(_("unable to make backup symlink for '%.255s'"), ti->name);
       if (lchown(fnametmpvb.buf,stab.st_uid,stab.st_gid))
-        ohshite(_("unable to chown backup symlink for `%.255s'"), ti->name);
+        ohshite(_("unable to chown backup symlink for '%.255s'"), ti->name);
       tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
     } else {
       debug(dbg_eachfiledetail, "tarobject nondirectory, 'link' backup");
       if (link(fnamevb.buf,fnametmpvb.buf))
-        ohshite(_("unable to make backup link of `%.255s' before installing new version"),
+        ohshite(_("unable to make backup link of '%.255s' before installing new version"),
                 ti->name);
     }
   }
@@ -1038,7 +1039,7 @@ tarobject(void *ctx, struct tar_entry *ti)
     debug(dbg_eachfiledetail, "tarobject done and installation deferred");
   } else {
     if (rename(fnamenewvb.buf, fnamevb.buf))
-      ohshite(_("unable to install new version of `%.255s'"), ti->name);
+      ohshite(_("unable to install new version of '%.255s'"), ti->name);
 
     /*
      * CLEANUP: Now the new file is in the destination file, and the
@@ -1081,7 +1082,7 @@ tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg)
      * anyway. */
     sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WAIT_BEFORE);
     if (close(fd))
-      ohshite(_("error closing/writing `%.255s'"), fnamenewvb.buf);
+      ohshite(_("error closing/writing '%.255s'"), fnamenewvb.buf);
   }
 }
 #else
@@ -1120,7 +1121,7 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg)
       if (fsync(fd))
         ohshite(_("unable to sync file '%.255s'"), fnamenewvb.buf);
       if (close(fd))
-        ohshite(_("error closing/writing `%.255s'"), fnamenewvb.buf);
+        ohshite(_("error closing/writing '%.255s'"), fnamenewvb.buf);
 
       cfile->namenode->flags &= ~fnnf_deferred_fsync;
     }
@@ -1128,7 +1129,7 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg)
     debug(dbg_eachfiledetail, "deferred extract needs rename");
 
     if (rename(fnamenewvb.buf, fnamevb.buf))
-      ohshite(_("unable to install new version of `%.255s'"),
+      ohshite(_("unable to install new version of '%.255s'"),
               cfile->namenode->name);
 
     cfile->namenode->flags &= ~fnnf_deferred_rename;

src/cleanup.c

@@ -84,14 +84,14 @@ void cu_installnew(int argc, void **argv) {
        * link to the new version we may have created. */
       debug(dbg_eachfiledetail,"cu_installnew restoring nonatomic");
       if (secure_remove(fnamevb.buf) && errno != ENOENT && errno != ENOTDIR)
-        ohshite(_("unable to remove newly-installed version of `%.250s' to allow"
+        ohshite(_("unable to remove newly-installed version of '%.250s' to allow"
                 " reinstallation of backup copy"),namenode->name);
     } else {
       debug(dbg_eachfiledetail,"cu_installnew restoring atomic");
     }
     /* Either we can do an atomic restore, or we've made room: */
     if (rename(fnametmpvb.buf,fnamevb.buf))
-      ohshite(_("unable to restore backup version of `%.250s'"),namenode->name);
+      ohshite(_("unable to restore backup version of '%.250s'"), namenode->name);
     /* If «pathname».dpkg-tmp was still a hard link to «pathname», then the
      * atomic rename did nothing, so we make sure to remove the backup. */
     else if (unlink(fnametmpvb.buf) && errno != ENOENT)
@@ -99,14 +99,15 @@ void cu_installnew(int argc, void **argv) {
   } else if (namenode->flags & fnnf_placed_on_disk) {
     debug(dbg_eachfiledetail,"cu_installnew removing new file");
     if (secure_remove(fnamevb.buf) && errno != ENOENT && errno != ENOTDIR)
-      ohshite(_("unable to remove newly-installed version of `%.250s'"),
+      ohshite(_("unable to remove newly-installed version of '%.250s'"),
 	      namenode->name);
   } else {
     debug(dbg_eachfiledetail,"cu_installnew not restoring");
   }
   /* Whatever, we delete «pathname».dpkg-new now, if it still exists. */
   if (secure_remove(fnamenewvb.buf) && errno != ENOENT && errno != ENOTDIR)
-    ohshite(_("unable to remove newly-extracted version of `%.250s'"),namenode->name);
+    ohshite(_("unable to remove newly-extracted version of '%.250s'"),
+            namenode->name);
 
   cleanup_pkg_failed--; cleanup_conflictor_failed--;
 }

src/configure.c

@@ -229,7 +229,7 @@ spawn_shell(const char *confold, const char *confnew)
 {
 	pid_t pid;
 
-	fputs(_("Type `exit' when you're done.\n"), stderr);
+	fputs(_("Type 'exit' when you're done.\n"), stderr);
 
 	pid = subproc_fork();
 	if (!pid) {
@@ -410,7 +410,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 	if (!stat(cdr.buf, &stab))
 		file_copy_perms(cdr.buf, cdr2.buf);
 	else if (errno != ENOENT)
-		ohshite(_("unable to stat current installed conffile `%.250s'"),
+		ohshite(_("unable to stat current installed conffile '%.250s'"),
 		        cdr.buf);
 
 	/* Select what to do. */
@@ -423,7 +423,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 	} else if (strcmp(currenthash, NONEXISTENTFLAG) == 0 && fc_conff_miss) {
 		fprintf(stderr,
 		        _("\n"
-		          "Configuration file `%s', does not exist on system.\n"
+		          "Configuration file '%s', does not exist on system.\n"
 		          "Installing new config file as you requested.\n"),
 		        usenode->name);
 		what = CFO_NEW_CONFF;
@@ -509,7 +509,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 		strcpy(cdr2rest, DPKGNEWEXT);
 		trig_path_activate(usenode, pkg);
 		if (rename(cdr2.buf, cdr.buf))
-			ohshite(_("unable to install `%.250s' as `%.250s'"),
+			ohshite(_("unable to install '%.250s' as '%.250s'"),
 			        cdr2.buf, cdr.buf);
 		break;
 	default:
@@ -561,7 +561,7 @@ deferred_configure(struct pkginfo *pkg)
 	enum dep_check ok;
 
 	if (pkg->status == PKG_STAT_NOTINSTALLED)
-		ohshit(_("no package named `%s' is installed, cannot configure"),
+		ohshit(_("no package named '%s' is installed, cannot configure"),
 		       pkg_name(pkg, pnaw_nonambig));
 	if (pkg->status == PKG_STAT_INSTALLED)
 		ohshit(_("package %.250s is already installed and configured"),
@@ -569,7 +569,7 @@ deferred_configure(struct pkginfo *pkg)
 	if (pkg->status != PKG_STAT_UNPACKED &&
 	    pkg->status != PKG_STAT_HALFCONFIGURED)
 		ohshit(_("package %.250s is not ready for configuration\n"
-		         " cannot configure (current status `%.250s')"),
+		         " cannot configure (current status '%.250s')"),
 		       pkg_name(pkg, pnaw_nonambig),
 		       pkg_status_name(pkg));
 

src/divertcmd.c

@@ -198,8 +198,8 @@ check_rename(struct file *src, struct file *dst)
 	    dst->stat_state == FILE_STAT_VALID &&
 	    !(src->stat.st_dev == dst->stat.st_dev &&
 	      src->stat.st_ino == dst->stat.st_ino))
-		ohshit(_("rename involves overwriting `%s' with\n"
-		         "  different file `%s', not allowed"),
+		ohshit(_("rename involves overwriting '%s' with\n"
+		         "  different file '%s', not allowed"),
 		        dst->name, src->name);
 
 	return true;
@@ -471,7 +471,7 @@ diversion_add(const char *const *argv)
 			exit(0);
 		}
 
-		ohshit(_("`%s' clashes with `%s'"),
+		ohshit(_("'%s' clashes with '%s'"),
 		       diversion_current(filename),
 		       fnn_from->divert ?
 		       diversion_describe(fnn_from->divert) :
@@ -581,15 +581,15 @@ diversion_remove(const char *const *argv)
 	if (opt_divertto != NULL &&
 	    strcmp(opt_divertto, contest->useinstead->name) != 0)
 		ohshit(_("mismatch on divert-to\n"
-		         "  when removing `%s'\n"
-		         "  found `%s'"),
+		         "  when removing '%s'\n"
+		         "  found '%s'"),
 		       diversion_current(filename),
 		       diversion_describe(contest));
 
 	if (!opt_pkgname_match_any && pkgset != contest->pkgset)
 		ohshit(_("mismatch on package\n"
-		         "  when removing `%s'\n"
-		         "  found `%s'"),
+		         "  when removing '%s'\n"
+		         "  found '%s'"),
 		       diversion_current(filename),
 		       diversion_describe(contest));
 

src/divertdb.c

@@ -119,7 +119,7 @@ ensure_diversions(void)
 
 		if (oialtname->camefrom->divert ||
 		    oicontest->useinstead->divert)
-			ohshit(_("conflicting diversions involving `%.250s' or `%.250s'"),
+			ohshit(_("conflicting diversions involving '%.250s' or '%.250s'"),
 			       oialtname->camefrom->name, oicontest->useinstead->name);
 
 		oialtname->camefrom->divert = oicontest;

src/filesdb.c

@@ -235,7 +235,7 @@ ensure_packagefiles_available(struct pkginfo *pkg)
 
   if (fd==-1) {
     if (errno != ENOENT)
-      ohshite(_("unable to open files list file for package `%.250s'"),
+      ohshite(_("unable to open files list file for package '%.250s'"),
               pkg_name(pkg, pnaw_nonambig));
     onerr_abort--;
     if (pkg->status != PKG_STAT_CONFIGFILES &&
@@ -282,7 +282,7 @@ ensure_packagefiles_available(struct pkginfo *pkg)
       if (ptr > thisline && ptr[-1] == '/') ptr--;
       /* Add the file to the list. */
       if (ptr == thisline)
-        ohshit(_("files list file for package `%.250s' contains empty filename"),
+        ohshit(_("files list file for package '%.250s' contains empty filename"),
                pkg_name(pkg, pnaw_nonambig));
       *ptr = '\0';
 
@@ -293,7 +293,7 @@ ensure_packagefiles_available(struct pkginfo *pkg)
   }
   pop_cleanup(ehflag_normaltidy); /* fd = open() */
   if (close(fd))
-    ohshite(_("error closing files list file for package `%.250s'"),
+    ohshite(_("error closing files list file for package '%.250s'"),
             pkg_name(pkg, pnaw_nonambig));
 
   onerr_abort--;

src/infodb-access.c

@@ -50,7 +50,7 @@ pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
 	else if (errno == ENOENT)
 		return false;
 	else
-		ohshite(_("unable to check existence of `%.250s'"), filename);
+		ohshite(_("unable to check existence of '%.250s'"), filename);
 }
 
 void

src/infodb-upgrade.c

@@ -143,7 +143,7 @@ pkg_infodb_link_multiarch_files(void)
 		varbuf_end_str(&newname);
 
 		if (link(oldname.buf, newname.buf) && errno != EEXIST)
-			ohshite(_("error creating hard link `%.255s'"),
+			ohshite(_("error creating hard link '%.255s'"),
 			        newname.buf);
 		rename_head = rename_node_new(oldname.buf, newname.buf, rename_head);
 	}
@@ -163,15 +163,15 @@ cu_abort_db_upgrade(int argc, void **argv)
 	while (rename_head) {
 		next = rename_head->next;
 		if (link(rename_head->new, rename_head->old) && errno != EEXIST)
-			ohshite(_("error creating hard link `%.255s'"),
+			ohshite(_("error creating hard link '%.255s'"),
 			        rename_head->old);
 		if (unlink(rename_head->new))
-			ohshite(_("cannot remove `%.250s'"), rename_head->new);
+			ohshite(_("cannot remove '%.250s'"), rename_head->new);
 		rename_node_free(rename_head);
 		rename_head = next;
 	}
 	if (unlink(file->name_new) && errno != ENOENT)
-		ohshite(_("cannot remove `%.250s'"), file->name_new);
+		ohshite(_("cannot remove '%.250s'"), file->name_new);
 
 	atomic_file_free(file);
 }
@@ -197,7 +197,7 @@ pkg_infodb_unlink_monoarch_files(void)
 	while (rename_head) {
 		next = rename_head->next;
 		if (unlink(rename_head->old))
-			ohshite(_("cannot remove `%.250s'"), rename_head->old);
+			ohshite(_("cannot remove '%.250s'"), rename_head->old);
 		rename_node_free(rename_head);
 		rename_head = next;
 	}

src/main.c

@@ -58,7 +58,7 @@
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
-  printf(_("Debian `%s' package management program version %s.\n"),
+  printf(_("Debian '%s' package management program version %s.\n"),
          DPKG, DPKG_VERSION_ARCH);
   printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -101,7 +101,7 @@ usage(const struct cmdinfo *ci, const char *value)
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
 "  -s|--status <package> ...        Display package status details.\n"
 "  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files `owned' by package(s).\n"
+"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
 "  -l|--list [<pattern> ...]        List packages concisely.\n"
 "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
 "  -C|--audit [<package> ...]       Check for broken package(s).\n"
@@ -634,7 +634,7 @@ set_force(const struct cmdinfo *cip, const char *value)
         break;
 
     if (!fip->name) {
-      badusage(_("unknown force/refuse option `%.*s'"),
+      badusage(_("unknown force/refuse option '%.*s'"),
                (int)min(l, 250), value);
     } else if (strcmp(fip->name, "all") == 0) {
       for (fip = forceinfos; fip->name; fip++)
@@ -786,7 +786,7 @@ commandfd(const char *const *argv)
   infd = dpkg_options_parse_arg_int(cipaction, pipein);
   in = fdopen(infd, "r");
   if (in == NULL)
-    ohshite(_("couldn't open `%i' for stream"), (int) infd);
+    ohshite(_("couldn't open '%i' for stream"), (int)infd);
 
   for (;;) {
     bool mode = false;

src/packages.c

@@ -269,7 +269,7 @@ void process_queue(void) {
     case act_triggers:
       if (!pkg->trigpend_head)
         ohshit(_("package %.250s is not ready for trigger processing\n"
-                 " (current status `%.250s' with no pending triggers)"),
+                 " (current status '%.250s' with no pending triggers)"),
                pkg_name(pkg, pnaw_nonambig), pkg_status_name(pkg));
       /* Fall through. */
     case act_install:

src/querycmd.c

@@ -475,7 +475,7 @@ enqperpackage(const char *const *argv)
         ensure_diversions();
         file= pkg->clientdata->files;
         if (!file) {
-          printf(_("Package `%s' does not contain any files (!)\n"),
+          printf(_("Package '%s' does not contain any files (!)\n"),
                  pkg_name(pkg, pnaw_nonambig));
         } else {
           while (file) {
@@ -790,7 +790,7 @@ usage(const struct cmdinfo *ci, const char *value)
 "Commands:\n"
 "  -s|--status <package> ...        Display package status details.\n"
 "  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files `owned' by package(s).\n"
+"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
 "  -l|--list [<pattern> ...]        List packages concisely.\n"
 "  -W|--show [<pattern> ...]        Show information on package(s).\n"
 "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"

src/remove.c

@@ -212,7 +212,7 @@ removal_bulk_remove_file(const char *filename, const char *filetype)
   debug(dbg_stupidlyverbose, "removal_bulk info not postrm or list");
 
   if (unlink(filename))
-    ohshite(_("unable to delete control info file `%.250s'"), filename);
+    ohshite(_("unable to delete control info file '%.250s'"), filename);
 
   debug(dbg_scripts, "removal_bulk info unlinked %s", filename);
 }
@@ -345,7 +345,8 @@ removal_bulk_remove_files(struct pkginfo *pkg)
         push_leftover(&leftover,namenode);
         continue;
       }
-      if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
+      if (errno != ENOTDIR)
+        ohshite(_("cannot remove '%.250s'"), fnvb.buf);
       debug(dbg_eachfiledetail, "removal_bulk unlinking '%s'", fnvb.buf);
       if (secure_unlink(fnvb.buf))
         ohshite(_("unable to securely remove '%.250s'"), fnvb.buf);
@@ -438,7 +439,8 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
       push_leftover(&leftover,namenode);
       continue;
     }
-    if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
+    if (errno != ENOTDIR)
+      ohshite(_("cannot remove '%.250s'"), fnvb.buf);
 
     if (lstat(fnvb.buf, &stab) == 0 && S_ISLNK(stab.st_mode)) {
       debug(dbg_eachfiledetail, "removal_bulk is a symlink to a directory");
@@ -525,7 +527,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
         continue;
       conffnameused = fnvb.used;
       if (unlink(fnvb.buf) && errno != ENOENT && errno != ENOTDIR)
-        ohshite(_("cannot remove old config file `%.250s' (= `%.250s')"),
+        ohshite(_("cannot remove old config file '%.250s' (= '%.250s')"),
                 conff->name, fnvb.buf);
       p= strrchr(fnvb.buf,'/'); if (!p) continue;
       *p = '\0';
@@ -578,7 +580,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
         debug(dbg_conffdetail, "removal_bulk conffile dsd entry removing '%s'",
               removevb.buf);
         if (unlink(removevb.buf) && errno != ENOENT && errno != ENOTDIR)
-          ohshite(_("cannot remove old backup config file `%.250s' (of `%.250s')"),
+          ohshite(_("cannot remove old backup config file '%.250s' (of '%.250s')"),
                   removevb.buf, conff->name);
       }
       pop_cleanup(ehflag_normaltidy); /* closedir */

src/script.c

@@ -87,7 +87,7 @@ setexecute(const char *path, struct stat *stab)
 		return;
 	if (!chmod(path, 0755))
 		return;
-	ohshite(_("unable to set execute permissions on `%.250s'"), path);
+	ohshite(_("unable to set execute permissions on '%.250s'"), path);
 }
 
 /**
@@ -106,12 +106,12 @@ maintscript_pre_exec(struct command *cmd)
 			ohshite(_("unable to setenv for subprocesses"));
 
 		if (chroot(instdir))
-			ohshite(_("failed to chroot to `%.250s'"), instdir);
+			ohshite(_("failed to chroot to '%.250s'"), instdir);
 	}
 	/* Switch to a known good directory to give the maintainer script
 	 * a saner environment, also needed after the chroot(). */
 	if (chdir("/"))
-		ohshite(_("failed to chdir to `%.255s'"), "/");
+		ohshite(_("failed to chdir to '%.255s'"), "/");
 	if (debug_has_flag(dbg_scripts)) {
 		struct varbuf args = VARBUF_INIT;
 		const char **argv = cmd->argv;
@@ -216,7 +216,7 @@ vmaintscript_installed(struct pkginfo *pkg, const char *scriptname,
 			      scriptname);
 			return 0;
 		}
-		ohshite(_("unable to stat %s `%.250s'"), buf, scriptpath);
+		ohshite(_("unable to stat %s '%.250s'"), buf, scriptpath);
 	}
 	maintscript_exec(pkg, &pkg->installed, &cmd, &stab, 0);
 
@@ -288,7 +288,7 @@ maintscript_new(struct pkginfo *pkg, const char *scriptname,
 			      scriptname, cidir);
 			return 0;
 		}
-		ohshite(_("unable to stat %s `%.250s'"), buf, cidir);
+		ohshite(_("unable to stat %s '%.250s'"), buf, cidir);
 	}
 	maintscript_exec(pkg, &pkg->available, &cmd, &stab, 0);
 
@@ -350,7 +350,7 @@ maintscript_fallback(struct pkginfo *pkg,
 		if (errno == ENOENT)
 			ohshit(_("there is no script in the new version of the package - giving up"));
 		else
-			ohshite(_("unable to stat %s `%.250s'"), buf, cidir);
+			ohshite(_("unable to stat %s '%.250s'"), buf, cidir);
 	}
 
 	maintscript_exec(pkg, &pkg->available, &cmd, &stab, 0);

src/statcmd.c

@@ -162,9 +162,9 @@ static void
 statdb_node_apply(const char *filename, struct file_stat *filestat)
 {
 	if (chown(filename, filestat->uid, filestat->gid) < 0)
-		ohshite(_("error setting ownership of `%.255s'"), filename);
+		ohshite(_("error setting ownership of '%.255s'"), filename);
 	if (chmod(filename, filestat->mode))
-		ohshite(_("error setting permissions of `%.255s'"), filename);
+		ohshite(_("error setting permissions of '%.255s'"), filename);
 
 	dpkg_selabel_load();
 	dpkg_selabel_set_context(filename, filename, filestat->mode);

src/trigcmd.c

@@ -232,7 +232,7 @@ main(int argc, const char *const *argv)
 	activate = argv[0];
 	badname = trig_name_is_illegal(activate);
 	if (badname)
-		badusage(_("invalid trigger name `%.250s': %.250s"),
+		badusage(_("invalid trigger name '%.250s': %.250s"),
 		         activate, badname);
 
 	trigdef_set_methods(&tdm_add);

src/unpack.c

@@ -93,7 +93,7 @@ deb_reassemble(const char **filename, const char **pfilename)
   if (!reasmbuf)
     reasmbuf = dpkg_db_get_path(REASSEMBLETMP);
   if (unlink(reasmbuf) && errno != ENOENT)
-    ohshite(_("error ensuring `%.250s' doesn't exist"), reasmbuf);
+    ohshite(_("error ensuring '%.250s' doesn't exist"), reasmbuf);
 
   push_cleanup(cu_pathname, ~0, NULL, 0, 1, (void *)reasmbuf);
 
@@ -309,7 +309,7 @@ static void
 pkg_infodb_remove_file(const char *filename, const char *filetype)
 {
   if (unlink(filename))
-    ohshite(_("unable to delete control info file `%.250s'"), filename);
+    ohshite(_("unable to delete control info file '%.250s'"), filename);
 
   debug(dbg_scripts, "removal_bulk info unlinked %s", filename);
 }
@@ -320,7 +320,7 @@ static void
 pkg_infodb_update_file(const char *filename, const char *filetype)
 {
   if (strlen(filetype) > MAXCONTROLFILENAME)
-    ohshit(_("old version of package has overly-long info file name starting `%.250s'"),
+    ohshit(_("old version of package has overly-long info file name starting '%.250s'"),
            filename);
 
   /* We do the list separately. */
@@ -358,12 +358,12 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
     } else if (errno == ENOENT) {
       /* Right, no new version. */
       if (unlink(match_node->filename))
-        ohshite(_("unable to remove obsolete info file `%.250s'"),
+        ohshite(_("unable to remove obsolete info file '%.250s'"),
                 match_node->filename);
       debug(dbg_scripts, "process_archive info unlinked %s",
             match_node->filename);
     } else {
-      ohshite(_("unable to install (supposed) new info file `%.250s'"), cidir);
+      ohshite(_("unable to install (supposed) new info file '%.250s'"), cidir);
     }
     match_head = match_node->next;
     match_node_free(match_node);
@@ -384,16 +384,16 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
       continue;
     }
     if (strlen(de->d_name) > MAXCONTROLFILENAME)
-      ohshit(_("package contains overly-long control info file name (starting `%.50s')"),
+      ohshit(_("package contains overly-long control info file name (starting '%.50s')"),
              de->d_name);
 
     strcpy(cidirrest, de->d_name);
 
     /* First we check it's not a directory. */
     if (rmdir(cidir) == 0)
-      ohshit(_("package control info contained directory `%.250s'"), cidir);
+      ohshit(_("package control info contained directory '%.250s'"), cidir);
     else if (errno != ENOTDIR)
-      ohshite(_("package control info rmdir of `%.250s' didn't say not a dir"),
+      ohshite(_("package control info rmdir of '%.250s' didn't say not a dir"),
               de->d_name);
 
     /* Ignore the control file. */
@@ -411,7 +411,7 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
     /* Right, install it */
     newinfofilename = pkg_infodb_get_file(pkg, &pkg->available, de->d_name);
     if (rename(cidir, newinfofilename))
-      ohshite(_("unable to install new info file `%.250s' as `%.250s'"),
+      ohshite(_("unable to install new info file '%.250s' as '%.250s'"),
               cidir, newinfofilename);
 
     debug(dbg_scripts,
@@ -1096,7 +1096,7 @@ void process_archive(const char *filename) {
 	    memcpy(cfile->namenode->filestat, &tmp_stat, sizeof(struct stat));
 	  } else {
 	    if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
-	      ohshite(_("unable to stat other new file `%.250s'"),
+	      ohshite(_("unable to stat other new file '%.250s'"),
 		      cfile->namenode->name);
 	    cfile->namenode->filestat = &empty_stat;
 	    continue;

utils/update-alternatives.c

@@ -316,7 +316,7 @@ xreadlink(const char *linkname)
 
 	buf = areadlink(linkname);
 	if (buf == NULL)
-		syserr(_("unable to read link `%.255s'"), linkname);
+		syserr(_("unable to read link '%.255s'"), linkname);
 
 	return buf;
 }
@@ -478,14 +478,14 @@ static void
 checked_symlink(const char *filename, const char *linkname)
 {
 	if (symlink(filename, linkname))
-		syserr(_("error creating symbolic link `%.255s'"), linkname);
+		syserr(_("error creating symbolic link '%.255s'"), linkname);
 }
 
 static void
 checked_mv(const char *src, const char *dst)
 {
 	if (!rename_mv(src, dst))
-		syserr(_("unable to install `%.250s' as `%.250s'"), src, dst);
+		syserr(_("unable to install '%.250s' as '%.250s'"), src, dst);
 }
 
 static void
@@ -1087,7 +1087,7 @@ altdb_get_namelist(struct dirent ***table)
 
 	count = scandir(admdir, table, altdb_filter_namelist, alphasort);
 	if (count < 0)
-		syserr(_("cannot scan directory `%.255s'"), admdir);
+		syserr(_("cannot scan directory '%.255s'"), admdir);
 
 	return count;
 }
@@ -2529,7 +2529,7 @@ main(int argc, char **argv)
 
 	for (i = 1; i < argc; i++) {
 		if (strstr(argv[i], "--") != argv[i]) {
-			error(_("unknown argument `%s'"), argv[i]);
+			error(_("unknown argument '%s'"), argv[i]);
 		} else if (strcmp("--help", argv[i]) == 0) {
 			usage();
 			exit(0);
@@ -2666,7 +2666,7 @@ main(int argc, char **argv)
 			opt_force = 1;
 			PUSH_OPT(argv[i]);
 		} else {
-			badusage(_("unknown option `%s'"), argv[i]);
+			badusage(_("unknown option '%s'"), argv[i]);
 		}
 	}