From: Michael Sweet Date: Sat, 11 Mar 2017 15:03:40 +0000 (-0500) Subject: Update cups.strings file to use double prime for inches abbreviation instead of X-Git-Tag: v2.2.3~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5423798c61baa6e05936a16dee9a7d789e5ed6cf;p=thirdparty%2Fcups.git 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 7efd89e1d7..8096e4843a 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-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 \n" "Language-Team: LANGUAGE \n" diff --git a/locale/cups.strings b/locale/cups.strings index 8f59b0cc0d..0f267cb9c4 100644 --- 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 f3e246db2f..66c76993e2 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-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ó \n" "Language-Team: Catalan \n" diff --git a/locale/cups_cs.po b/locale/cups_cs.po index e83c0ede20..a32a93b8eb 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-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 \n" "Language-Team: Czech\n" diff --git a/locale/cups_de.po b/locale/cups_de.po index 92abfcba01..378b406e10 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-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 \n" "Language-Team: LANGUAGE \n" diff --git a/locale/cups_es.po b/locale/cups_es.po index 6a8e8cbe3b..e99177659e 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-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 \n" "Language-Team: Spanish\n" diff --git a/locale/cups_fr.po b/locale/cups_fr.po index 8348fb01a4..fd4a9e3a73 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-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 \n" "Language-Team: LANGUAGE \n" diff --git a/locale/cups_it.po b/locale/cups_it.po index b3920bdb48..ea17c547c5 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-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 \n" "Language-Team: Arch Linux Italian Team \n" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index 631e5e3663..97efa9265a 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-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 \n" "Language-Team: OPFC TRANSCUPS \n" diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po index 70ab422c90..da42564c62 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-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 \n" "Language-Team: Brazilian Portuguese \n" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 491aef5f77..68568e3b8f 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-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 1edf146835..4638275b8e 100644 --- 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