Merge labels and access keys into one string in locales

chrome/content/ui/composer.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 306 matching lines @@
 
   function testFilter(/**String*/ filter) /**Boolean*/
   {
     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");
 }
 
 function updateCustomPattern()
 {
@@ skipping 58 matching lines @@
  * Selects or unselects all type checkboxes except those
  * that are disabled.
  */
 function selectAllTypes(/**Boolean*/ select)
 {
   for (let typeNode = E("typeGroup").firstChild; typeNode; typeNode = typeNode.nextSibling)
     if (typeNode.getAttribute("disabled") != "true")
       typeNode.checked = select;
   updateFilter();
 }