Update cups.strings file to use double prime for inches abbreviation instead of

a straight double quote.

diff --git a/locale/cups.pot b/locale/cups.pot
index 7efd89e1d79a0d7ddb82aee61015747da12de7c2..8096e4843ac5029f8b8717e1b835edc6382915bd 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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"

diff --git a/locale/cups.strings b/locale/cups.strings
index 8f59b0cc0d5dc3a5511f4eb8c70ac08aa7868827..0f267cb9c4854aabe8e2a047fabdc022e8b7c4fb 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -473,13 +473,13 @@
 "0" = "0";
 "1" = "1";
 "1 inch/sec." = "1 inch/sec.";
-"1.25x0.25\"" = "1.25x0.25\"";
-"1.25x2.25\"" = "1.25x2.25\"";
+"1.25x0.25\"" = "1.25x0.25″";
+"1.25x2.25\"" = "1.25x2.25″";
 "1.5 inch/sec." = "1.5 inch/sec.";
-"1.50x0.25\"" = "1.50x0.25\"";
-"1.50x0.50\"" = "1.50x0.50\"";
-"1.50x1.00\"" = "1.50x1.00\"";
-"1.50x2.00\"" = "1.50x2.00\"";
+"1.50x0.25\"" = "1.50x0.25″";
+"1.50x0.50\"" = "1.50x0.50″";
+"1.50x1.00\"" = "1.50x1.00″";
+"1.50x2.00\"" = "1.50x2.00″";
 "10" = "10";
 "10 inches/sec." = "10 inches/sec.";
 "10 x 11" = "10 x 11";
@@ -519,24 +519,24 @@
 "2-Hole Punch (Reverse Landscape)" = "2-Hole Punch (Reverse Landscape)";
 "2-Hole Punch (Reverse Portrait)" = "2-Hole Punch (Reverse Portrait)";
 "2-Sided Printing" = "2-Sided Printing";
-"2.00x0.37\"" = "2.00x0.37\"";
-"2.00x0.50\"" = "2.00x0.50\"";
-"2.00x1.00\"" = "2.00x1.00\"";
-"2.00x1.25\"" = "2.00x1.25\"";
-"2.00x2.00\"" = "2.00x2.00\"";
-"2.00x3.00\"" = "2.00x3.00\"";
-"2.00x4.00\"" = "2.00x4.00\"";
-"2.00x5.50\"" = "2.00x5.50\"";
-"2.25x0.50\"" = "2.25x0.50\"";
-"2.25x1.25\"" = "2.25x1.25\"";
-"2.25x4.00\"" = "2.25x4.00\"";
-"2.25x5.50\"" = "2.25x5.50\"";
-"2.38x5.50\"" = "2.38x5.50\"";
+"2.00x0.37\"" = "2.00x0.37″";
+"2.00x0.50\"" = "2.00x0.50″";
+"2.00x1.00\"" = "2.00x1.00″";
+"2.00x1.25\"" = "2.00x1.25″";
+"2.00x2.00\"" = "2.00x2.00″";
+"2.00x3.00\"" = "2.00x3.00″";
+"2.00x4.00\"" = "2.00x4.00″";
+"2.00x5.50\"" = "2.00x5.50″";
+"2.25x0.50\"" = "2.25x0.50″";
+"2.25x1.25\"" = "2.25x1.25″";
+"2.25x4.00\"" = "2.25x4.00″";
+"2.25x5.50\"" = "2.25x5.50″";
+"2.38x5.50\"" = "2.38x5.50″";
 "2.5 inches/sec." = "2.5 inches/sec.";
-"2.50x1.00\"" = "2.50x1.00\"";
-"2.50x2.00\"" = "2.50x2.00\"";
-"2.75x1.25\"" = "2.75x1.25\"";
-"2.9 x 1\"" = "2.9 x 1\"";
+"2.50x1.00\"" = "2.50x1.00″";
+"2.50x2.00\"" = "2.50x2.00″";
+"2.75x1.25\"" = "2.75x1.25″";
+"2.9 x 1\"" = "2.9 x 1″";
 "20" = "20";
 "20 mm/sec." = "20 mm/sec.";
 "200 mm/sec." = "200 mm/sec.";
@@ -560,19 +560,19 @@
 "3-Hole Punch (Portrait)" = "3-Hole Punch (Portrait)";
 "3-Hole Punch (Reverse Landscape)" = "3-Hole Punch (Reverse Landscape)";
 "3-Hole Punch (Reverse Portrait)" = "3-Hole Punch (Reverse Portrait)";
