From 06286243e9524402fa331b624484931e1ff5878b Mon Sep 17 00:00:00 2001
From: Noemi Erli <nerli@mozilla.com>
Date: Fri, 8 Nov 2019 03:51:10 +0200
Subject: [PATCH] Backed out changeset ec5a8a6a37d4 (bug 1594874) for causing
 Linux build bustages CLOSED TREE

---
 .../browser_misused_characters_in_strings.js       |  5 +++++
 dom/base/nsContentUtils.cpp                        |  1 +
 dom/locales/en-US/chrome/layout/xbl.properties     | 14 ++++++++++++++
 dom/locales/jar.mn                                 |  1 +
 dom/locales/moz.build                              |  3 +++
 intl/strres/nsStringBundle.cpp                     |  1 +
 6 files changed, 25 insertions(+)
 create mode 100644 dom/locales/en-US/chrome/layout/xbl.properties

diff --git a/browser/base/content/test/static/browser_misused_characters_in_strings.js b/browser/base/content/test/static/browser_misused_characters_in_strings.js
index 875d8e759abd9..6bbefe0c74f9c 100644
--- a/browser/base/content/test/static/browser_misused_characters_in_strings.js
+++ b/browser/base/content/test/static/browser_misused_characters_in_strings.js
@@ -89,6 +89,11 @@ let gWhitelist = [
     key: "ImageMapPolyOddNumberOfCoords",
     type: "double-quote",
   },
+  {
+    file: "xbl.properties",
+    key: "CommandNotInChrome",
+    type: "double-quote",
+  },
   {
     file: "dom.properties",
     key: "PatternAttributeCompileFailure",
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index bb77b8b01ed93..c3afb08a37346 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -3550,6 +3550,7 @@ void nsContentUtils::GetEventArgNames(int32_t aNameSpaceID, nsAtom* aEventName,
 static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = {
     // Must line up with the enum values in |PropertiesFile| enum.
     "chrome://global/locale/css.properties",
+    "chrome://global/locale/xbl.properties",
     "chrome://global/locale/xul.properties",
     "chrome://global/locale/layout_errors.properties",
     "chrome://global/locale/layout/HtmlForm.properties",
diff --git a/dom/locales/en-US/chrome/layout/xbl.properties b/dom/locales/en-US/chrome/layout/xbl.properties
new file mode 100644
index 0000000000000..2b51394452a24
--- /dev/null
+++ b/dom/locales/en-US/chrome/layout/xbl.properties
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+UnexpectedElement=Unexpected <%1$S> element.
+# LOCALIZATION NOTE: do not localize key=“%S” modifiers=“%S” id=“%S”
+GTK2Conflict2=Key event not available on GTK2: key=“%S” modifiers=“%S” id=“%S”
+WinConflict2=Key event not available on some keyboard layouts: key=“%S” modifiers=“%S” id=“%S”
+TooDeepBindingRecursion=The XBL binding “%S” is already used by too many ancestor elements; not applying it to prevent infinite recursion.
+CircularExtendsBinding=Extending the XBL binding “%S” with “%S” would lead to it extending itself
+# LOCALIZATION NOTE: do not localize <handler command="…">
+CommandNotInChrome=Use of <handler command="…"> not allowed outside chrome.
+MalformedXBL = An XBL file is malformed. Did you forget the XBL namespace on the bindings tag?
+MissingIdAttr = An “id” attribute missing on the binding tag.
diff --git a/dom/locales/jar.mn b/dom/locales/jar.mn
index 9cc596cb28d9e..8ad1a5231c664 100644
--- a/dom/locales/jar.mn
+++ b/dom/locales/jar.mn
@@ -6,6 +6,7 @@
 
 @AB_CD@.jar:
   locale/@AB_CD@/global/css.properties                         (%chrome/layout/css.properties)
+  locale/@AB_CD@/global/xbl.properties                         (%chrome/layout/xbl.properties)
   locale/@AB_CD@/global/xul.properties                         (%chrome/layout/xul.properties)
   locale/@AB_CD@/global/printing.properties                    (%chrome/layout/printing.properties)
   locale/@AB_CD@/global/layout_errors.properties               (%chrome/layout/layout_errors.properties)
diff --git a/dom/locales/moz.build b/dom/locales/moz.build
index 6ffa692a8bf19..51f4b88ccd472 100644
--- a/dom/locales/moz.build
+++ b/dom/locales/moz.build
@@ -31,6 +31,9 @@ with Files("en-US/chrome/layout/MediaDocument.properties"):
 with Files("en-US/chrome/layout/printing.properties"):
     BUG_COMPONENT = ("Core", "Printing: Output")
 
+with Files("en-US/chrome/layout/xbl.properties"):
+    BUG_COMPONENT = ("Core", "XBL")
+
 with Files("en-US/chrome/layout/xmlparser.properties"):
     BUG_COMPONENT = ("Core", "XML")
 
diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp
index 993bc03bb86ec..a4e08dc34fc0d 100644
--- a/intl/strres/nsStringBundle.cpp
+++ b/intl/strres/nsStringBundle.cpp
@@ -78,6 +78,7 @@ static const char kContentBundles[][52] = {
     "chrome://global/locale/security/csp.properties",
     "chrome://global/locale/security/security.properties",
     "chrome://global/locale/svg/svg.properties",
+    "chrome://global/locale/xbl.properties",
     "chrome://global/locale/xul.properties",
     "chrome://necko/locale/necko.properties",
 };