Merge labels and access keys into one string in locales

chrome/content/ui/filters.xul

 <?xml version="1.0"?>
 
 <!--
   - 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.
   -
@@ skipping 75 matching lines @@
   <command id="filters-copy-command" oncommand="FilterActions.copySelected(true);"/>
   <command id="filters-cut-command" oncommand="FilterActions.copySelected(false);"/>
   <command id="filters-paste-command" oncommand="FilterActions.paste();"/>
   <command id="find-command" oncommand="E('findbar').startFind(E('findbar').FIND_NORMAL)"/>
   <command id="find-again-command" oncommand="E('findbar').onFindAgainCommand(false)"/>
   <command id="find-previous-command" oncommand="E('findbar').onFindAgainCommand(true)"/>
 </commandset>
 
 <popupset id="filtersPopupset">
   <menupopup id="filters-view-menu1" onpopupshowing="FilterActions.fillColumnPopup(this);">
-    <menuitem id="filters-view-filter1" label="&filter.column;" accesskey="&filter.accesskey;" type="checkbox" disabled="true"/>
-    <menuitem id="filters-view-slow1" label="&slow.column;" accesskey="&slow.accesskey;" type="checkbox" oncommand="FilterActions.toggleColumn('col-slow')"/>
-    <menuitem id="filters-view-enabled1" label="&enabled.column;" accesskey="&enabled.accesskey;" type="checkbox" oncommand="FilterActions.toggleColumn('col-enabled')"/>
-    <menuitem id="filters-view-hitcount1" label="&hitcount.column;" accesskey="&hitcount.accesskey;" type="checkbox" oncommand="FilterActions.toggleColumn('col-hitcount')"/>
-    <menuitem id="filters-view-lasthit1" label="&lasthit.column;" accesskey="&lasthit.accesskey;" type="checkbox" oncommand="FilterActions.toggleColumn('col-lasthit')"/>
+    <menuitem id="filters-view-filter1" label="&filter.column;" type="checkbox" disabled="true"/>
+    <menuitem id="filters-view-slow1" label="&slow.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-slow')"/>
+    <menuitem id="filters-view-enabled1" label="&enabled.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-enabled')"/>
+    <menuitem id="filters-view-hitcount1" label="&hitcount.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-hitcount')"/>
+    <menuitem id="filters-view-lasthit1" label="&lasthit.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-lasthit')"/>
     <menuseparator/>
-    <menu id="filters-sort-menu1" label="&sort.label;" accesskey="&sort.accesskey;">
+    <menu id="filters-sort-menu1" label="&sort.label;">
       <menupopup id="filters-sort-popup1">
-        <menuitem id="filters-sort-none1" label="&sort.none.label;" accesskey="&sort.none.accesskey;" type="radio" name="sortColumn" oncommand="FilterView.sortBy(null)"/>
-        <menuitem id="filters-sort-filter1" label="&filter.column;" accesskey="&filter.accesskey;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-filter')"/>
-        <menuitem id="filters-sort-slow1" label="&slow.column;" accesskey="&slow.accesskey;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-slow')"/>
-        <menuitem id="filters-sort-enabled1" label="&enabled.column;" accesskey="&enabled.accesskey;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-enabled')"/>
-        <menuitem id="filters-sort-hitcount1" label="&hitcount.column;" accesskey="&hitcount.accesskey;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-hitcount')"/>
-        <menuitem id="filters-sort-lasthit1" label="&lasthit.column;" accesskey="&lasthit.accesskey;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-lasthit')"/>
+        <menuitem id="filters-sort-none1" label="&sort.none.label;" type="radio" name="sortColumn" oncommand="FilterView.sortBy(null)"/>
+        <menuitem id="filters-sort-filter1" label="&filter.column;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-filter')"/>
+        <menuitem id="filters-sort-slow1" label="&slow.column;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-slow')"/>
+        <menuitem id="filters-sort-enabled1" label="&enabled.column;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-enabled')"/>
+        <menuitem id="filters-sort-hitcount1" label="&hitcount.column;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-hitcount')"/>
+        <menuitem id="filters-sort-lasthit1" label="&lasthit.column;" type="radio" name="sortColumn" oncommand="FilterView.sortBy('col-lasthit')"/>
         <menuseparator/>
