Merge labels and access keys into one string in locales

chrome/content/ui/composer.js

Index: chrome/content/ui/composer.js
===================================================================
--- a/chrome/content/ui/composer.js
+++ b/chrome/content/ui/composer.js
@@ -319,25 +319,23 @@ function updatePatternSelection()
   {
     return RegExpFilter.fromText(filter + "$" + item.typeDescr).matches(item.location, item.typeDescr, item.docDomain, item.thirdParty);
   }
 
   let anchorStartCheckbox = E("anchorStart");
   if (!/^\*/.test(pattern) && testFilter("||" + pattern))
   {
     disableElement(anchorStartCheckbox, false, "checked", false);
-    anchorStartCheckbox.setAttribute("label", anchorStartCheckbox.getAttribute("labelFlexible"));
-    anchorStartCheckbox.accessKey =  anchorStartCheckbox.getAttribute("accesskeyFlexible");
+    [anchorStartCheckbox.label, anchorStartCheckbox.accessKey] = Utils.splitLabel(anchorStartCheckbox.getAttribute("labelFlexible"));
     anchorStartCheckbox.flexibleAnchor = true;
   }
   else
   {
     disableElement(anchorStartCheckbox, /^\*/.test(pattern) || !testFilter("|" + pattern), "checked", false);
-    anchorStartCheckbox.setAttribute("label", anchorStartCheckbox.getAttribute("labelRegular"));
-    anchorStartCheckbox.accessKey = anchorStartCheckbox.getAttribute("accesskeyRegular");
+    [anchorStartCheckbox.label, anchorStartCheckbox.accessKey] = Utils.splitLabel(anchorStartCheckbox.getAttribute("labelRegular"));
     anchorStartCheckbox.flexibleAnchor = false;
   }
   disableElement(E("anchorEnd"), /[\*\^]$/.test(pattern) || !testFilter(pattern + "|"), "checked", false);
 
   updateFilter();
   setAdvancedMode(document.documentElement.getAttribute("advancedMode") == "true");
 }