Implement standard localizations in cupsLocalizeDest* (Issue #5056)

Add standard media size names to the localizations, too, since the PPD names
are not the right ones.

12 files changed, 54 insertions, 36 deletions

diff --git a/locale/cups.pot b/locale/cups.pot
index 87fa06b74..68cce0f08 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.2.5\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1726,37 +1726,37 @@ msgstr ""
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr ""
 
-#: cups/dest-localization.c:112
+#: cups/dest-localization.c:118
 #, c-format
 msgid "%d x %d mm"
 msgstr ""
 
-#: cups/dest-localization.c:104
+#: cups/dest-localization.c:110
 #, c-format
-msgid "%g x %g"
+msgid "%g x %g \""
 msgstr ""
 
-#: cups/dest-localization.c:167 cups/dest-localization.c:174
+#: cups/dest-localization.c:173 cups/dest-localization.c:180
 #, c-format
 msgid "%s (%s)"
 msgstr ""
 
-#: cups/dest-localization.c:181
+#: cups/dest-localization.c:187
 #, c-format
 msgid "%s (%s, %s)"
 msgstr ""
 
-#: cups/dest-localization.c:158
+#: cups/dest-localization.c:164
 #, c-format
 msgid "%s (Borderless)"
 msgstr ""
 
-#: cups/dest-localization.c:165 cups/dest-localization.c:172
+#: cups/dest-localization.c:171 cups/dest-localization.c:178
 #, c-format
 msgid "%s (Borderless, %s)"
 msgstr ""
 
-#: cups/dest-localization.c:179
+#: cups/dest-localization.c:185
 #, c-format
 msgid "%s (Borderless, %s, %s)"
 msgstr ""
diff --git a/locale/cups.strings b/locale/cups.strings
index 2c6f52dd5..1a64b0139 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -341,7 +341,7 @@
 "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)." = "“%s”: Bad uriScheme value “%s” - bad length %d (RFC 8011 section 5.1.7).";
 "%-7s %-7.7s %-7d %-31.31s %.0f bytes" = "%-7s %-7.7s %-7d %-31.31s %.0f bytes";
 "%d x %d mm" = "%d x %d mm";
-"%g x %g" = "%g x %g";
+"%g x %g \"" = "%g x %g ″";
 "%s (%s)" = "%s (%s)";
 "%s (%s, %s)" = "%s (%s, %s)";
 "%s (Borderless)" = "%s (Borderless)";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index ecf247017..883f41a83 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1544,7 +1544,7 @@ msgid "%d x %d mm"
 msgstr ""
 
 #, c-format
-msgid "%g x %g"
+msgid "%g x %g \""
 msgstr ""
 
 #, c-format
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 82dfc6e9d..c1523d696 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1367,7 +1367,7 @@ msgid "%d x %d mm"
 msgstr ""
 
 #, c-format
-msgid "%g x %g"
+msgid "%g x %g \""
 msgstr ""
 
 #, c-format
diff --git a/locale/cups_de.po b/locale/cups_de.po
index 54a68f21a..302b9cb3f 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1431,8 +1431,8 @@ msgid "%d x %d mm"
 msgstr "%d×%d mm"
 
 #, c-format
-msgid "%g x %g"
-msgstr "%g×%g"
+msgid "%g x %g \""
+msgstr ""
 
 #, c-format
 msgid "%s (%s)"
@@ -13404,6 +13404,9 @@ msgstr "Y Back Side Image Shift"
 #~ msgstr ""
 #~ "  -d domain               Browse/löse auf in der angegebenen Domäne."
 
+#~ msgid "%g x %g"
+#~ msgstr "%g×%g"
+
 #~ msgid "720dpi"
 #~ msgstr "720 dpi"
 
diff --git a/locale/cups_es.po b/locale/cups_es.po
index 4640db6af..82057eb85 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1574,8 +1574,8 @@ msgid "%d x %d mm"
 msgstr "%d x %d mm"
 
 #, c-format
-msgid "%g x %g"
-msgstr "%g x %g"
+msgid "%g x %g \""
+msgstr ""
 
 #, c-format
 msgid "%s (%s)"
@@ -13799,6 +13799,9 @@ msgstr "Y Back Side Image Shift"
 #~ "\"%s\": Valor uriScheme \"%s\" incorrecto - longitud %d incorrecta (RFC "
 #~ "2911 sección 4.1.6)."
 
+#~ msgid "%g x %g"
+#~ msgstr "%g x %g"
+
 #~ msgid "CD/DVD/Bluray"
 #~ msgstr "CD/DVD/Bluray"
 
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 293f138b8..142eab877 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1367,7 +1367,7 @@ msgid "%d x %d mm"
 msgstr ""
 
 #, c-format
-msgid "%g x %g"
+msgid "%g x %g \""
 msgstr ""
 
 #, c-format
diff --git a/locale/cups_it.po b/locale/cups_it.po
index b4ba7fe71..7c5d604bb 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1569,7 +1569,7 @@ msgid "%d x %d mm"
 msgstr ""
 
 #, c-format
-msgid "%g x %g"
+msgid "%g x %g \""
 msgstr ""
 
 #, c-format
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index d51d235cf..94ca8aead 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1545,8 +1545,8 @@ msgid "%d x %d mm"
 msgstr "%d x %d mm"
 
 #, c-format
-msgid "%g x %g"
-msgstr "%g x %g"
+msgid "%g x %g \""
+msgstr ""
 
 #, c-format
 msgid "%s (%s)"
@@ -13793,6 +13793,9 @@ msgstr "Y Back Side Image Shift"
 #~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 #~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f バイト"
 
+#~ msgid "%g x %g"
+#~ msgstr "%g x %g"
+
 #~ msgid "%s: Error - expected destination after \"-b\" option."
 #~ msgstr "%s: エラー - \"-b\" オプションのあとに宛先が必要です。"
 
diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index ad90de4d4..54d7f9db7 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-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"
@@ -1578,8 +1578,8 @@ msgid "%d x %d mm"
 msgstr "%d x %d mm"
 
 #, c-format
-msgid "%g x %g"
-msgstr "%g x %g"
+msgid "%g x %g \""
+msgstr ""
 
 #, c-format
 msgid "%s (%s)"
@@ -13786,6 +13786,9 @@ msgstr "Y Back Side Image Shift"
 #~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 #~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 
+#~ msgid "%g x %g"
+#~ msgstr "%g x %g"
+
 #~ msgid "720dpi"
 #~ msgstr "720dpi"
 
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 50745694e..0d4355f94 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -1506,8 +1506,8 @@ msgid "%d x %d mm"
 msgstr "%d x %d мм"
 
 #, c-format
-msgid "%g x %g"
-msgstr "%g x %g"
+msgid "%g x %g \""
+msgstr ""
 
 #, c-format
 msgid "%s (%s)"
@@ -13701,6 +13701,9 @@ msgstr "Y Back Side Image Shift"
 #~ "\"%s\": Ошибка uriScheme значение \"%s\" - ошибка длины %d (RFC 2911 "
 #~ "раздел 4.1.6)."
 
+#~ msgid "%g x %g"
+#~ msgstr "%g x %g"
+
 #~ msgid "File Folder "
 #~ msgstr "Каталог файла "
 
diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index b61d379f2..7b12dcb10 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-07-19 12:33-0400\n"
+"POT-Creation-Date: 2017-07-19 13:46-0400\n"
 "PO-Revision-Date: 2017-06-11 12:38+0800\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: \n"
@@ -1500,8 +1500,8 @@ msgid "%d x %d mm"
 msgstr "%d x %d 毫米"
 
 #, c-format
-msgid "%g x %g"
-msgstr "%g x %g"
+msgid "%g x %g \""
+msgstr ""
 
 #, c-format
 msgid "%s (%s)"
@@ -13595,6 +13595,9 @@ msgstr "Y Back Side Image Shift"
 #~ msgstr ""
 #~ "“%s”：无效的 uriScheme 赋值“%s”- 无效长度 %d（RFC 2911 章节 4.1.6）。"
 
+#~ msgid "%g x %g"
+#~ msgstr "%g x %g"
+
 #~ msgid "Envelope #10 "
 #~ msgstr "10 号信封 "