Merge labels and access keys into one string in locales

chrome/content/ui/subscriptionSelection.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 152 matching lines @@
         else
           title.setAttribute("class", "subscriptionTitle");
         title.textContent = node.getAttribute("title") + " (" + node.getAttribute("specialization") + ")";
         mainTitle = variant.getAttribute("title");
         mainURL = variant.getAttribute("url");
         isFirst = false;
       }
       title.setAttribute("flex", "1");
       title.style.marginLeft = (20 * level) + "px";
       item.appendChild(title);
-  
+
       let variantTitle = document.createElement("description");
       variantTitle.setAttribute("class", "variant");
       variantTitle.textContent = variant.getAttribute("title");
       variantTitle.setAttribute("crop", "end");
       item.appendChild(variantTitle);
 
       list.appendChild(item);
     }
 
     let supplements = node.getElementsByTagName("supplements");
@@ skipping 30 matching lines @@
     while (messageElement.firstChild)
       messageElement.removeChild(messageElement.firstChild);
     messageElement.appendChild(document.createTextNode(beforeLink));
     let link = document.createElement("label");
     link.className = "text-link";
     link.setAttribute("tooltiptext", mainSubscriptionURL);
     link.addEventListener("click", function() UI.loadInBrowser(mainSubscriptionURL), false);
     link.textContent = mainSubscriptionTitle;
     messageElement.appendChild(link);
     messageElement.appendChild(document.createTextNode(afterLink));
-    
+
     addMainCheckbox.value = mainSubscriptionURL;
     addMainCheckbox.setAttribute("_mainSubscriptionTitle", mainSubscriptionTitle)
-    addMainCheckbox.label = addMainCheckbox.getAttribute("_labelTemplate").replace(/\?1\?/g, mainSubscriptionTitle);
-    addMainCheckbox.accessKey = addMainCheckbox.accessKey;
+    let [label, accesskey] = Utils.splitLabel(addMainCheckbox.getAttribute("_labelTemplate"));
+    addMainCheckbox.label = label.replace(/\?1\?/g, mainSubscriptionTitle);
+    addMainCheckbox.accessKey = accesskey;
   }
   else
   {
     messageElement.setAttribute("invisible", "true");
     addMainCheckbox.setAttribute("invisible", "true");
   }
 }
 
 function validateURL(url)
 {
@@ skipping 59 matching lines @@
   subscription.title = title;
 
   if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
     Synchronizer.execute(subscription);
 }
 
 function hasSubscription(url)
 {
   return FilterStorage.subscriptions.some(function(subscription) subscription instanceof DownloadableSubscription && subscription.url == url);
 }