-"3.00x1.00\"" = "3.00x1.00\"";
-"3.00x1.25\"" = "3.00x1.25\"";
-"3.00x2.00\"" = "3.00x2.00\"";
-"3.00x3.00\"" = "3.00x3.00\"";
-"3.00x5.00\"" = "3.00x5.00\"";
-"3.25x2.00\"" = "3.25x2.00\"";
-"3.25x5.00\"" = "3.25x5.00\"";
-"3.25x5.50\"" = "3.25x5.50\"";
-"3.25x5.83\"" = "3.25x5.83\"";
-"3.25x7.83\"" = "3.25x7.83\"";
+"3.00x1.00\"" = "3.00x1.00″";
+"3.00x1.25\"" = "3.00x1.25″";
+"3.00x2.00\"" = "3.00x2.00″";
+"3.00x3.00\"" = "3.00x3.00″";
+"3.00x5.00\"" = "3.00x5.00″";
+"3.25x2.00\"" = "3.25x2.00″";
+"3.25x5.00\"" = "3.25x5.00″";
+"3.25x5.50\"" = "3.25x5.50″";
+"3.25x5.83\"" = "3.25x5.83″";
+"3.25x7.83\"" = "3.25x7.83″";
 "3.5 x 5" = "3.5 x 5";
-"3.5\" Disk" = "3.5\" Disk";
-"3.50x1.00\"" = "3.50x1.00\"";
+"3.5\" Disk" = "3.5″ Disk";
+"3.50x1.00\"" = "3.50x1.00″";
 "30" = "30";
 "30 mm/sec." = "30 mm/sec.";
 "300 mm/sec." = "300 mm/sec.";
@@ -586,15 +586,15 @@
 "4-Hole Punch (Portrait)" = "4-Hole Punch (Portrait)";
 "4-Hole Punch (Reverse Landscape)" = "4-Hole Punch (Reverse Landscape)";
 "4-Hole Punch (Reverse Portrait)" = "4-Hole Punch (Reverse Portrait)";
-"4.00x1.00\"" = "4.00x1.00\"";
-"4.00x13.00\"" = "4.00x13.00\"";
-"4.00x2.00\"" = "4.00x2.00\"";
-"4.00x2.50\"" = "4.00x2.50\"";
-"4.00x3.00\"" = "4.00x3.00\"";
-"4.00x4.00\"" = "4.00x4.00\"";
-"4.00x5.00\"" = "4.00x5.00\"";
-"4.00x6.00\"" = "4.00x6.00\"";
-"4.00x6.50\"" = "4.00x6.50\"";
+"4.00x1.00\"" = "4.00x1.00″";
+"4.00x13.00\"" = "4.00x13.00″";
+"4.00x2.00\"" = "4.00x2.00″";
+"4.00x2.50\"" = "4.00x2.50″";
+"4.00x3.00\"" = "4.00x3.00″";
+"4.00x4.00\"" = "4.00x4.00″";
+"4.00x5.00\"" = "4.00x5.00″";
+"4.00x6.00\"" = "4.00x6.00″";
+"4.00x6.50\"" = "4.00x6.50″";
 "40" = "40";
 "40 mm/sec." = "40 mm/sec.";
 "45" = "45";
@@ -605,13 +605,13 @@
 "55" = "55";
 "6" = "6";
 "6 inches/sec." = "6 inches/sec.";
-"6.00x1.00\"" = "6.00x1.00\"";
-"6.00x2.00\"" = "6.00x2.00\"";
-"6.00x3.00\"" = "6.00x3.00\"";
-"6.00x4.00\"" = "6.00x4.00\"";
-"6.00x5.00\"" = "6.00x5.00\"";
-"6.00x6.00\"" = "6.00x6.00\"";
-"6.00x6.50\"" = "6.00x6.50\"";
+"6.00x1.00\"" = "6.00x1.00″";
+"6.00x2.00\"" = "6.00x2.00″";
+"6.00x3.00\"" = "6.00x3.00″";
+"6.00x4.00\"" = "6.00x4.00″";
+"6.00x5.00\"" = "6.00x5.00″";
+"6.00x6.00\"" = "6.00x6.00″";
+"6.00x6.50\"" = "6.00x6.50″";
 "60" = "60";
 "60 mm/sec." = "60 mm/sec.";
 "600dpi" = "600dpi";
