Fix the cups.strings file generation (bug in code that generates the Unicode

quotes), and add support for .strings files in checkpo so that we can validate
the results from now on (rdar://33287650)

15 files changed, 520 insertions, 370 deletions

diff --git a/locale/Makefile b/locale/Makefile
index 7d55289ec..ef5693c74 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -163,9 +163,7 @@ checkpo:	checkpo.o ../cups/$(LIBCUPSSTATIC)
 		$(COMMONLIBS) $(LIBZ)
 
 checkall:	checkpo
-	for file in *.po; do \
-		./checkpo $$file; \
-	done
+	./checkpo *.po *.strings
 
 
 #
diff --git a/locale/checkpo.c b/locale/checkpo.c
index 825cdffc5..33e3fb856 100644
--- a/locale/checkpo.c
+++ b/locale/checkpo.c
@@ -2,7 +2,7 @@
  * Verify that translations in the .po file have the same number and type of
  * printf-style format strings.
  *
- * Copyright 2007-2012 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -13,7 +13,7 @@
  *
  * Usage:
  *
- *   checkpo filename.po [... filenameN.po]
+ *   checkpo filename.{po,strings} [... filenameN.{po,strings}]
  *
  * Compile with:
  *
@@ -29,11 +29,14 @@
 
 static char		*abbreviate(const char *s, char *buf, int bufsize);
 static cups_array_t	*collect_formats(const char *id);
+static cups_array_t     *cups_load_strings(const char *filename);
+static int	        cups_read_strings(cups_file_t *fp, char *buffer, size_t bufsize, char **id, char **str);
+static char	        *cups_scan_strings(char *buffer);
 static void		free_formats(cups_array_t *fmts);
 
 
 /*
- * 'main()' - Validate .po files.
+ * 'main()' - Validate .po and .strings files.
  */
 
 int					/* O - Exit code */
@@ -57,12 +60,12 @@ main(int  argc,				/* I - Number of command-line args */
 
   if (argc < 2)
   {
-    puts("Usage: checkpo filename.po [... filenameN.po]");
+    puts("Usage: checkpo filename.{po,strings} [... filenameN.{po,strings}]");
     return (1);
   }
 
  /*
-  * Check every .po file on the command-line...
+  * Check every .po or .strings file on the command-line...
   */
 
   for (i = 1, status = 0; i < argc; i ++)
@@ -71,7 +74,12 @@ main(int  argc,				/* I - Number of command-line args */
     * Use the CUPS .po loader to get the message strings...
     */
 
-    if ((po = _cupsMessageLoad(argv[i], 1)) == NULL)
+    if (strstr(argv[i], ".strings"))
+      po = cups_load_strings(argv[i]);
+    else
+      po = _cupsMessageLoad(argv[i], 1);
+
+    if (!po)
     {
       perror(argv[i]);
       return (1);
@@ -383,6 +391,152 @@ collect_formats(const char *id)		/* I - msgid string */
 
 
 /*
+ * 'cups_load_strings()' - Load a .strings file into a _cups_msg_t array.
+ */
+
+static cups_array_t *                   /* O - CUPS array of _cups_msg_t values */
+cups_load_strings(const char *filename) /* I - File to load */
+{
+  cups_file_t     *fp;                  /* .strings file */
+  cups_array_t    *po;                  /* Localization array */
+  _cups_message_t *m;                   /* Localization message */
+  char		  buffer[8192],	        /* Message buffer */
+                  *id,		        /* ID string */
+                  *str;		        /* Translated message */
+
+
+  if ((fp = cupsFileOpen(filename, "r")) == NULL)
+    return (NULL);
+
+  po = _cupsMessageNew(NULL);
+
+  while (cups_read_strings(fp, buffer, sizeof(buffer), &id, &str))
+  {
+    if ((m = malloc(sizeof(_cups_message_t))) == NULL)
+      break;
+
+    m->id  = strdup(id);
+    m->str = strdup(str);
+
+    if (m->id && m->str)
+      cupsArrayAdd(po, m);
+    else
+    {
+      if (m->id)
+        free(m->id);
+
+      if (m->str)
+        free(m->str);
+
+      free(m);
+
+      cupsArrayDelete(po);
+      po = NULL;
+      break;
+    }
+  }
+
+  cupsFileClose(fp);
+
+  return (po);
+}
+
+
+/*
+ * 'cups_read_strings()' - Read a pair of strings from a .strings file.
+ */
+
+static int				/* O - 1 on success, 0 on failure */
+cups_read_strings(cups_file_t *strings,	/* I - .strings file */
+                  char        *buffer,	/* I - Line buffer */
+                  size_t      bufsize,	/* I - Size of line buffer */
+		  char        **id,	/* O - Pointer to ID string */
+		  char        **str)	/* O - Pointer to translation string */
+{
+  char	*bufptr;			/* Pointer into buffer */
+
+
+  while (cupsFileGets(strings, buffer, bufsize))
+  {
+    if (buffer[0] != '\"')
+      continue;
+
+    *id    = buffer + 1;
+    bufptr = cups_scan_strings(buffer);
+
+    if (*bufptr != '\"')
+      continue;
+
+    *bufptr++ = '\0';
+
+    while (*bufptr && *bufptr != '\"')
+      bufptr ++;
+
+    if (!*bufptr)
+      continue;
+
+    *str   = bufptr + 1;
+    bufptr = cups_scan_strings(bufptr);
+
+    if (*bufptr != '\"')
+      continue;
+
+    *bufptr = '\0';
+
+    return (1);
+  }
+
+  return (0);
+}
+
+
+/*
+ * 'cups_scan_strings()' - Scan a quoted string.
+ */
+
+static char *				/* O - End of string */
+cups_scan_strings(char *buffer)		/* I - Start of string */
+{
+  char	*bufptr;			/* Pointer into string */
+
+
+  for (bufptr = buffer + 1; *bufptr && *bufptr != '\"'; bufptr ++)
+  {
+    if (*bufptr == '\\')
+    {
+      if (bufptr[1] >= '0' && bufptr[1] <= '3' &&
+	  bufptr[2] >= '0' && bufptr[2] <= '7' &&
+	  bufptr[3] >= '0' && bufptr[3] <= '7')
+      {
+       /*
+	* Decode \nnn octal escape...
+	*/
+
+	*bufptr = (char)(((((bufptr[1] - '0') << 3) | (bufptr[2] - '0')) << 3) | (bufptr[3] - '0'));
+	_cups_strcpy(bufptr + 1, bufptr + 4);
+      }
+      else
+      {
+       /*
+	* Decode \C escape...
+	*/
+
+	_cups_strcpy(bufptr, bufptr + 1);
+	if (*bufptr == 'n')
+	  *bufptr = '\n';
+	else if (*bufptr == 'r')
+	  *bufptr = '\r';
+	else if (*bufptr == 't')
+	  *bufptr = '\t';
+      }
+    }
+  }
+
+  return (bufptr);
+}
+
+
+/*
  * 'free_formats()' - Free all of the format strings.
  */
 
diff --git a/locale/cups.pot b/locale/cups.pot
index d3444d504..63d07a3ca 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2530,23 +2530,23 @@ msgstr ""
 msgid "2 inches/sec."
 msgstr ""
 
-#: cups/ppd-cache.c:2992
+#: cups/ppd-cache.c:3010
 msgid "2-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2993
+#: cups/ppd-cache.c:3011
 msgid "2-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2991
+#: cups/ppd-cache.c:3009
 msgid "2-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2990
+#: cups/ppd-cache.c:3008
 msgid "2-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3662 ppdc/sample.c:262
+#: cups/ppd-cache.c:3680 ppdc/sample.c:262
 msgid "2-Sided Printing"
 msgstr ""
 
@@ -2698,19 +2698,19 @@ msgstr ""
 msgid "3 x 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3003
+#: cups/ppd-cache.c:3021
 msgid "3-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3001
+#: cups/ppd-cache.c:3019
 msgid "3-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3000
+#: cups/ppd-cache.c:3018
 msgid "3-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3002
+#: cups/ppd-cache.c:3020
 msgid "3-Hole Punch (Reverse Portrait)"
 msgstr ""
 
@@ -2802,19 +2802,19 @@ msgstr ""
 msgid "4 inches/sec."
 msgstr ""
 
-#: cups/ppd-cache.c:2997
+#: cups/ppd-cache.c:3015
 msgid "4-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2995
+#: cups/ppd-cache.c:3013
 msgid "4-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2994
+#: cups/ppd-cache.c:3012
 msgid "4-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2996
+#: cups/ppd-cache.c:3014
 msgid "4-Hole Punch (Reverse Portrait)"
 msgstr ""
 
@@ -3212,7 +3212,7 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
-#: cups/ppd-cache.c:2973
+#: cups/ppd-cache.c:2991
 msgid "Accordian Fold"
 msgstr ""
 
@@ -3237,19 +3237,19 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: cups/ppd-cache.c:3423
+#: cups/ppd-cache.c:3441
 msgid "Advanced Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3337
+#: cups/ppd-cache.c:3355
 msgid "Alternate"
 msgstr ""
 
-#: cups/ppd-cache.c:3345
+#: cups/ppd-cache.c:3363
 msgid "Alternate Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3417
+#: cups/ppd-cache.c:3435
 msgid "Aluminum"
 msgstr ""
 
@@ -3265,19 +3265,19 @@ msgstr ""
 msgid "Applicator"
 msgstr ""
 
-#: cups/ppd-cache.c:3451
+#: cups/ppd-cache.c:3469
 msgid "Archival Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3463
+#: cups/ppd-cache.c:3481
 msgid "Archival Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3540
+#: cups/ppd-cache.c:3558
 msgid "Archival Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3512
+#: cups/ppd-cache.c:3530
 msgid "Archival Photo Paper"
 msgstr ""
 
@@ -3301,7 +3301,7 @@ msgstr ""
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
 
-#: cups/ppd-cache.c:3335 cups/ppd-cache.c:3418 cups/ppd-cache.c:3722
+#: cups/ppd-cache.c:3353 cups/ppd-cache.c:3436 cups/ppd-cache.c:3740
 msgid "Automatic"
 msgstr ""
 
@@ -3353,7 +3353,7 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
-#: cups/ppd-cache.c:3419
+#: cups/ppd-cache.c:3437
 msgid "Back Print Film"
 msgstr ""
 
@@ -3362,7 +3362,7 @@ msgstr ""
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
 
-#: cups/dest.c:2035
+#: cups/dest.c:2061
 msgid "Bad NULL dests pointer"
 msgstr ""
 
@@ -3378,16 +3378,16 @@ msgstr ""
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:456 cups/ppd-cache.c:503 cups/ppd-cache.c:541
-#: cups/ppd-cache.c:547 cups/ppd-cache.c:563 cups/ppd-cache.c:579
-#: cups/ppd-cache.c:588 cups/ppd-cache.c:596 cups/ppd-cache.c:613
-#: cups/ppd-cache.c:621 cups/ppd-cache.c:636 cups/ppd-cache.c:644
-#: cups/ppd-cache.c:665 cups/ppd-cache.c:677 cups/ppd-cache.c:692
-#: cups/ppd-cache.c:704 cups/ppd-cache.c:726 cups/ppd-cache.c:734
-#: cups/ppd-cache.c:752 cups/ppd-cache.c:760 cups/ppd-cache.c:775
-#: cups/ppd-cache.c:783 cups/ppd-cache.c:801 cups/ppd-cache.c:809
-#: cups/ppd-cache.c:836 cups/ppd-cache.c:906 cups/ppd-cache.c:914
-#: cups/ppd-cache.c:922
+#: cups/ppd-cache.c:458 cups/ppd-cache.c:505 cups/ppd-cache.c:543
+#: cups/ppd-cache.c:549 cups/ppd-cache.c:565 cups/ppd-cache.c:581
+#: cups/ppd-cache.c:590 cups/ppd-cache.c:598 cups/ppd-cache.c:615
+#: cups/ppd-cache.c:623 cups/ppd-cache.c:638 cups/ppd-cache.c:646
+#: cups/ppd-cache.c:667 cups/ppd-cache.c:679 cups/ppd-cache.c:694
+#: cups/ppd-cache.c:706 cups/ppd-cache.c:728 cups/ppd-cache.c:736
+#: cups/ppd-cache.c:754 cups/ppd-cache.c:762 cups/ppd-cache.c:777
+#: cups/ppd-cache.c:785 cups/ppd-cache.c:803 cups/ppd-cache.c:811
+#: cups/ppd-cache.c:838 cups/ppd-cache.c:908 cups/ppd-cache.c:916
+#: cups/ppd-cache.c:924
 msgid "Bad PPD cache file."
 msgstr ""
 
@@ -3521,7 +3521,7 @@ msgstr ""
 msgid "Bad printer-state value %d."
 msgstr ""
 
-#: cups/dest.c:671 cups/dest.c:1564 cups/dest.c:1615
+#: cups/dest.c:683 cups/dest.c:1588 cups/dest.c:1639
 msgid "Bad printer-uri."
 msgstr ""
 
@@ -3559,7 +3559,7 @@ msgstr ""
 msgid "Bad/empty URI"
 msgstr ""
 
-#: cups/ppd-cache.c:2958
+#: cups/ppd-cache.c:2976
 msgid "Bale"
 msgstr ""
 
@@ -3567,27 +3567,27 @@ msgstr ""
 msgid "Banners"
 msgstr ""
 
-#: cups/ppd-cache.c:2959
+#: cups/ppd-cache.c:2977
 msgid "Bind"
 msgstr ""
 
-#: cups/ppd-cache.c:2963
+#: cups/ppd-cache.c:2981
 msgid "Bind (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2961
+#: cups/ppd-cache.c:2979
 msgid "Bind (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2960
+#: cups/ppd-cache.c:2978
 msgid "Bind (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2962
+#: cups/ppd-cache.c:2980
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3452
+#: cups/ppd-cache.c:3470
 msgid "Bond Envelope"
 msgstr ""
 
@@ -3595,11 +3595,11 @@ msgstr ""
 msgid "Bond Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3947
+#: cups/ppd-cache.c:3965
 msgid "Booklet"
 msgstr ""
 
-#: cups/ppd-cache.c:2964
+#: cups/ppd-cache.c:2982
 msgid "Booklet Maker"
 msgstr ""
 
@@ -3608,11 +3608,11 @@ msgstr ""
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3348
+#: cups/ppd-cache.c:3366
 msgid "Bottom"
 msgstr ""
 
-#: cups/ppd-cache.c:3723
+#: cups/ppd-cache.c:3741
 msgid "Bottom Tray"
 msgstr ""
 
@@ -3620,7 +3620,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: cups/ppd-cache.c:3422
+#: cups/ppd-cache.c:3440
 msgid "CD"
 msgstr ""
 
@@ -3652,11 +3652,11 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3420
+#: cups/ppd-cache.c:3438
 msgid "Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3421
+#: cups/ppd-cache.c:3439
 msgid "Cardstock"
 msgstr ""
 
@@ -3664,11 +3664,11 @@ msgstr ""
 msgid "Cassette"
 msgstr ""
 
-#: cups/ppd-cache.c:3352
+#: cups/ppd-cache.c:3370
 msgid "Center"
 msgstr ""
 
-#: cups/ppd-cache.c:3724
+#: cups/ppd-cache.c:3742
 msgid "Center Tray"
 msgstr ""
 
@@ -3694,28 +3694,28 @@ msgstr ""
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: cups/ppd-cache.c:2965
+#: cups/ppd-cache.c:2983
 msgid "Coat"
 msgstr ""
 
-#: cups/ppd-cache.c:3453
+#: cups/ppd-cache.c:3471
 msgid "Coated Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3541
+#: cups/ppd-cache.c:3559
 msgid "Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3626 ppdc/sample.c:276
+#: cups/ppd-cache.c:3644 ppdc/sample.c:276
 msgid "Color"
 msgstr ""
 
-#: cups/ppd-cache.c:3602 cups/ppd-cache.c:3613 cups/ppd-cache.c:3624
-#: cups/ppd-cache.c:3634 ppdc/sample.c:274
+#: cups/ppd-cache.c:3620 cups/ppd-cache.c:3631 cups/ppd-cache.c:3642
+#: cups/ppd-cache.c:3652 ppdc/sample.c:274
 msgid "Color Mode"
 msgstr ""
 
-#: cups/ppd-cache.c:3488
+#: cups/ppd-cache.c:3506
 msgid "Colored Labels"
 msgstr ""
 
@@ -3742,15 +3742,15 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: cups/ppd-cache.c:3436 ppdc/sample.c:360
+#: cups/ppd-cache.c:3454 ppdc/sample.c:360
 msgid "Continuous"
 msgstr ""
 
-#: cups/ppd-cache.c:3437
+#: cups/ppd-cache.c:3455
 msgid "Continuous Long"
 msgstr ""
 
-#: cups/ppd-cache.c:3438
+#: cups/ppd-cache.c:3456
 msgid "Continuous Short"
 msgstr ""
 
@@ -3762,15 +3762,15 @@ msgstr ""
 msgid "Copying print data."
 msgstr ""
 
-#: cups/ppd-cache.c:3454
+#: cups/ppd-cache.c:3472
 msgid "Cotton Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3542
+#: cups/ppd-cache.c:3560
 msgid "Cotton Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:2966
+#: cups/ppd-cache.c:2984
 msgid "Cover"
 msgstr ""
 
@@ -3802,7 +3802,7 @@ msgstr ""
 msgid "Cut"
 msgstr ""
 
-#: cups/ppd-cache.c:3022
+#: cups/ppd-cache.c:3040
 msgid "Cut Media"
 msgstr ""
 
@@ -3810,7 +3810,7 @@ msgstr ""
 msgid "Cutter"
 msgstr ""
 
-#: cups/ppd-cache.c:3447
+#: cups/ppd-cache.c:3465
 msgid "DVD"
 msgstr ""
 
@@ -3826,7 +3826,7 @@ msgstr ""
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cups/ppd-cache.c:3636
+#: cups/ppd-cache.c:3654
 msgid "Deep Color"
 msgstr ""
 
@@ -3891,7 +3891,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3341
+#: cups/ppd-cache.c:3359
 msgid "Disc"
 msgstr ""
 
@@ -3900,36 +3900,36 @@ msgstr ""
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: cups/ppd-cache.c:2974
+#: cups/ppd-cache.c:2992
 msgid "Double Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3015
+#: cups/ppd-cache.c:3033
 msgid "Double Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3013
+#: cups/ppd-cache.c:3031
 msgid "Double Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3012
+#: cups/ppd-cache.c:3030
 msgid "Double Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3014
+#: cups/ppd-cache.c:3032
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3445
+#: cups/ppd-cache.c:3463
 msgid "Double Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3978 cups/ppd-cache.c:4033 cups/ppd-cache.c:4035
-#: cups/ppd-cache.c:4062
+#: cups/ppd-cache.c:3996 cups/ppd-cache.c:4051 cups/ppd-cache.c:4053
+#: cups/ppd-cache.c:4080
 msgid "Draft"
 msgstr ""
 
-#: cups/ppd-cache.c:3446
+#: cups/ppd-cache.c:3464
 msgid "Dry Film"
 msgstr ""
 
@@ -3955,7 +3955,7 @@ msgstr ""
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/ppd-cache.c:3448
+#: cups/ppd-cache.c:3466
 msgid "Embossing Foil"
 msgstr ""
 
@@ -3967,7 +3967,7 @@ msgstr ""
 msgid "Encryption is not supported."
 msgstr ""
 
-#: cups/ppd-cache.c:3449
+#: cups/ppd-cache.c:3467
 msgid "End Board"
 msgstr ""
 
@@ -3976,7 +3976,7 @@ msgstr ""
 msgid "Ending Banner"
 msgstr ""
 
-#: cups/ppd-cache.c:2975
+#: cups/ppd-cache.c:2993
 msgid "Engineering Z Fold"
 msgstr ""
 
@@ -3988,7 +3988,7 @@ msgstr ""
 msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket."
 msgstr ""
 
-#: cups/ppd-cache.c:3340 cups/ppd-cache.c:3450
+#: cups/ppd-cache.c:3358 cups/ppd-cache.c:3468
 msgid "Envelope"
 msgstr ""
 
@@ -4269,11 +4269,11 @@ msgstr ""
 msgid "Every Label"
 msgstr ""
 
-#: cups/ppd-cache.c:3428
+#: cups/ppd-cache.c:3446
 msgid "Everyday Glossy Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3429
+#: cups/ppd-cache.c:3447
 msgid "Everyday Matte Paper"
 msgstr ""
 
@@ -4293,7 +4293,7 @@ msgstr ""
 msgid "Expressions:"
 msgstr ""
 
-#: cups/ppd-cache.c:3430
+#: cups/ppd-cache.c:3448
 msgid "Extra Heavyweight Paper"
 msgstr ""
 
@@ -4307,15 +4307,15 @@ msgstr ""
 msgid "FAIL"
 msgstr ""
 
-#: cups/ppd-cache.c:3462
+#: cups/ppd-cache.c:3480
 msgid "Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3725
+#: cups/ppd-cache.c:3743
 msgid "Face Down"
 msgstr ""
 
-#: cups/ppd-cache.c:3726
+#: cups/ppd-cache.c:3744
 msgid "Face Up"
 msgstr ""
 
@@ -4331,7 +4331,7 @@ msgstr ""
 msgid "Fanfold US"
 msgstr ""
 
-#: cups/ppd-cache.c:3604
+#: cups/ppd-cache.c:3622
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -4369,11 +4369,11 @@ msgstr ""
 msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3469
+#: cups/ppd-cache.c:3487
 msgid "Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3455
+#: cups/ppd-cache.c:3473
 msgid "Fine Envelope"
 msgstr ""
 
@@ -4383,23 +4383,23 @@ msgstr ""
 msgid "Finished page %d."
 msgstr ""
 
-#: cups/ppd-cache.c:3470
+#: cups/ppd-cache.c:3488
 msgid "Flexo Base"
 msgstr ""
 
-#: cups/ppd-cache.c:3471
+#: cups/ppd-cache.c:3489
 msgid "Flexo Photo Polymer"
 msgstr ""
 
-#: cups/ppd-cache.c:3472
+#: cups/ppd-cache.c:3490
 msgid "Flute"
 msgstr ""
 
-#: cups/ppd-cache.c:3473
+#: cups/ppd-cache.c:3491
 msgid "Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:2972 cups/ppd-cache.c:3862
+#: cups/ppd-cache.c:2990 cups/ppd-cache.c:3880
 msgid "Fold"
 msgstr ""
 
@@ -4411,11 +4411,11 @@ msgstr ""
 msgid "Forbidden"
 msgstr ""
 
-#: cups/ppd-cache.c:3474
+#: cups/ppd-cache.c:3492
 msgid "Full Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:2976
+#: cups/ppd-cache.c:2994
 msgid "Gate Fold"
 msgstr ""
 
@@ -4431,39 +4431,39 @@ msgstr ""
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: cups/ppd-cache.c:3475
+#: cups/ppd-cache.c:3493
 msgid "Glass"
 msgstr ""
 
-#: cups/ppd-cache.c:3476
+#: cups/ppd-cache.c:3494
 msgid "Glass Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3477
+#: cups/ppd-cache.c:3495
 msgid "Glass Opaque"
 msgstr ""
 
-#: cups/ppd-cache.c:3478
+#: cups/ppd-cache.c:3496
 msgid "Glass Surfaced"
 msgstr ""
 
-#: cups/ppd-cache.c:3479
+#: cups/ppd-cache.c:3497
 msgid "Glass Textured"
 msgstr ""
 
-#: cups/ppd-cache.c:3424
+#: cups/ppd-cache.c:3442
 msgid "Glossy Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3464
+#: cups/ppd-cache.c:3482
 msgid "Glossy Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3489
+#: cups/ppd-cache.c:3507
 msgid "Glossy Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3440
+#: cups/ppd-cache.c:3458
 msgid "Glossy Optical Disc"
 msgstr ""
 
@@ -4471,7 +4471,7 @@ msgstr ""
 msgid "Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3514
+#: cups/ppd-cache.c:3532
 msgid "Glossy Photo Paper"
 msgstr ""
 
@@ -4482,11 +4482,11 @@ msgstr ""
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: cups/ppd-cache.c:3480
+#: cups/ppd-cache.c:3498
 msgid "Gravure Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3615 ppdc/sample.c:275
+#: cups/ppd-cache.c:3633 ppdc/sample.c:275
 msgid "Grayscale"
 msgstr ""
 
@@ -4494,15 +4494,15 @@ msgstr ""
 msgid "HP"
 msgstr ""
 
-#: cups/ppd-cache.c:3343
+#: cups/ppd-cache.c:3361
 msgid "Hagaki"
 msgstr ""
 
-#: cups/ppd-cache.c:2977
+#: cups/ppd-cache.c:2995
 msgid "Half Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:2978
+#: cups/ppd-cache.c:2996
 msgid "Half Z Fold"
 msgstr ""
 
@@ -4514,15 +4514,15 @@ msgstr ""
 msgid "Hash buffer too small."
 msgstr ""
 
-#: cups/ppd-cache.c:3545
+#: cups/ppd-cache.c:3563
 msgid "Heavyweight Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3456
+#: cups/ppd-cache.c:3474
 msgid "Heavyweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3544
+#: cups/ppd-cache.c:3562
 msgid "Heavyweight Paper"
 msgstr ""
 
@@ -4530,23 +4530,23 @@ msgstr ""
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ppd-cache.c:3988 cups/ppd-cache.c:4038 cups/ppd-cache.c:4065
+#: cups/ppd-cache.c:4006 cups/ppd-cache.c:4056 cups/ppd-cache.c:4083
 msgid "High"
 msgstr ""
 
-#: cups/ppd-cache.c:3465
+#: cups/ppd-cache.c:3483
 msgid "High Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3490
+#: cups/ppd-cache.c:3508
 msgid "High Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3441
+#: cups/ppd-cache.c:3459
 msgid "High Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3515
+#: cups/ppd-cache.c:3533
 msgid "High Gloss Photo Paper"
 msgstr ""
 
@@ -4666,23 +4666,23 @@ msgstr ""
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: cups/ppd-cache.c:3481
+#: cups/ppd-cache.c:3499
 msgid "Image Setter Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3482
+#: cups/ppd-cache.c:3500
 msgid "Imaging Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3457
+#: cups/ppd-cache.c:3475
 msgid "Inkjet Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3491
+#: cups/ppd-cache.c:3509
 msgid "Inkjet Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3546
+#: cups/ppd-cache.c:3564
 msgid "Inkjet Paper"
 msgstr ""
 
@@ -4885,7 +4885,7 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: cups/ppd-cache.c:2985
+#: cups/ppd-cache.c:3003
 msgid "Jog"
 msgstr ""
 
@@ -4901,15 +4901,15 @@ msgstr ""
 msgid "Label Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3487
+#: cups/ppd-cache.c:3505
 msgid "Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:2986
+#: cups/ppd-cache.c:3004
 msgid "Laminate"
 msgstr ""
 
-#: cups/ppd-cache.c:3497
+#: cups/ppd-cache.c:3515
 msgid "Laminating Foil"
 msgstr ""
 
@@ -4922,11 +4922,11 @@ msgstr ""
 msgid "Large Address"
 msgstr ""
 
-#: cups/ppd-cache.c:3338
+#: cups/ppd-cache.c:3356
 msgid "Large Capacity"
 msgstr ""
 
-#: cups/ppd-cache.c:3727
+#: cups/ppd-cache.c:3745
 msgid "Large Capacity Tray"
 msgstr ""
 
@@ -4934,19 +4934,19 @@ msgstr ""
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
-#: cups/ppd-cache.c:3350
+#: cups/ppd-cache.c:3368
 msgid "Left"
 msgstr ""
 
-#: cups/ppd-cache.c:2979
+#: cups/ppd-cache.c:2997
 msgid "Left Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3728
+#: cups/ppd-cache.c:3746
 msgid "Left Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:2980
+#: cups/ppd-cache.c:2998
 msgid "Letter Fold"
 msgstr ""
 
@@ -4958,7 +4958,7 @@ msgstr ""
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3498 cups/ppd-cache.c:3547
+#: cups/ppd-cache.c:3516 cups/ppd-cache.c:3565
 msgid "Letterhead"
 msgstr ""
 
@@ -4966,11 +4966,11 @@ msgstr ""
 msgid "Light"
 msgstr ""
 
-#: cups/ppd-cache.c:3458
+#: cups/ppd-cache.c:3476
 msgid "Lightweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3548
+#: cups/ppd-cache.c:3566
 msgid "Lightweight Paper"
 msgstr ""
 
@@ -4990,7 +4990,7 @@ msgstr ""
 msgid "Local printer created."
 msgstr ""
 
-#: cups/ppd-cache.c:3662 ppdc/sample.c:264
+#: cups/ppd-cache.c:3680 ppdc/sample.c:264
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
@@ -4998,55 +4998,55 @@ msgstr ""
 msgid "Looking for printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3729
+#: cups/ppd-cache.c:3747
 msgid "Mailbox 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3738
+#: cups/ppd-cache.c:3756
 msgid "Mailbox 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3730
+#: cups/ppd-cache.c:3748
 msgid "Mailbox 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3731
+#: cups/ppd-cache.c:3749
 msgid "Mailbox 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3732
+#: cups/ppd-cache.c:3750
 msgid "Mailbox 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3733
+#: cups/ppd-cache.c:3751
 msgid "Mailbox 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3734
+#: cups/ppd-cache.c:3752
 msgid "Mailbox 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3735
+#: cups/ppd-cache.c:3753
 msgid "Mailbox 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3736
+#: cups/ppd-cache.c:3754
 msgid "Mailbox 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3737
+#: cups/ppd-cache.c:3755
 msgid "Mailbox 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3336
+#: cups/ppd-cache.c:3354
 msgid "Main"
 msgstr ""
 
-#: cups/ppd-cache.c:3344
+#: cups/ppd-cache.c:3362
 msgid "Main Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3339
+#: cups/ppd-cache.c:3357
 msgid "Manual"
 msgstr ""
 
@@ -5054,27 +5054,27 @@ msgstr ""
 msgid "Manual Feed"
 msgstr ""
 
-#: cups/ppd-cache.c:3425
+#: cups/ppd-cache.c:3443
 msgid "Matte Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3426
+#: cups/ppd-cache.c:3444
 msgid "Matte Cover Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3466
+#: cups/ppd-cache.c:3484
 msgid "Matte Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3492
+#: cups/ppd-cache.c:3510
 msgid "Matte Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3442
+#: cups/ppd-cache.c:3460
 msgid "Matte Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3516
+#: cups/ppd-cache.c:3534
 msgid "Matte Photo Paper"
 msgstr ""
 
@@ -5102,35 +5102,35 @@ msgstr ""
 msgid "Memory allocation error"
 msgstr ""
 
-#: cups/ppd-cache.c:3499
+#: cups/ppd-cache.c:3517
 msgid "Metal"
 msgstr ""
 
-#: cups/ppd-cache.c:3500
+#: cups/ppd-cache.c:3518
 msgid "Metal Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3501
+#: cups/ppd-cache.c:3519
 msgid "Metal High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3502
+#: cups/ppd-cache.c:3520
 msgid "Metal Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3503
+#: cups/ppd-cache.c:3521
 msgid "Metal Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3504
+#: cups/ppd-cache.c:3522
 msgid "Metal Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3432
+#: cups/ppd-cache.c:3450
 msgid "Mid-Weight Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3347 cups/ppd-cache.c:3739
+#: cups/ppd-cache.c:3365 cups/ppd-cache.c:3757
 msgid "Middle"
 msgstr ""
 
@@ -5240,7 +5240,7 @@ msgstr ""
 msgid "Modify Printer"
 msgstr ""
 
-#: cups/ppd-cache.c:3505
+#: cups/ppd-cache.c:3523
 msgid "Mounting Tape"
 msgstr ""
 
@@ -5256,39 +5256,39 @@ msgstr ""
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/ppd-cache.c:3506
+#: cups/ppd-cache.c:3524
 msgid "Multi Layer"
 msgstr ""
 
-#: cups/ppd-cache.c:3507
+#: cups/ppd-cache.c:3525
 msgid "Multi Part Form"
 msgstr ""
 
-#: cups/ppd-cache.c:3007
+#: cups/ppd-cache.c:3025
 msgid "Multi-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3005
+#: cups/ppd-cache.c:3023
 msgid "Multi-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3004
+#: cups/ppd-cache.c:3022
 msgid "Multi-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3006
+#: cups/ppd-cache.c:3024
 msgid "Multi-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3354
+#: cups/ppd-cache.c:3372
 msgid "Multipurpose"
 msgstr ""
 
-#: cups/ppd-cache.c:3431
+#: cups/ppd-cache.c:3449
 msgid "Multipurpose Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3740
+#: cups/ppd-cache.c:3758
 msgid "My Mailbox"
 msgstr ""
 
@@ -5324,7 +5324,7 @@ msgstr ""
 msgid "No Content"
 msgstr ""
 
-#: cups/ppd-cache.c:3041
+#: cups/ppd-cache.c:3059
 msgid "No IPP attributes."
 msgstr ""
 
@@ -5466,11 +5466,11 @@ msgstr ""
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
-#: cups/ppd-cache.c:3818 cups/ppd-cache.c:3865 cups/ppd-cache.c:3912
+#: cups/ppd-cache.c:3836 cups/ppd-cache.c:3883 cups/ppd-cache.c:3930
 msgid "None"
 msgstr ""
 
-#: cups/ppd-cache.c:3981 cups/ppd-cache.c:4036 cups/ppd-cache.c:4063
+#: cups/ppd-cache.c:3999 cups/ppd-cache.c:4054 cups/ppd-cache.c:4081
 #: ppdc/sample.c:238
 msgid "Normal"
 msgstr ""
@@ -5511,11 +5511,11 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: cups/ppd-cache.c:3662 ppdc/sample.c:263
+#: cups/ppd-cache.c:3680 ppdc/sample.c:263
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: cups/ppd-cache.c:3427
+#: cups/ppd-cache.c:3445
 msgid "Office Recycled Paper"
 msgstr ""
 
@@ -5548,7 +5548,7 @@ msgstr ""
 msgid "Operation Policy"
 msgstr ""
 
-#: cups/ppd-cache.c:3439
+#: cups/ppd-cache.c:3457
 msgid "Optical Disc"
 msgstr ""
 
@@ -5569,15 +5569,15 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:3508
+#: cups/ppd-cache.c:3526
 msgid "Other"
 msgstr ""
 
-#: cups/ppd-cache.c:464
+#: cups/ppd-cache.c:466
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1861
+#: cups/ppd-cache.c:1863
 msgid "Out of memory."
 msgstr ""
 
@@ -5637,7 +5637,7 @@ msgstr ""
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: cups/ppd-cache.c:3509
+#: cups/ppd-cache.c:3527
 msgid "Paper"
 msgstr ""
 
@@ -5657,7 +5657,7 @@ msgstr ""
 msgid "Paper tray is missing."
 msgstr ""
 
-#: cups/ppd-cache.c:2981
+#: cups/ppd-cache.c:2999
 msgid "Parallel Fold"
 msgstr ""
 
@@ -5691,15 +5691,15 @@ msgstr ""
 msgid "Peel-Off"
 msgstr ""
 
-#: cups/ppd-cache.c:3493
+#: cups/ppd-cache.c:3511
 msgid "Permanent Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3342 ppdc/sample.c:160
+#: cups/ppd-cache.c:3360 ppdc/sample.c:160
 msgid "Photo"
 msgstr ""
 
-#: cups/ppd-cache.c:3513
+#: cups/ppd-cache.c:3531
 msgid "Photo Film"
 msgstr ""
 
@@ -5707,59 +5707,59 @@ msgstr ""
 msgid "Photo Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3510 cups/ppd-cache.c:3511
+#: cups/ppd-cache.c:3528 cups/ppd-cache.c:3529
 msgid "Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3483 cups/ppd-cache.c:3485
+#: cups/ppd-cache.c:3501 cups/ppd-cache.c:3503
 msgid "Photo Paper Plus Glossy II"
 msgstr ""
 
-#: cups/ppd-cache.c:3484 cups/ppd-cache.c:3486
+#: cups/ppd-cache.c:3502 cups/ppd-cache.c:3504
 msgid "Photo Paper Pro Platinum"
 msgstr ""
 
-#: cups/ppd-cache.c:3459
+#: cups/ppd-cache.c:3477
 msgid "Plain Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3539 ppdc/sample.c:281
+#: cups/ppd-cache.c:3557 ppdc/sample.c:281
 msgid "Plain Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3519
+#: cups/ppd-cache.c:3537
 msgid "Plastic"
 msgstr ""
 
-#: cups/ppd-cache.c:3520
+#: cups/ppd-cache.c:3538
 msgid "Plastic Archival"
 msgstr ""
 
-#: cups/ppd-cache.c:3521
+#: cups/ppd-cache.c:3539
 msgid "Plastic Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3522
+#: cups/ppd-cache.c:3540
 msgid "Plastic Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3523
+#: cups/ppd-cache.c:3541
 msgid "Plastic High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3524
+#: cups/ppd-cache.c:3542
 msgid "Plastic Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3525
+#: cups/ppd-cache.c:3543
 msgid "Plastic Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3526
+#: cups/ppd-cache.c:3544
 msgid "Plastic Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3527
+#: cups/ppd-cache.c:3545
 msgid "Plate"
 msgstr ""
 
@@ -5767,7 +5767,7 @@ msgstr ""
 msgid "Policies"
 msgstr ""
 
-#: cups/ppd-cache.c:3528
+#: cups/ppd-cache.c:3546
 msgid "Polyester"
 msgstr ""
 
@@ -5795,23 +5795,23 @@ msgstr ""
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:2982
+#: cups/ppd-cache.c:3000
 msgid "Poster Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3529
+#: cups/ppd-cache.c:3547
 msgid "Pre Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:3433
+#: cups/ppd-cache.c:3451
 msgid "Premium Inkjet Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3434
+#: cups/ppd-cache.c:3452
 msgid "Premium Photo Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3435
+#: cups/ppd-cache.c:3453
 msgid "Premium Presentation Matte Paper"
 msgstr ""
 
@@ -5819,11 +5819,11 @@ msgstr ""
 msgid "Preparing to print."
 msgstr ""
 
-#: cups/ppd-cache.c:3460
+#: cups/ppd-cache.c:3478
 msgid "Preprinted Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3549
+#: cups/ppd-cache.c:3567
 msgid "Preprinted Paper"
 msgstr ""
 
@@ -5839,7 +5839,7 @@ msgstr ""
 msgid "Print Mode"
 msgstr ""
 
-#: cups/ppd-cache.c:3974 cups/ppd-cache.c:4031 cups/ppd-cache.c:4060
+#: cups/ppd-cache.c:3992 cups/ppd-cache.c:4049 cups/ppd-cache.c:4078
 msgid "Print Quality"
 msgstr ""
 
@@ -5920,7 +5920,7 @@ msgstr ""
 msgid "Printer cannot print with supplied options."
 msgstr ""
 
-#: cups/ppd-cache.c:4087
+#: cups/ppd-cache.c:4105
 msgid "Printer does not support required IPP attributes or document formats."
 msgstr ""
 
@@ -5938,11 +5938,11 @@ msgstr ""
 msgid "Printing page %d, %u%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:2987 cups/ppd-cache.c:3909
+#: cups/ppd-cache.c:3005 cups/ppd-cache.c:3927
 msgid "Punch"
 msgstr ""
 
-#: cups/ppd-cache.c:3550
+#: cups/ppd-cache.c:3568
 msgid "Punched Paper"
 msgstr ""
 
@@ -5958,11 +5958,11 @@ msgstr ""
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
-#: cups/ppd-cache.c:3353
+#: cups/ppd-cache.c:3371
 msgid "Rear"
 msgstr ""
 
-#: cups/ppd-cache.c:3741
+#: cups/ppd-cache.c:3759
 msgid "Rear Tray"
 msgstr ""
 
@@ -6008,59 +6008,59 @@ msgstr ""
 msgid "Rewind"
 msgstr ""
 
-#: cups/ppd-cache.c:3351
+#: cups/ppd-cache.c:3369
 msgid "Right"
 msgstr ""
 
-#: cups/ppd-cache.c:2983
+#: cups/ppd-cache.c:3001
 msgid "Right Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3742
+#: cups/ppd-cache.c:3760
 msgid "Right Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3530
+#: cups/ppd-cache.c:3548
 msgid "Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3375
+#: cups/ppd-cache.c:3393
 msgid "Roll 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3384
+#: cups/ppd-cache.c:3402
 msgid "Roll 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3376
+#: cups/ppd-cache.c:3394
 msgid "Roll 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3377
+#: cups/ppd-cache.c:3395
 msgid "Roll 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3378
+#: cups/ppd-cache.c:3396
 msgid "Roll 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3379
+#: cups/ppd-cache.c:3397
 msgid "Roll 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3380
+#: cups/ppd-cache.c:3398
 msgid "Roll 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3381
+#: cups/ppd-cache.c:3399
 msgid "Roll 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3382
+#: cups/ppd-cache.c:3400
 msgid "Roll 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3383
+#: cups/ppd-cache.c:3401
 msgid "Roll 9"
 msgstr ""
 
@@ -6077,31 +6077,31 @@ msgstr ""
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/ppd-cache.c:3008
+#: cups/ppd-cache.c:3026
 msgid "Saddle Stitch"
 msgstr ""
 
-#: cups/ppd-cache.c:3494
+#: cups/ppd-cache.c:3512
 msgid "Satin Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3443
+#: cups/ppd-cache.c:3461
 msgid "Satin Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3517
+#: cups/ppd-cache.c:3535
 msgid "Satin Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3531
+#: cups/ppd-cache.c:3549
 msgid "Screen"
 msgstr ""
 
-#: cups/ppd-cache.c:3532
+#: cups/ppd-cache.c:3550
 msgid "Screen Paged"
 msgstr ""
 
-#: cups/ppd-cache.c:3495
+#: cups/ppd-cache.c:3513
 msgid "Security Labels"
 msgstr ""
 
@@ -6113,11 +6113,11 @@ msgstr ""
 msgid "See remote printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3533
+#: cups/ppd-cache.c:3551
 msgid "Self Adhesive"
 msgstr ""
 
-#: cups/ppd-cache.c:3534
+#: cups/ppd-cache.c:3552
 msgid "Self Adhesive Film"
 msgstr ""
 
@@ -6125,19 +6125,19 @@ msgstr ""
 msgid "Self-signed credentials are blocked."
 msgstr ""
 
-#: cups/ppd-cache.c:3467
+#: cups/ppd-cache.c:3485
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3496
+#: cups/ppd-cache.c:3514
 msgid "Semi-Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3444
+#: cups/ppd-cache.c:3462
 msgid "Semi-Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3518
+#: cups/ppd-cache.c:3536
 msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
@@ -6194,63 +6194,63 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
-#: cups/ppd-cache.c:3662 ppdc/sample.c:265
+#: cups/ppd-cache.c:3680 ppdc/sample.c:265
 msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3535
+#: cups/ppd-cache.c:3553
 msgid "Shrink Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:3349
+#: cups/ppd-cache.c:3367
 msgid "Side"
 msgstr ""
 
-#: cups/ppd-cache.c:3743
+#: cups/ppd-cache.c:3761
 msgid "Side Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3536
+#: cups/ppd-cache.c:3554
 msgid "Single Face"
 msgstr ""
 
-#: cups/ppd-cache.c:2999
+#: cups/ppd-cache.c:3017
 msgid "Single Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2998
+#: cups/ppd-cache.c:3016
 msgid "Single Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2988
+#: cups/ppd-cache.c:3006
 msgid "Single Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2989
+#: cups/ppd-cache.c:3007
 msgid "Single Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3017
+#: cups/ppd-cache.c:3035
 msgid "Single Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3016
+#: cups/ppd-cache.c:3034
 msgid "Single Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3010
+#: cups/ppd-cache.c:3028
 msgid "Single Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3011
+#: cups/ppd-cache.c:3029
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3537
+#: cups/ppd-cache.c:3555
 msgid "Single Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3538
+#: cups/ppd-cache.c:3556
 msgid "Sleeve"
 msgstr ""
 
@@ -6263,43 +6263,43 @@ msgstr ""
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:3744
+#: cups/ppd-cache.c:3762
 msgid "Stacker 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3753
+#: cups/ppd-cache.c:3771
 msgid "Stacker 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3745
+#: cups/ppd-cache.c:3763
 msgid "Stacker 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3746
+#: cups/ppd-cache.c:3764
 msgid "Stacker 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3747
+#: cups/ppd-cache.c:3765
 msgid "Stacker 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3748
+#: cups/ppd-cache.c:3766
 msgid "Stacker 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3749
+#: cups/ppd-cache.c:3767
 msgid "Stacker 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3750
+#: cups/ppd-cache.c:3768
 msgid "Stacker 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3751
+#: cups/ppd-cache.c:3769
 msgid "Stacker 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3752
+#: cups/ppd-cache.c:3770
 msgid "Stacker 9"
 msgstr ""
 
@@ -6307,27 +6307,27 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: cups/ppd-cache.c:3009 cups/ppd-cache.c:3815
+#: cups/ppd-cache.c:3027 cups/ppd-cache.c:3833
 msgid "Staple"
 msgstr ""
 
-#: cups/ppd-cache.c:2967
+#: cups/ppd-cache.c:2985
 msgid "Staple Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:2971
+#: cups/ppd-cache.c:2989
 msgid "Staple Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2969
+#: cups/ppd-cache.c:2987
 msgid "Staple Edge (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2968
+#: cups/ppd-cache.c:2986
 msgid "Staple Edge (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2970
+#: cups/ppd-cache.c:2988
 msgid "Staple Edge (Reverse Portrait)"
 msgstr ""
 
@@ -6372,7 +6372,7 @@ msgstr ""
 msgid "Switching Protocols"
 msgstr ""
 
-#: cups/ppd-cache.c:3551
+#: cups/ppd-cache.c:3569
 msgid "Tab Stock"
 msgstr ""
 
@@ -6628,23 +6628,23 @@ msgstr ""
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: cups/ppd-cache.c:3346
+#: cups/ppd-cache.c:3364
 msgid "Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3754
+#: cups/ppd-cache.c:3772
 msgid "Top Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3552
+#: cups/ppd-cache.c:3570
 msgid "Tractor"
 msgstr ""
 
-#: cups/ppd-cache.c:3553
+#: cups/ppd-cache.c:3571
 msgid "Transfer"
 msgstr ""
 
-#: cups/ppd-cache.c:3554 ppdc/sample.c:284
+#: cups/ppd-cache.c:3572 ppdc/sample.c:284
 msgid "Transparency"
 msgstr ""
 
@@ -6652,103 +6652,103 @@ msgstr ""
 msgid "Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3355 cups/ppd-cache.c:3755 ppdc/sample.c:256
+#: cups/ppd-cache.c:3373 cups/ppd-cache.c:3773 ppdc/sample.c:256
 msgid "Tray 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3364 cups/ppd-cache.c:3764
+#: cups/ppd-cache.c:3382 cups/ppd-cache.c:3782
 msgid "Tray 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3365
+#: cups/ppd-cache.c:3383
 msgid "Tray 11"
 msgstr ""
 
-#: cups/ppd-cache.c:3366
+#: cups/ppd-cache.c:3384
 msgid "Tray 12"
 msgstr ""
 
-#: cups/ppd-cache.c:3367
+#: cups/ppd-cache.c:3385
 msgid "Tray 13"
 msgstr ""
 
-#: cups/ppd-cache.c:3368
+#: cups/ppd-cache.c:3386
 msgid "Tray 14"
 msgstr ""
 
-#: cups/ppd-cache.c:3369
+#: cups/ppd-cache.c:3387
 msgid "Tray 15"
 msgstr ""
 
-#: cups/ppd-cache.c:3370
+#: cups/ppd-cache.c:3388
 msgid "Tray 16"
 msgstr ""
 
-#: cups/ppd-cache.c:3371
+#: cups/ppd-cache.c:3389
 msgid "Tray 17"
 msgstr ""
 
-#: cups/ppd-cache.c:3372
+#: cups/ppd-cache.c:3390
 msgid "Tray 18"
 msgstr ""
 
-#: cups/ppd-cache.c:3373
+#: cups/ppd-cache.c:3391
 msgid "Tray 19"
 msgstr ""
 
-#: cups/ppd-cache.c:3356 cups/ppd-cache.c:3756 ppdc/sample.c:257
+#: cups/ppd-cache.c:3374 cups/ppd-cache.c:3774 ppdc/sample.c:257
 msgid "Tray 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3374
+#: cups/ppd-cache.c:3392
 msgid "Tray 20"
 msgstr ""
 
-#: cups/ppd-cache.c:3357 cups/ppd-cache.c:3757 ppdc/sample.c:258
+#: cups/ppd-cache.c:3375 cups/ppd-cache.c:3775 ppdc/sample.c:258
 msgid "Tray 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3358 cups/ppd-cache.c:3758 ppdc/sample.c:259
+#: cups/ppd-cache.c:3376 cups/ppd-cache.c:3776 ppdc/sample.c:259
 msgid "Tray 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3359 cups/ppd-cache.c:3759
+#: cups/ppd-cache.c:3377 cups/ppd-cache.c:3777
 msgid "Tray 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3360 cups/ppd-cache.c:3760
+#: cups/ppd-cache.c:3378 cups/ppd-cache.c:3778
 msgid "Tray 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3361 cups/ppd-cache.c:3761
+#: cups/ppd-cache.c:3379 cups/ppd-cache.c:3779
 msgid "Tray 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3362 cups/ppd-cache.c:3762
+#: cups/ppd-cache.c:3380 cups/ppd-cache.c:3780
 msgid "Tray 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3363 cups/ppd-cache.c:3763
+#: cups/ppd-cache.c:3381 cups/ppd-cache.c:3781
 msgid "Tray 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3021
+#: cups/ppd-cache.c:3039
 msgid "Triple Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3019
+#: cups/ppd-cache.c:3037
 msgid "Triple Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3018
+#: cups/ppd-cache.c:3036
 msgid "Triple Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3020
+#: cups/ppd-cache.c:3038
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3555
+#: cups/ppd-cache.c:3573
 msgid "Triple Wall Cardboard"
 msgstr ""
 
@@ -6927,7 +6927,7 @@ msgstr ""
 msgid "Unable to create printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1446 cups/tls-gnutls.c:1475
+#: cups/tls-darwin.c:1466 cups/tls-gnutls.c:1475
 msgid "Unable to create server credentials."
 msgstr ""
 
@@ -6951,35 +6951,35 @@ msgstr ""
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/tls-darwin.c:1613
+#: cups/tls-darwin.c:1633
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1603
+#: cups/tls-darwin.c:1623
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1598
+#: cups/tls-darwin.c:1618
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1608
+#: cups/tls-darwin.c:1628
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/tls-darwin.c:1618
+#: cups/tls-darwin.c:1638
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/tls-darwin.c:1593
+#: cups/tls-darwin.c:1613
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1588
+#: cups/tls-darwin.c:1608
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1645 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
+#: cups/tls-darwin.c:1665 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
@@ -6991,7 +6991,7 @@ msgstr ""
 msgid "Unable to find printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1459
+#: cups/tls-darwin.c:1479
 msgid "Unable to find server credentials."
 msgstr ""
 
@@ -7112,7 +7112,7 @@ msgstr ""
 msgid "Unable to rename job document file."
 msgstr ""
 
-#: cups/dest.c:3773
+#: cups/dest.c:3795
 msgid "Unable to resolve printer-uri."
 msgstr ""
 
@@ -7432,7 +7432,7 @@ msgstr ""
 msgid "VarBind uses indefinite length"
 msgstr ""
 
-#: cups/ppd-cache.c:3543
+#: cups/ppd-cache.c:3561
 msgid "Vellum Paper"
 msgstr ""
 
@@ -7456,7 +7456,7 @@ msgstr ""
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/ppd-cache.c:3468
+#: cups/ppd-cache.c:3486
 msgid "Waterproof Fabric"
 msgstr ""
 
@@ -7464,11 +7464,11 @@ msgstr ""
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3556
+#: cups/ppd-cache.c:3574
 msgid "Wet Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3461
+#: cups/ppd-cache.c:3479
 msgid "Windowed Envelope"
 msgstr ""
 
@@ -7481,7 +7481,7 @@ msgstr ""
 msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr ""
 
-#: cups/ppd-cache.c:2984
+#: cups/ppd-cache.c:3002
 msgid "Z Fold"
 msgstr ""
 
diff --git a/locale/cups.strings b/locale/cups.strings
index 8f8270966..1e2d26ef5 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -25,7 +25,7 @@
 "\tUsers denied:" = "\tUsers denied:";
 "\tdaemon present" = "\tdaemon present";
 "\tno entries" = "\tno entries";
-"\tprinter is on device '%s' speed -1" = "\tprinter is on device ‘s’speed -1";
+"\tprinter is on device '%s' speed -1" = "\tprinter is on device ‘%s’ speed -1";
 "\tprinting is disabled" = "\tprinting is disabled";
 "\tprinting is enabled" = "\tprinting is enabled";
 "\tqueued for %s" = "\tqueued for %s";
@@ -269,7 +269,7 @@
 "  -q                      Quietly report match via exit code." = "  -q                      Quietly report match via exit code.";
 "  -q                      Run silently." = "  -q                      Run silently.";
 "  -r                      True if service is remote." = "  -r                      True if service is remote.";
-"  -r                      Use 'relaxed' open mode." = "  -r                      Use ‘elaxed’open mode.";
+"  -r                      Use 'relaxed' open mode." = "  -r                      Use ‘relaxed’ open mode.";
 "  -s                      Print service name if true." = "  -s                      Print service name if true.";
 "  -s cups-files.conf      Set cups-files.conf file to use." = "  -s cups-files.conf      Set cups-files.conf file to use.";
 "  -t                      Produce a test report." = "  -t                      Produce a test report.";
@@ -314,7 +314,7 @@
 "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)." = "“%s”: Bad charset value “%s” - bad length %d (RFC 8011 section 5.1.8).";
 "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime UTC hours %u (RFC 8011 section 5.1.15).";
 "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15).";
-"\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime UTC sign ‘c’(RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime UTC sign ‘%c’ (RFC 8011 section 5.1.15).";
 "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime day %u (RFC 8011 section 5.1.15).";
 "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime deciseconds %u (RFC 8011 section 5.1.15).";
 "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)." = "“%s”: Bad dateTime hours %u (RFC 8011 section 5.1.15).";
@@ -364,9 +364,9 @@
 "%s: %s failed: %s" = "%s: %s failed: %s";
 "%s: Bad printer URI \"%s\"." = "%s: Bad printer URI “%s”.";
 "%s: Bad version %s for \"-V\"." = "%s: Bad version %s for “-V”.";
-"%s: Don't know what to do." = "%s: Don’ know what to do.";
+"%s: Don't know what to do." = "%s: Don’t know what to do.";
 "%s: Error - %s environment variable names non-existent destination \"%s\"." = "%s: Error - %s environment variable names non-existent destination “%s”.";
-"%s: Error - add '/version=1.1' to server name." = "%s: Error - add ‘version=1.1’to server name.";
+"%s: Error - add '/version=1.1' to server name." = "%s: Error - add ‘/version=1.1’ to server name.";
 "%s: Error - bad job ID." = "%s: Error - bad job ID.";
 "%s: Error - cannot print files and alter jobs simultaneously." = "%s: Error - cannot print files and alter jobs simultaneously.";
 "%s: Error - cannot print from stdin if files or a job ID are provided." = "%s: Error - cannot print from stdin if files or a job ID are provided.";
@@ -719,7 +719,7 @@
 "B8" = "B8";
 "B9" = "B9";
 "Back Print Film" = "Back Print Film";
-"Bad 'document-format' value \"%s\"." = "Bad ‘ocument-format’value “%s”.";
+"Bad 'document-format' value \"%s\"." = "Bad ‘document-format’ value “%s”.";
 "Bad NULL dests pointer" = "Bad NULL dests pointer";
 "Bad OpenGroup" = "Bad OpenGroup";
 "Bad OpenUI/JCLOpenUI" = "Bad OpenUI/JCLOpenUI";
@@ -794,7 +794,7 @@
 "Character set \"%s\" not supported." = "Character set “%s” not supported.";
 "Classes" = "Classes";
 "Clean Print Heads" = "Clean Print Heads";
-"Close-Job doesn't support the job-uri attribute." = "Close-Job doesn’ support the job-uri attribute.";
+"Close-Job doesn't support the job-uri attribute." = "Close-Job doesn’t support the job-uri attribute.";
 "Coat" = "Coat";
 "Coated Envelope" = "Coated Envelope";
 "Coated Paper" = "Coated Paper";
@@ -1064,9 +1064,9 @@
 "JIS B9" = "JIS B9";
 "Job #%d cannot be restarted - no files." = "Job #%d cannot be restarted - no files.";
 "Job #%d does not exist." = "Job #%d does not exist.";
-"Job #%d is already aborted - can't cancel." = "Job #%d is already aborted - can’ cancel.";
-"Job #%d is already canceled - can't cancel." = "Job #%d is already canceled - can’ cancel.";
-"Job #%d is already completed - can't cancel." = "Job #%d is already completed - can’ cancel.";
+"Job #%d is already aborted - can't cancel." = "Job #%d is already aborted - can’t cancel.";
+"Job #%d is already canceled - can't cancel." = "Job #%d is already canceled - can’t cancel.";
+"Job #%d is already completed - can't cancel." = "Job #%d is already completed - can’t cancel.";
 "Job #%d is finished and cannot be altered." = "Job #%d is finished and cannot be altered.";
 "Job #%d is not complete." = "Job #%d is not complete.";
 "Job #%d is not held for authentication." = "Job #%d is not held for authentication.";
@@ -1368,7 +1368,7 @@
 "Roll 7" = "Roll 7";
 "Roll 8" = "Roll 8";
 "Roll 9" = "Roll 9";
-"Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c ‘s’";
+"Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c ‘%s’";
 "SEQUENCE uses indefinite length" = "SEQUENCE uses indefinite length";
 "SSL/TLS Negotiation Error" = "SSL/TLS Negotiation Error";
 "Saddle Stitch" = "Saddle Stitch";
@@ -1453,16 +1453,16 @@
 "Tear-Off Adjust Position" = "Tear-Off Adjust Position";
 "The \"%s\" attribute is required for print jobs." = "The “%s” attribute is required for print jobs.";
 "The %s attribute cannot be provided with job-ids." = "The %s attribute cannot be provided with job-ids.";
-"The '%s' Job Status attribute cannot be supplied in a job creation request." = "The ‘s’Job Status attribute cannot be supplied in a job creation request.";
-"The '%s' operation attribute cannot be supplied in a Create-Job request." = "The ‘s’operation attribute cannot be supplied in a Create-Job request.";
+"The '%s' Job Status attribute cannot be supplied in a job creation request." = "The ‘%s’ Job Status attribute cannot be supplied in a job creation request.";
+"The '%s' operation attribute cannot be supplied in a Create-Job request." = "The ‘%s’ operation attribute cannot be supplied in a Create-Job request.";
 "The PPD file \"%s\" could not be found." = "The PPD file “%s” could not be found.";
 "The PPD file \"%s\" could not be opened: %s" = "The PPD file “%s” could not be opened: %s";
 "The PPD file could not be opened." = "The PPD file could not be opened.";
 "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#).";
 "The developer unit needs to be replaced." = "The developer unit needs to be replaced.";
 "The developer unit will need to be replaced soon." = "The developer unit will need to be replaced soon.";
-"The fuser's temperature is high." = "The fuser’ temperature is high.";
-"The fuser's temperature is low." = "The fuser’ temperature is low.";
+"The fuser's temperature is high." = "The fuser’s temperature is high.";
+"The fuser's temperature is low." = "The fuser’s temperature is low.";
 "The notify-lease-duration attribute cannot be used with job subscriptions." = "The notify-lease-duration attribute cannot be used with job subscriptions.";
 "The notify-user-data value is too large (%d > 63 octets)." = "The notify-user-data value is too large (%d > 63 octets).";
 "The optical photoconductor needs to be replaced." = "The optical photoconductor needs to be replaced.";
@@ -1484,11 +1484,11 @@
 "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#).";
 "The printer or class does not exist." = "The printer or class does not exist.";
 "The printer or class is not shared." = "The printer or class is not shared.";
-"The printer's cover is open." = "The printer’ cover is open.";
-"The printer's door is open." = "The printer’ door is open.";
-"The printer's interlock is open." = "The printer’ interlock is open.";
-"The printer's waste bin is almost full." = "The printer’ waste bin is almost full.";
-"The printer's waste bin is full." = "The printer’ waste bin is full.";
+"The printer's cover is open." = "The printer’s cover is open.";
+"The printer's door is open." = "The printer’s door is open.";
+"The printer's interlock is open." = "The printer’s interlock is open.";
+"The printer's waste bin is almost full." = "The printer’s waste bin is almost full.";
+"The printer's waste bin is full." = "The printer’s waste bin is full.";
 "The printer-uri \"%s\" contains invalid characters." = "The printer-uri “%s” contains invalid characters.";
 "The printer-uri attribute is required." = "The printer-uri attribute is required.";
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." = "The printer-uri must be of the form “ipp://HOSTNAME/classes/CLASSNAME”.";
@@ -1650,9 +1650,9 @@
 "Unknown scheme in URI" = "Unknown scheme in URI";
 "Unknown service name." = "Unknown service name.";
 "Unknown version option value: \"%s\"." = "Unknown version option value: “%s”.";
-"Unsupported 'compression' value \"%s\"." = "Unsupported ‘ompression’value “%s”.";
-"Unsupported 'document-format' value \"%s\"." = "Unsupported ‘ocument-format’value “%s”.";
-"Unsupported 'job-name' value." = "Unsupported ‘ob-name’value.";
+"Unsupported 'compression' value \"%s\"." = "Unsupported ‘compression’ value “%s”.";
+"Unsupported 'document-format' value \"%s\"." = "Unsupported ‘document-format’ value “%s”.";
+"Unsupported 'job-name' value." = "Unsupported ‘job-name’ value.";
 "Unsupported character set \"%s\"." = "Unsupported character set “%s”.";
 "Unsupported compression \"%s\"." = "Unsupported compression “%s”.";
 "Unsupported document-format \"%s\"." = "Unsupported document-format “%s”.";
@@ -1889,7 +1889,7 @@
 "ppdc: Option %s defined in two different groups on line %d of %s." = "ppdc: Option %s defined in two different groups on line %d of %s.";
 "ppdc: Option %s redefined with a different type on line %d of %s." = "ppdc: Option %s redefined with a different type on line %d of %s.";
 "ppdc: Option constraint must *name on line %d of %s." = "ppdc: Option constraint must *name on line %d of %s.";
-"ppdc: Too many nested #if's on line %d of %s." = "ppdc: Too many nested #if’ on line %d of %s.";
+"ppdc: Too many nested #if's on line %d of %s." = "ppdc: Too many nested #if’s on line %d of %s.";
 "ppdc: Unable to create PPD file \"%s\" - %s." = "ppdc: Unable to create PPD file “%s” - %s.";
 "ppdc: Unable to create output directory %s: %s" = "ppdc: Unable to create output directory %s: %s";
 "ppdc: Unable to create output pipes: %s" = "ppdc: Unable to create output pipes: %s";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 2ae601c87..482b656b2 100644
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index d0f664575..f6a200aab 100644
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
diff --git a/locale/cups_de.po b/locale/cups_de.po
index 3d3f99ddd..91c9e2f4f 100644
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2016-09-17 18:45+0200\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/cups_es.po b/locale/cups_es.po
index 69d443e99..7c9081ddd 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2016-06-26 21:17+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
 "Language-Team: Spanish\n"
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 8fa27c64b..9ca852ecc 100644
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/cups_it.po b/locale/cups_it.po
index 2715c97ba..1fa6a63dc 100644
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 20bf6875b..abdc5053f 100644
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index 1e7fa7d81..063812c0b 100644
--- a/locale/cups_pt_BR.po
+++ b/locale/cups_pt_BR.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2016-01-31 16:45-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 4d761076b..cbf75a7c2 100644
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index d3429aa1f..2434d05bd 100644
--- a/locale/cups_zh_CN.po
+++ b/locale/cups_zh_CN.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-06-19 09:12-0400\n"
+"POT-Creation-Date: 2017-07-18 11:31-0400\n"
 "PO-Revision-Date: 2017-06-11 12:38+0800\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: \n"
diff --git a/locale/po2strings.c b/locale/po2strings.c
index d67405710..0b04170fe 100644
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -385,8 +385,6 @@ normalize_string(const char *idstr,	/* I - msgid string */
 	*bufptr++ = (char)0x98;
 	quote     = 1;
       }
-
-      idstr ++;
     }
     else
       *bufptr++ = *idstr;