-        <menuitem id="filters-sort-asc1" label="&sort.ascending.label;" accesskey="&sort.ascending.accesskey;" type="radio" name="sortOrder" oncommand="FilterActions.setSortOrder('ascending')"/>
-        <menuitem id="filters-sort-desc1" label="&sort.descending.label;" accesskey="&sort.descending.accesskey;" type="radio" name="sortOrder" oncommand="FilterActions.setSortOrder('descending')"/>
+        <menuitem id="filters-sort-asc1" label="&sort.ascending.label;" type="radio" name="sortOrder" oncommand="FilterActions.setSortOrder('ascending')"/>
+        <menuitem id="filters-sort-desc1" label="&sort.descending.label;" type="radio" name="sortOrder" oncommand="FilterActions.setSortOrder('descending')"/>
       </menupopup>
     </menu>
   </menupopup>
   <tooltip id="filtersTooltip" onpopupshowing="FilterActions.fillTooltip(event);">
     <grid>
       <columns>
         <column/>
         <column flex="1"/>
       </columns>
       <rows>
@@ skipping 18 matching lines @@
 
 <hbox id="content" flex="1">
   <tabbox id="tabs" flex="1" persist="selectedIndex">
     <tabs onselect="onTabChange(this.parentNode);">
       <tab label="&subscriptions.tab.label;"/>
       <tab label="&filters.tab.label;"/>
     </tabs>
     <tabpanels flex="1">
       <tabpanel id="subscriptionsTab" orient="vertical" flex="1">
         <hbox pack="end">
-          <button id="selectSubscriptionButton" label="&addSubscription.label;…" accesskey="&addSubscription.accesskey;" command="subscription-add-command"/>
+          <button id="selectSubscriptionButton" label="&addSubscription.label;…" command="subscription-add-command"/>
         </hbox>
 
         <panel id="selectSubscriptionPanel" type="arrow" position="bottomcenter topleft"
                orient="vertical" onkeypress="SelectSubscription.keyPress(event);">
           <menuitem id="selectSubscriptionTemplate" hidden="true"
               class="{localePrefix ? 'localeMatch' : ''}"
               label="{node.getAttribute('title')}"
               value="{node.getAttribute('url')}">
             <label class="selectSubscriptionItem" value="{node.getAttribute('title') + ' (' + node.getAttribute('specialization') + ')'}"/>
           </menuitem>
@@ skipping 96 matching lines @@
           <description flex="1">&noSubscriptions.text;</description>
           <richlistbox id="subscriptions" class="initialFocus" flex="1"
               onselect="onSelectionChange(this);"
               ondragover="SubscriptionActions.dragOver(event);"
               ondrop="SubscriptionActions.drop(event, null);"
               onkeypress="SubscriptionActions.keyPress(event);">
           </richlistbox>
         </deck>
 
         <description>
-          <checkbox id="acceptableAds" label="&acceptableAds2.label;" accesskey="&acceptableAds2.accesskey;" oncommand="ListManager.allowAcceptableAds(this.checked);"/>
+          <checkbox id="acceptableAds" label="&acceptableAds2.label;" oncommand="ListManager.allowAcceptableAds(this.checked);"/>
           <label class="text-link" value="&viewList.label;" onclick="UI.loadInBrowser(Prefs.subscriptions_exceptionsurl);"/>
           <label class="text-link" value="&readMore.label;" onclick="UI.loadDocLink('acceptable_ads');"/>
         </description>
       </tabpanel>
       <tabpanel id="filtersTab" orient="vertical" flex="1">
         <hbox pack="end">
-          <button id="addGroupButton" label="&addGroup.label;" accesskey="&addGroup.accesskey;" command="group-add-command"/>
+          <button id="addGroupButton" label="&addGroup.label;" command="group-add-command"/>
         </hbox>
 
         <richlistitem id="groupTemplate" class="subscription" hidden="true" orient="vertical"
             onmousedown="this._wasSelected = (this.parentNode.selectedItem == this);"
             ondragstart="SubscriptionActions.startDrag(event, this);"
             ondragend="SubscriptionActions.endDrag();"
             ondragover="SubscriptionActions.dragOver(event);"
             ondrop="SubscriptionActions.drop(event, this);"
             oncontextmenu="SubscriptionActions.openMenu(event, this);">
           <hbox class="{subscription.disabled ? 'disabled' : ''}" align="center">