@@ -626,13 +626,13 @@
 "8" = "8";
 "8 inches/sec." = "8 inches/sec.";
 "8 x 10" = "8 x 10";
-"8.00x1.00\"" = "8.00x1.00\"";
-"8.00x2.00\"" = "8.00x2.00\"";
-"8.00x3.00\"" = "8.00x3.00\"";
-"8.00x4.00\"" = "8.00x4.00\"";
-"8.00x5.00\"" = "8.00x5.00\"";
-"8.00x6.00\"" = "8.00x6.00\"";
-"8.00x6.50\"" = "8.00x6.50\"";
+"8.00x1.00\"" = "8.00x1.00″";
+"8.00x2.00\"" = "8.00x2.00″";
+"8.00x3.00\"" = "8.00x3.00″";
+"8.00x4.00\"" = "8.00x4.00″";
+"8.00x5.00\"" = "8.00x5.00″";
+"8.00x6.00\"" = "8.00x6.00″";
+"8.00x6.50\"" = "8.00x6.50″";
 "80" = "80";
 "80 mm/sec." = "80 mm/sec.";
 "85" = "85";

diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index f3e246db2f23c9974e3262c3adb36fcaf6e2ce6d..66c76993e26df79e7ca312b4623b8922798f3e52 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 e83c0ede20a8886ce61e8b129b28d9799ea891b0..a32a93b8ebe7fe1f46462b26ac1b4a4377d88b13 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 92abfcba01198065333d143f15ba36f6487072ee..378b406e106ffa8bfd308e19fe7b8b8b5169e271 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 6a8e8cbe3b19e97f7db27eb39ec8d6f28ec07375..e99177659efd503efd6afabbae0ee74f3cb7c78f 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 8348fb01a4508397422e4da0b993c94f629d25b7..fd4a9e3a73e9ef74001d791689b2ecbd1cf89c06 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 b3920bdb4813472513b1dae74c903d59a5dfe4f2..ea17c547c5668010673e5a0855e62996bc8e3681 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 631e5e366344fdabdafe8023f7f4567e21679387..97efa9265a6cf95948846f2740121d0dbd4f593f 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 70ab422c90de2d45596974b62345886d2f36e6a6..da42564c62b00b7dee2621b2d1ee970fde135e6b 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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 491aef5f7724cfdd4848d06fd64728ca5ad0bf22..68568e3b8f492681e1a78440082e6182986672db 100644 (file)
--- 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-03-10 13:51-0500\n"
+"POT-Creation-Date: 2017-03-11 10:02-0500\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/po2strings.c b/locale/po2strings.c
index 1edf146835bd364620a08ffcfc1da6cc3dd27c48..4638275b8ed6e23ad476d89936a3231cb0291248 100644 (file)
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -1,7 +1,7 @@
 /*
  * Convert a GNU gettext .po file to an Apple .strings file.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Apple Inc. and are protected by Federal copyright
@@ -323,30 +323,41 @@ normalize_string(const char *idstr,       /* I - msgid string */
       *bufptr++ = (char)0xA6;
       idstr += 2;
     }
-    else if (!html && *idstr == '\\' && idstr[1] == '\"' && (quote || strchr(idstr + 2, '\"') != NULL))
+    else if (!html && *idstr == '\\' && idstr[1] == '\"')
     {
       if (quote)
       {
        /*
-        * Convert \" to Unicode right (curley) double quote.
+        * Convert second \" to Unicode right (curley) double quote.
         */
 
        *bufptr++ = (char)0xE2;
        *bufptr++ = (char)0x80;
        *bufptr++ = (char)0x9D;
+       quote     = 0;
       }
-      else
+      else if (strchr(idstr + 2, '\"') != NULL)
       {
        /*
-        * Convert \" to Unicode left (curley) double quote.
+        * Convert first \" to Unicode left (curley) double quote.
         */
 
        *bufptr++ = (char)0xE2;
        *bufptr++ = (char)0x80;
        *bufptr++ = (char)0x9C;
+       quote     = 1;
+      }
+      else
+      {
+       /*
+        * Convert lone \" to Unicode double prime.
+        */
+
+        *bufptr++ = (char)0xE2;
+        *bufptr++ = (char)0x80;
+        *bufptr++ = (char)0xB3;
       }
 
-      quote = !quote;
       idstr ++;
     }
     else