Update localization headers.

diff --git a/CHANGES.md b/CHANGES.md
index 8f8dac376af7b92fbe3736be66b4b32c8cab95c2..b96184fd8df0137c466a50d1a476ae8b692b5a37 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,13 @@
-CHANGES - 2.3b3 - 2018-01-17
+CHANGES - 2.3b3 - 2018-01-31
 ============================
 
 Changes in CUPS v2.3b3
 ----------------------
 
+- More fixes for printing to old CUPS servers (Issue #5211)
 - The IPP Everywhere PPD generator did not support deep grayscale or 8-bit per
   component AdobeRGB (Issue #5227)
+- Localization changes (Issue #5232, rdar://37068158)
 
 
 Changes in CUPS v2.3b2

diff --git a/locale/cups.header b/locale/cups.header
index 8631d9c4f7c6873b8aa297bb9cf4fc705d1bef8a..c2a56877aa2302c88d81a36e9173611b77250c2a 100644 (file)
--- a/locale/cups.header
+++ b/locale/cups.header
@@ -1,14 +1,11 @@
 #
 # Message catalog template for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 2005-2007 by Easy Software Products.
-#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2005-2007 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 #

diff --git a/locale/cups.pot b/locale/cups.pot
index 26fb465858453693b0390a2310ee8c505b609d41..79860ea05f7d702b1129869dab7d2b5162ff18b3 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -1,14 +1,11 @@
 #
 # Message catalog template for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 2005-2007 by Easy Software Products.
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2005-2007 by Easy Software Products.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 #
@@ -28,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3b2\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2367,7 +2364,7 @@ msgstr ""
 msgid "-95"
 msgstr ""
 
-#: cups/dest.c:1842
+#: cups/dest.c:1860
 msgid "/etc/cups/lpoptions file names default destination that does not exist."
 msgstr ""
 
@@ -3287,7 +3284,7 @@ msgstr ""
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
 
-#: cups/dest.c:1635
+#: cups/dest.c:1653
 msgid "Bad NULL dests pointer"
 msgstr ""
 
@@ -3332,6 +3329,10 @@ msgstr ""
 msgid "Bad UIConstraints"
 msgstr ""
 
+#: cups/dest.c:1193
+msgid "Bad URI."
+msgstr ""
+
 #: cups/hash.c:47 cups/http-support.c:1458
 msgid "Bad arguments to function"
 msgstr ""
@@ -3446,7 +3447,7 @@ msgstr ""
 msgid "Bad printer-state value %d."
 msgstr ""
 
-#: cups/dest.c:676 cups/dest.c:1174 cups/dest.c:1225
+#: cups/dest.c:676 cups/dest.c:1243
 msgid "Bad printer-uri."
 msgstr ""
 
@@ -4355,7 +4356,7 @@ msgstr ""
 msgid "Invalid media name arguments."
 msgstr ""
 
-#: cups/dest-options.c:1195
+#: cups/dest-options.c:1211
 msgid "Invalid media size."
 msgstr ""
 
@@ -4518,7 +4519,7 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
-#: cups/dest.c:1830
+#: cups/dest.c:1848
 msgid "LPDEST environment variable names default destination that does not exist."
 msgstr ""
 
@@ -4798,7 +4799,7 @@ msgstr ""
 msgid "No community name"
 msgstr ""
 
-#: cups/dest.c:1834 cups/dest.c:1846
+#: cups/dest.c:1852 cups/dest.c:1864
 msgid "No default destination."
 msgstr ""
 
@@ -5047,7 +5048,7 @@ msgstr ""
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
-#: cups/dest.c:1832
+#: cups/dest.c:1850
 msgid "PRINTER environment variable names default destination that does not exist."
 msgstr ""
 
@@ -6010,7 +6011,7 @@ msgstr ""
 msgid "Unable to rename job document file."
 msgstr ""
 
-#: cups/dest.c:3239
+#: cups/dest.c:3257
 msgid "Unable to resolve printer-uri."
 msgstr ""
 
@@ -6101,7 +6102,7 @@ msgstr ""
 msgid "Unknown hash algorithm."
 msgstr ""
 
-#: cups/dest-options.c:1120
+#: cups/dest-options.c:1136
 msgid "Unknown media size name."
 msgstr ""
 
@@ -7470,7 +7471,7 @@ msgstr ""
 msgid "variable-bindings uses indefinite length"
 msgstr ""
 
-#: cups/dest.c:1838
+#: cups/dest.c:1856
 msgid "~/.cups/lpoptions file names default destination that does not exist."
 msgstr ""
 msgid "accuracy-units"

diff --git a/locale/cups.strings b/locale/cups.strings
index 77f353b6b7c5b6f20bb323478f8fc0eab5572655..5c165fcc23c6207ca51c45ccd99da0fa9417dbb7 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -710,6 +710,7 @@
 "Bad Request" = "Bad Request";
 "Bad SNMP version number" = "Bad SNMP version number";
 "Bad UIConstraints" = "Bad UIConstraints";
+"Bad URI." = "Bad URI.";
 "Bad arguments to function" = "Bad arguments to function";
 "Bad copies value %d." = "Bad copies value %d.";
 "Bad custom parameter" = "Bad custom parameter";

diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 0f05a5c085f142f687b7a7d9192aae98aef86424..afafdc36301344c20f3ade97d0c8b905e280129f 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2769,6 +2769,9 @@ msgstr "El número de versió del SNMP és incorrecte"
 msgid "Bad UIConstraints"
 msgstr "La UIConstraints és incorrecta"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr ""
 

diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 4406be0cb69c5502ebcd99815ec026f706857c88..9c295ed38ab08453de9b466c8df2a5fefab75b3f 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2577,6 +2577,9 @@ msgstr "Chybná verze SNMP"
 msgid "Bad UIConstraints"
 msgstr "Chybný UIConstraints"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr ""
 

diff --git a/locale/cups_de.po b/locale/cups_de.po
index 9753b698efe3792b06a8b0c935a818588b128cc5..ed6097de2a4251a7478af9dac9802d874698c8e9 100644 (file)
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -1,17 +1,11 @@
 #
-# "$Id$"
+# Message catalog template for CUPS.
 #
-#   Message catalog template for CUPS.
-#
-#   Copyright 2007-2012 by Apple Inc.
-#   Copyright 2005-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2005-2007 by Easy Software Products.
 #
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 # Notes for Translators:
 #
@@ -27,7 +21,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CUPS 2.0\n"
+"Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
 "POT-Creation-Date: 2017-12-15 16:40-0500\n"
 "PO-Revision-Date: 2017-10-25 14:57+0200\n"

diff --git a/locale/cups_es.po b/locale/cups_es.po
index 995661b819609bf2ecb07e316491ae12ec932d6c..a5a42c307318c365be5521fa7a6dff33996b8080 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2799,6 +2799,9 @@ msgstr "Número de versión SNMP incorrecto"
 msgid "Bad UIConstraints"
 msgstr "UIConstraints incorrecto"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr "Argumentos de la función incorrectos"
 

diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 34cbc2e635e4f71b675e8804e0ca17a71e2228fd..ef9dcfba8ac9af13627bc3146d48717f001db2c7 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-0500\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2637,6 +2637,9 @@ msgstr "Numéro de version SNMP incorrect"
 msgid "Bad UIConstraints"
 msgstr ""
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr "Paramètres de la fonction incorrects"
 

diff --git a/locale/cups_it.po b/locale/cups_it.po
index c1e99ad7d68b970d485192958bdfbf75b3c87c55..bc5b8d606f27e3297430574ff51d75b75300a77b 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2795,6 +2795,9 @@ msgstr "Il numero di versione di SNMP non è valido"
 msgid "Bad UIConstraints"
 msgstr "UIConstraints non è valido"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr ""
 

diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index c5d8f4b21c2b6283abd72b2c7d64a41c9e8edc8e..9afeb3a4e6f882f5e4000a48a1cd45206ab5a20e 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2765,6 +2765,9 @@ msgstr "不正な SNMP バージョン番号"
 msgid "Bad UIConstraints"
 msgstr "不正な UIConstraints"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr "関数の引数が不正"
 

diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index da4b5b069f7653b2236d7e4e463996c70a0ba9ad..2634bb7043dc9226975af5a141645b445a7e67b1 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-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"
@@ -2799,6 +2799,9 @@ msgstr "Número de versão SNMP inválido"
 msgid "Bad UIConstraints"
 msgstr "UIConstraints inválido"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr "Argumentos inválidos para função"
 

diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index fc5ec9541d3aea0a5e5c4b6cc94e0426ed5a1d76..90bb01378a723cad071b7a794cafe8e5a1ac39cc 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-0500\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -2733,6 +2733,9 @@ msgstr "Неверный номер версии SNMP"
 msgid "Bad UIConstraints"
 msgstr "Неверное значение UIConstraints"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr "Неверные аргументы для функции"
 

diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index fc29e82a46f10d2d9ad36750a636856363bb0918..70bf086616b66496b2b80b1bb962a4ad60d9761b 100644 (file)
--- 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: 2018-01-31 14:22-0500\n"
+"POT-Creation-Date: 2018-01-31 21:08-0500\n"
 "PO-Revision-Date: 2017-06-11 12:38+0800\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: \n"
@@ -2710,6 +2710,9 @@ msgstr "无效的 SNMP 版本号"
 msgid "Bad UIConstraints"
 msgstr "无锡噢的 UIConstraints 值"
 
+msgid "Bad URI."
+msgstr ""
+
 msgid "Bad arguments to function"
 msgstr "函数的参数无效"