@@ skipping 30 matching lines @@
       </tabpanel>
     </tabpanels>
   </tabbox>
 
   <splitter id="filtersSplitter" persist="state" orient="horizontal" collapse="after" state="collapsed" oncommand="FilterView.refresh();onSplitterStateChange(this);">
     <grippy id="filtersGrippy"/>
   </splitter>
 
   <vbox id="filtersContainer" persist="width height" width="500">
     <hbox pack="end">
-      <button id="findButton" label="&find.label;" accesskey="&find.accesskey;" command="find-command"/>
+      <button id="findButton" label="&find.label;" command="find-command"/>
       <button id="filterActionButton" type="menu" label="&filter.actions.label;">
         <menupopup id="filterActionMenu" onpopupshowing="FilterActions.fillActionsPopup();">
           <menuitem label="&filter.edit.label;" key="edit-key" command="filters-edit-command"/>
           <menuitem label="&filter.cut.label;" key="filters-cut-key" command="filters-cut-command"/>
           <menuitem label="&filter.copy.label;" key="filters-copy-key" command="filters-copy-command"/>
           <menuitem label="&filter.paste.label;" key="filters-paste-key" command="filters-paste-command"/>
           <menuitem label="&filter.delete.label;" key="delete-key" command="filters-delete-command"/>
           <menuseparator/>
           <menuitem label="&filter.selectAll.label;" key="filters-selectAll-key" command="filters-selectAll-command"/>
           <menuitem label="&filter.resetHitCounts.label;" command="filters-resetHitCounts-command"/>
           <menuseparator/>
           <menuitem label="&filter.moveUp.label;" key="moveUp-key" command="filters-moveUp-command"/>
           <menuitem label="&filter.moveDown.label;" key="moveDown-key" command="filters-moveDown-command"/>
           <menuseparator/>
           <menu id="viewMenu" label="&viewMenu.label;"/>
         </menupopup>
       </button>
-      <button id="addFilterButton" label="&addFilter.label;" accesskey="&addFilter.accesskey;" command="filters-add-command"/>
+      <button id="addFilterButton" label="&addFilter.label;" command="filters-add-command"/>
     </hbox>
     <tree id="filtersTree"
         flex="1"
         editable="true"
         seltype="multiple"
         enableColumnDrag="true"
         hidecolumnpicker="true"
         _removewarning="&filters.remove.warning;">
       <treecols context="filters-view-menu1">
         <treecol id="col-enabled" label="&enabled.column;" cycler="true" flex="0" persist="width ordinal sortDirection hidden"/>
@@ skipping 15 matching lines @@
           ondragstart="FilterActions.startDrag(event);"
           ondragend="FilterActions.endDrag(event);"/>
     </tree>
   </vbox>
 </hbox>
 
 <findbar id="findbar"/>
 
 <hbox id="buttons">
   <button id="backupButton" type="menu"
-      label="&backupButton.label;" accesskey="&backupButton.accesskey;"
+      label="&backupButton.label;"
       _backupDialogTitle="&backup.label;" _restoreDialogTitle="&restore.own.label;"
       _fileFilterComplete="&backup.complete.title;" _fileFilterCustom="&backup.custom.title;"
       _backupError="&backup.error;" _restoreError="&restore.error;"
       _restoreCompleteWarning="&restore.complete.warning;" _restoreCustomWarning="&restore.custom.warning;"
       _restoreVersionWarning="&restore.minVersion.warning;"
       oncommand="if (event.target == this) Utils.runAsync(function() this.open = true, this);">
     <menupopup onpopupshowing="Backup.fillRestorePopup();">
       <menuitem id="backup" key="backup-key" label="&backup.label;…" oncommand="Backup.backupToFile();"/>
       <menuseparator/>
       <menuitem id="restoreBackupTemplate" label="&restore.default.label;" hidden="true"/>
       <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.label;…" oncommand="Backup.restoreFromFile();"/>
     </menupopup>
   </button>
 
   <spacer flex="1"/>
 
   <button id="close" dlgtype="accept" label="&close.label;"/>
 </hbox>
 
 </dialog>