Bug 1604960 - Migrate all text actions to use Fluent. r=fluent-reviewers,Gijs,flod

Differential Revision: https://phabricator.services.mozilla.com/D57713 --HG-- extra : moz-landing-system : lando
2019-12-24 20:43:17 +00:00 · 2019-12-24 20:43:17 +00:00 · ebad9a1dbf
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@ -96,27 +96,27 @@
                         onpopuphidden="updateEditUIVisibility()">
                <menuitem id="menu_undo"
                          key="key_undo"
-                          command="cmd_undo" data-l10n-id="menu-edit-undo"/>
+                          command="cmd_undo" data-l10n-id="text-action-undo"/>
                <menuitem id="menu_redo"
                          key="key_redo"
-                          command="cmd_redo" data-l10n-id="menu-edit-redo"/>
+                          command="cmd_redo" data-l10n-id="text-action-redo"/>
                <menuseparator/>
                <menuitem id="menu_cut"
                          key="key_cut"
-                          command="cmd_cut" data-l10n-id="menu-edit-cut"/>
+                          command="cmd_cut" data-l10n-id="text-action-cut"/>
                <menuitem id="menu_copy"
                          key="key_copy"
-                          command="cmd_copy" data-l10n-id="menu-edit-copy"/>
+                          command="cmd_copy" data-l10n-id="text-action-copy"/>
                <menuitem id="menu_paste"
                          key="key_paste"
-                          command="cmd_paste" data-l10n-id="menu-edit-paste"/>
+                          command="cmd_paste" data-l10n-id="text-action-paste"/>
                <menuitem id="menu_delete"
                          key="key_delete"
-                          command="cmd_delete" data-l10n-id="menu-edit-delete"/>
+                          command="cmd_delete" data-l10n-id="text-action-delete"/>
                <menuseparator/>
                <menuitem id="menu_selectAll"
                          key="key_selectAll"
-                          command="cmd_selectAll" data-l10n-id="menu-edit-select-all"/>
+                          command="cmd_selectAll" data-l10n-id="text-action-select-all"/>
                <menuseparator/>
                <menuitem id="menu_find"
                          key="key_find"
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@ -629,25 +629,19 @@
    </menupopup>
    <menupopup id="SyncedTabsSidebarTabsFilterContext"
               class="textbox-contextmenu">
-      <menuitem label="&undoCmd.label;"
-                accesskey="&undoCmd.accesskey;"
+      <menuitem data-l10n-id="text-action-undo"
                cmd="cmd_undo"/>
      <menuseparator/>
-      <menuitem label="&cutCmd.label;"
-                accesskey="&cutCmd.accesskey;"
+      <menuitem data-l10n-id="text-action-cut"
                cmd="cmd_cut"/>
-      <menuitem label="&copyCmd.label;"
-                accesskey="&copyCmd.accesskey;"
+      <menuitem data-l10n-id="text-action-copy"
                cmd="cmd_copy"/>
-      <menuitem label="&pasteCmd.label;"
-                accesskey="&pasteCmd.accesskey;"
+      <menuitem data-l10n-id="text-action-paste"
                cmd="cmd_paste"/>
-      <menuitem label="&deleteCmd.label;"
-                accesskey="&deleteCmd.accesskey;"
+      <menuitem data-l10n-id="text-action-delete"
                cmd="cmd_delete"/>
      <menuseparator/>
-      <menuitem label="&selectAllCmd.label;"
-                accesskey="&selectAllCmd.accesskey;"
+      <menuitem data-l10n-id="text-action-select-all"
                cmd="cmd_selectAll"/>
      <menuseparator/>
      <menuitem data-lazy-l10n-id="synced-tabs-context-sync-now"
--- a/browser/base/content/macWindow.inc.xhtml
+++ b/browser/base/content/macWindow.inc.xhtml
@ -13,6 +13,7 @@
 <linkset>
  <html:link rel="localization" href="branding/brand.ftl"/>
  <html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
+  <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
  <html:link rel="localization" href="browser/menubar.ftl"/>
 </linkset>

--- a/browser/components/places/content/bookmarksSidebar.xhtml
+++ b/browser/components/places/content/bookmarksSidebar.xhtml
@ -19,6 +19,7 @@

 <window id="bookmarksPanel"
        class="sidebar-panel"
+        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="init();"
        onunload="PlacesUIUtils.setMouseoverURL('', window);"
@ -31,6 +32,10 @@
  <script src="chrome://browser/content/places/places-tree.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>

+  <linkset>
+    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
+  </linkset>
+
 #include placesCommands.inc.xhtml
 #include placesContextMenu.inc.xhtml
 #include bookmarksHistoryTooltip.inc.xhtml
--- a/browser/components/places/content/historySidebar.xhtml
+++ b/browser/components/places/content/historySidebar.xhtml
@ -20,6 +20,7 @@
 <window id="history-panel"
        class="sidebar-panel"
        orient="vertical"
+        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="HistorySidebarInit();"
        onunload="PlacesUIUtils.setMouseoverURL('', window);"
@ -32,6 +33,10 @@
  <script src="chrome://browser/content/places/places-tree.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>

+  <linkset>
+    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
+  </linkset>
+
 #include placesCommands.inc.xhtml

 #include ../../../../toolkit/content/editMenuKeys.inc.xhtml
--- a/browser/components/places/content/places.xhtml
+++ b/browser/components/places/content/places.xhtml
@ -42,6 +42,10 @@
        toggletoolbar="true"
        persist="width height screenX screenY sizemode">

+  <linkset>
+    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
+  </linkset>
+
  <script src="chrome://browser/content/places/places.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>
 #ifndef XP_MACOSX
@ -198,48 +202,41 @@

            <menuitem id="orgUndo"
                      command="cmd_undo"
-                      label="&undoCmd.label;"
-                      key="key_undo"
-                      accesskey="&undoCmd.accesskey;"/>
+                      data-l10n-id="text-action-undo"
+                      key="key_undo"/>
            <menuitem id="orgRedo"
                      command="cmd_redo"
-                      label="&redoCmd.label;"
-                      key="key_redo"
-                      accesskey="&redoCmd.accesskey;"/>
+                      data-l10n-id="text-action-redo"
+                      key="key_redo"/>

            <menuseparator id="orgCutSeparator"/>

            <menuitem id="orgCut"
                      command="cmd_cut"
-                      label="&cutCmd.label;"
+                      data-l10n-id="text-action-cut"
                      key="key_cut"
-                      accesskey="&cutCmd.accesskey;"
                      selection="separator|link|folder|mixed"/>
            <menuitem id="orgCopy"
                      command="cmd_copy"
-                      label="&copyCmd.label;"
+                      data-l10n-id="text-action-copy"
                      key="key_copy"
-                      accesskey="&copyCmd.accesskey;"
                      selection="separator|link|folder|mixed"/>
            <menuitem id="orgPaste"
                      command="cmd_paste"
-                      label="&pasteCmd.label;"
+                      data-l10n-id="text-action-paste"
                      key="key_paste"
-                      accesskey="&pasteCmd.accesskey;"
                      selection="mutable"/>
            <menuitem id="orgDelete"
                      command="cmd_delete"
-                      label="&deleteCmd.label;"
-                      key="key_delete"
-                      accesskey="&deleteCmd.accesskey;"/>
+                      data-l10n-id="text-action-delete"
+                      key="key_delete"/>

            <menuseparator id="selectAllSeparator"/>

            <menuitem id="orgSelectAll"
                      command="cmd_selectAll"
-                      label="&selectAllCmd.label;"
-                      key="key_selectAll"
-                      accesskey="&selectAllCmd.accesskey;"/>
+                      data-l10n-id="text-action-select-all"
+                      key="key_selectAll"/>

            <menuseparator id="orgCloseSeparator"/>

--- a/browser/components/places/content/placesContextMenu.inc.xhtml
+++ b/browser/components/places/content/placesContextMenu.inc.xhtml
@ -80,29 +80,25 @@
            forcehideselection="bookmark|tagChild"/>
  <menuitem id="placesContext_cut"
            command="placesCmd_cut"
-            label="&cutCmd.label;"
-            accesskey="&cutCmd.accesskey;"
+            data-l10n-id="text-action-cut"
            closemenu="single"
            selection="bookmark|folder|separator|query"
            forcehideselection="tagChild"/>
  <menuitem id="placesContext_copy"
            command="placesCmd_copy"
-            label="&copyCmd.label;"
+            data-l10n-id="text-action-copy"
            closemenu="single"
-            accesskey="&copyCmd.accesskey;"
            selection="any"/>
  <menuitem id="placesContext_paste"
+            data-l10n-id="text-action-paste"
            command="placesCmd_paste"
-            label="&pasteCmd.label;"
            closemenu="single"
-            accesskey="&pasteCmd.accesskey;"
            selectiontype="any"
            hideifnoinsertionpoint="true"/>
  <menuseparator id="placesContext_editSeparator"/>
  <menuitem id="placesContext_delete"
+            data-l10n-id="text-action-delete"
            command="placesCmd_delete"
-            label="&deleteCmd.label;"
-            accesskey="&deleteCmd.accesskey;"
            closemenu="single"
            selection="bookmark|tagChild|folder|query|dynamiccontainer|separator|host"/>
  <menuitem id="placesContext_delete_history"
--- a/browser/components/search/content/searchbar.js
+++ b/browser/components/search/content/searchbar.js
@ -838,24 +838,22 @@

    _buildContextMenu() {
      const raw = `
-        <menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"/>
+        <menuitem data-l10n-id="text-action-undo" cmd="cmd_undo"/>
        <menuseparator/>
-        <menuitem label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" cmd="cmd_cut"/>
-        <menuitem label="&copyCmd.label;" accesskey="&copyCmd.accesskey;" cmd="cmd_copy"/>
-        <menuitem label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;" cmd="cmd_paste"/>
+        <menuitem data-l10n-id="text-action-cut" cmd="cmd_cut"/>
+        <menuitem data-l10n-id="text-action-copy" cmd="cmd_copy"/>
+        <menuitem data-l10n-id="text-action-paste" cmd="cmd_paste"/>
        <menuitem class="searchbar-paste-and-search"/>
-        <menuitem label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;" cmd="cmd_delete"/>
+        <menuitem data-l10n-id="text-action-delete" cmd="cmd_delete"/>
        <menuseparator/>
-        <menuitem label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;" cmd="cmd_selectAll"/>
+        <menuitem data-l10n-id="text-action-select-all" cmd="cmd_selectAll"/>
        <menuseparator/>
        <menuitem class="searchbar-clear-history"/>
      `;

      this._menupopup = this.querySelector(".textbox-contextmenu");

-      let frag = MozXULElement.parseXULToFragment(raw, [
-        "chrome://global/locale/textcontext.dtd",
-      ]);
+      let frag = MozXULElement.parseXULToFragment(raw);

      // Insert attributes that come from localized properties
      this._pasteAndSearchMenuItem = frag.querySelector(
--- a/browser/locales/en-US/browser/menubar.ftl
+++ b/browser/locales/en-US/browser/menubar.ftl
@ -60,27 +60,6 @@ menu-file-go-offline =
 menu-edit =
    .label = Edit
    .accesskey = E
-menu-edit-undo =
-    .label = Undo
-    .accesskey = U
-menu-edit-redo =
-    .label = Redo
-    .accesskey = R
-menu-edit-cut =
-    .label = Cut
-    .accesskey = t
-menu-edit-copy =
-    .label = Copy
-    .accesskey = C
-menu-edit-paste =
-    .label = Paste
-    .accesskey = P
-menu-edit-delete =
-    .label = Delete
-    .accesskey = D
-menu-edit-select-all =
-    .label = Select All
-    .accesskey = A
 menu-edit-find-on =
    .label = Find in This Page…
    .accesskey = F
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@ -186,26 +186,12 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
 <!ENTITY newPrivateWindow.label     "New Private Window">

 <!ENTITY editMenu.label         "Edit">
-<!ENTITY undoCmd.label            "Undo">
 <!ENTITY undoCmd.key            "Z">
-<!ENTITY undoCmd.accesskey          "U">
-<!ENTITY redoCmd.label            "Redo">
 <!ENTITY redoCmd.key            "Y">
-<!ENTITY redoCmd.accesskey          "R">
-<!ENTITY cutCmd.label           "Cut">
 <!ENTITY cutCmd.key             "X">
-<!ENTITY cutCmd.accesskey         "t">
-<!ENTITY copyCmd.label            "Copy">
 <!ENTITY copyCmd.key            "C">
-<!ENTITY copyCmd.accesskey          "C">
-<!ENTITY pasteCmd.label           "Paste">
 <!ENTITY pasteCmd.key           "V">
-<!ENTITY pasteCmd.accesskey         "P">
-<!ENTITY deleteCmd.label          "Delete">
-<!ENTITY deleteCmd.accesskey        "D">
-<!ENTITY selectAllCmd.label         "Select All">
 <!ENTITY selectAllCmd.key         "A">
-<!ENTITY selectAllCmd.accesskey       "A">
 <!ENTITY preferencesCmd2.label       "Options">
 <!ENTITY preferencesCmdUnix.label       "Preferences">
 <!ENTITY logins.label                           "Logins and Passwords">
--- a/devtools/client/framework/test/browser_menu_api.js
+++ b/devtools/client/framework/test/browser_menu_api.js
@ -18,10 +18,10 @@ add_task(async function() {
  // This test will involve localized strings, make sure the necessary FTL file is
  // available in the toolbox top window.
  toolbox.topWindow.MozXULElement.insertFTLIfNeeded(
-    "toolkit/main-window/editmenu.ftl"
+    "toolkit/global/textActions.ftl"
  );

-  loadFTL(toolbox, "toolkit/main-window/editmenu.ftl");
+  loadFTL(toolbox, "toolkit/global/textActions.ftl");

  await testMenuItems();
  await testMenuPopup(toolbox);
@ -72,7 +72,7 @@ async function testMenuPopup(toolbox) {
      disabled: true,
    }),
    new MenuItem({
-      l10nID: "editmenu-undo",
+      l10nID: "text-action-undo",
    }),
  ];

@ -151,7 +151,7 @@ async function testSubmenu(toolbox) {
  );
  menu.append(
    new MenuItem({
-      l10nID: "editmenu-copy",
+      l10nID: "text-action-copy",
      submenu: submenu,
    })
  );
@ -182,7 +182,7 @@ async function testSubmenu(toolbox) {
  ok(!menus[0].hasAttribute("disabled"), "Correct disabled state");
  is(
    menus[0].getAttribute("data-l10n-id"),
-    "editmenu-copy",
+    "text-action-copy",
    "Correct localization attribute"
  );

--- a/devtools/client/framework/toolbox-context-menu.js
+++ b/devtools/client/framework/toolbox-context-menu.js
@ -21,7 +21,7 @@ function loadEditMenuStrings(win) {

  if (win.MozXULElement) {
    stringsLoaded.set(win, true);
-    win.MozXULElement.insertFTLIfNeeded("toolkit/main-window/editmenu.ftl");
+    win.MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
  }
 }

@ -46,7 +46,7 @@ function createEditContextMenu(win, id) {
  menu.append(
    new MenuItem({
      id: "editmenu-undo",
-      l10nID: "editmenu-undo",
+      l10nID: "text-action-undo",
      disabled: !docshell.isCommandEnabled("cmd_undo"),
      click: () => {
        docshell.doCommand("cmd_undo");
@ -61,7 +61,7 @@ function createEditContextMenu(win, id) {
  menu.append(
    new MenuItem({
      id: "editmenu-cut",
-      l10nID: "editmenu-cut",
+      l10nID: "text-action-cut",
      disabled: !docshell.isCommandEnabled("cmd_cut"),
      click: () => {
        docshell.doCommand("cmd_cut");
@ -71,7 +71,7 @@ function createEditContextMenu(win, id) {
  menu.append(
    new MenuItem({
      id: "editmenu-copy",
-      l10nID: "editmenu-copy",
+      l10nID: "text-action-copy",
      disabled: !docshell.isCommandEnabled("cmd_copy"),
      click: () => {
        docshell.doCommand("cmd_copy");
@ -81,7 +81,7 @@ function createEditContextMenu(win, id) {
  menu.append(
    new MenuItem({
      id: "editmenu-paste",
-      l10nID: "editmenu-paste",
+      l10nID: "text-action-paste",
      disabled: !docshell.isCommandEnabled("cmd_paste"),
      click: () => {
        docshell.doCommand("cmd_paste");
@ -91,7 +91,7 @@ function createEditContextMenu(win, id) {
  menu.append(
    new MenuItem({
      id: "editmenu-delete",
-      l10nID: "editmenu-delete",
+      l10nID: "text-action-delete",
      disabled: !docshell.isCommandEnabled("cmd_delete"),
      click: () => {
        docshell.doCommand("cmd_delete");
@ -106,7 +106,7 @@ function createEditContextMenu(win, id) {
  menu.append(
    new MenuItem({
      id: "editmenu-selectAll",
-      l10nID: "editmenu-select-all",
+      l10nID: "text-action-select-all",
      disabled: !docshell.isCommandEnabled("cmd_selectAll"),
      click: () => {
        docshell.doCommand("cmd_selectAll");
--- a/devtools/client/styleeditor/index.xhtml
+++ b/devtools/client/styleeditor/index.xhtml
@ -23,6 +23,10 @@
        xmlns:html="http://www.w3.org/1999/xhtml"
        id="style-editor-chrome-window">

+  <linkset>
+    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
+  </linkset>
+
  <script src="chrome://devtools/content/shared/theme-switching.js"/>
  <script src="chrome://global/content/globalOverlay.js"/>
  <script src="chrome://browser/content/utilityOverlay.js"/>
@ -44,20 +48,20 @@
    <menupopup id="sourceEditorContextMenu"
               incontentshell="false"
               onpopupshowing="goUpdateSourceEditorMenuItems()">
-      <menuitem id="cMenu_undo" label="&undoCmd.label;"
-                accesskey="&undoCmd.accesskey;" command="cmd_undo"/>
+      <menuitem id="cMenu_undo"
+                data-l10n-id="text-action-undo" command="cmd_undo"/>
      <menuseparator/>
-      <menuitem id="cMenu_cut" label="&cutCmd.label;"
-                accesskey="&cutCmd.accesskey;" command="cmd_cut"/>
-      <menuitem id="cMenu_copy" label="&copyCmd.label;"
-                accesskey="&copyCmd.accesskey;" command="cmd_copy"/>
-      <menuitem id="cMenu_paste" label="&pasteCmd.label;"
-                accesskey="&pasteCmd.accesskey;" command="cmd_paste"/>
-      <menuitem id="cMenu_delete" label="&deleteCmd.label;"
-                accesskey="&deleteCmd.accesskey;" command="cmd_delete"/>
+      <menuitem id="cMenu_cut" 
+                data-l10n-id="text-action-cut" command="cmd_cut"/>
+      <menuitem id="cMenu_copy"
+                data-l10n-id="text-action-copy" command="cmd_copy"/>
+      <menuitem id="cMenu_paste"
+                data-l10n-id="text-action-paste" command="cmd_paste"/>
+      <menuitem id="cMenu_delete"
+                data-l10n-id="text-action-delete" command="cmd_delete"/>
      <menuseparator/>
-      <menuitem id="cMenu_selectAll" label="&selectAllCmd.label;"
-                accesskey="&selectAllCmd.accesskey;" command="cmd_selectAll"/>
+      <menuitem id="cMenu_selectAll"
+                data-l10n-id="text-action-select-all" command="cmd_selectAll"/>
      <menuseparator/>
      <menuitem id="se-menu-find"
        label="&findCmd.label;" accesskey="&findCmd.accesskey;" command="cmd_find"/>
--- a/devtools/client/webconsole/index.html
+++ b/devtools/client/webconsole/index.html
@ -9,7 +9,7 @@
      persist="screenX screenY width height sizemode">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="localization" href="toolkit/main-window/editmenu.ftl"/>
+    <link rel="localization" href="toolkit/global/textActions.ftl"/>
    <link rel="stylesheet" href="chrome://global/skin/global.css"/>
    <link rel="stylesheet" href="chrome://devtools/skin/widgets.css"/>
    <link rel="stylesheet" href="chrome://devtools/skin/webconsole.css"/>
--- a/python/l10n/fluent_migrations/bug_1604960_text_actions.py
+++ b/python/l10n/fluent_migrations/bug_1604960_text_actions.py
@ -0,0 +1,24 @@
+# coding=utf8
+
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+import fluent.syntax.ast as FTL
+from fluent.migrate.helpers import transforms_from, TERM_REFERENCE, MESSAGE_REFERENCE
+from fluent.migrate import COPY_PATTERN, REPLACE, COPY
+
+
+def migrate(ctx):
+    """Bug 1604960 - Migrate Text Actions to Fluent, part {index}."""
+
+    ctx.add_transforms(
+        'toolkit/toolkit/global/textActions.ftl',
+        'toolkit/toolkit/global/textActions.ftl',
+        transforms_from(
+"""
+text-action-redo =
+    .label = { COPY(from_path, "redoCmd.label") }
+    .accesskey = { COPY(from_path, "redoCmd.accesskey") }
+""", from_path="browser/chrome/browser/browser.dtd")
+    )
--- a/toolkit/content/editMenuOverlay.js
+++ b/toolkit/content/editMenuOverlay.js
@ -109,18 +109,18 @@ window.addEventListener("contextmenu", e => {

  let popup = document.getElementById("textbox-contextmenu");
  if (!popup) {
-    MozXULElement.insertFTLIfNeeded("toolkit/main-window/editmenu.ftl");
+    MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
    document.documentElement.appendChild(
      MozXULElement.parseXULToFragment(`
      <menupopup id="textbox-contextmenu" class="textbox-contextmenu">
-        <menuitem data-l10n-id="editmenu-undo" command="cmd_undo"></menuitem>
+        <menuitem data-l10n-id="text-action-undo" command="cmd_undo"></menuitem>
        <menuseparator></menuseparator>
-        <menuitem data-l10n-id="editmenu-cut" command="cmd_cut"></menuitem>
-        <menuitem data-l10n-id="editmenu-copy" command="cmd_copy"></menuitem>
-        <menuitem data-l10n-id="editmenu-paste" command="cmd_paste"></menuitem>
-        <menuitem data-l10n-id="editmenu-delete" command="cmd_delete"></menuitem>
+        <menuitem data-l10n-id="text-action-cut" command="cmd_cut"></menuitem>
+        <menuitem data-l10n-id="text-action-copy" command="cmd_copy"></menuitem>
+        <menuitem data-l10n-id="text-action-paste" command="cmd_paste"></menuitem>
+        <menuitem data-l10n-id="text-action-delete" command="cmd_delete"></menuitem>
        <menuseparator></menuseparator>
-        <menuitem data-l10n-id="editmenu-select-all" command="cmd_selectAll"></menuitem>
+        <menuitem data-l10n-id="text-action-select-all" command="cmd_selectAll"></menuitem>
      </menupopup>
    `)
    );
--- a/toolkit/content/widgets/textbox.js
+++ b/toolkit/content/widgets/textbox.js
@ -13,14 +13,14 @@
    },
    get editMenuItems() {
      return `
-      <menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"></menuitem>
+      <menuitem data-l10n-id="text-action-undo" cmd="cmd_undo"></menuitem>
      <menuseparator></menuseparator>
-      <menuitem label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" cmd="cmd_cut"></menuitem>
-      <menuitem label="&copyCmd.label;" accesskey="&copyCmd.accesskey;" cmd="cmd_copy"></menuitem>
-      <menuitem label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;" cmd="cmd_paste"></menuitem>
-      <menuitem label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;" cmd="cmd_delete"></menuitem>
+      <menuitem data-l10n-id="text-action-cut" cmd="cmd_cut"></menuitem>
+      <menuitem data-l10n-id="text-action-copy" cmd="cmd_copy"></menuitem>
+      <menuitem data-l10n-id="text-action-paste" cmd="cmd_paste"></menuitem>
+      <menuitem data-l10n-id="text-action-delete" cmd="cmd_delete"></menuitem>
      <menuseparator></menuseparator>
-      <menuitem label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;" cmd="cmd_selectAll"></menuitem>
+      <menuitem data-l10n-id="text-action-select-all" cmd="cmd_selectAll"></menuitem>
    `;
    },
    get normal() {
@ -30,9 +30,9 @@
      <menupopup class="textbox-contextmenu">
        ${this.editMenuItems}
      </menupopup>
-    `,
-        this.entities
+    `
      );
+      MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
      return this.normal;
    },
    get spellcheck() {
--- a/toolkit/locales/en-US/chrome/global/editMenuOverlay.dtd
+++ b/toolkit/locales/en-US/chrome/global/editMenuOverlay.dtd
@ -4,26 +4,12 @@

 <!ENTITY editMenu.label            "Edit">
 <!ENTITY editMenu.accesskey        "e">
-<!ENTITY undoCmd.label             "Undo">
 <!ENTITY undoCmd.key               "Z">
-<!ENTITY undoCmd.accesskey         "u">
-<!ENTITY redoCmd.label             "Redo">
 <!ENTITY redoCmd.key               "Y">
-<!ENTITY redoCmd.accesskey         "r">
-<!ENTITY cutCmd.label              "Cut">
 <!ENTITY cutCmd.key                "X">
-<!ENTITY cutCmd.accesskey          "t">
-<!ENTITY copyCmd.label             "Copy">
 <!ENTITY copyCmd.key               "C">
-<!ENTITY copyCmd.accesskey         "c">
-<!ENTITY pasteCmd.label            "Paste">
 <!ENTITY pasteCmd.key              "V">
-<!ENTITY pasteCmd.accesskey        "p">
-<!ENTITY deleteCmd.label           "Delete">
-<!ENTITY deleteCmd.accesskey       "d">
-<!ENTITY selectAllCmd.label        "Select All">
 <!ENTITY selectAllCmd.key          "A">
-<!ENTITY selectAllCmd.accesskey    "a">
 <!ENTITY findCmd.label             "Find">
 <!ENTITY findCmd.key               "F">
 <!ENTITY findCmd.accesskey         "F">
--- a/toolkit/locales/en-US/chrome/global/textcontext.dtd
+++ b/toolkit/locales/en-US/chrome/global/textcontext.dtd
@ -2,19 +2,6 @@
   - 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/. -->

-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.accesskey "c">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.accesskey "p">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.accesskey "u">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.accesskey "a">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.accesskey "d">
-
 <!ENTITY spellAddToDictionary.label "Add to Dictionary">
 <!ENTITY spellAddToDictionary.accesskey "o">
 <!ENTITY spellUndoAddToDictionary.label "Undo Add To Dictionary">
--- a/toolkit/locales/en-US/toolkit/global/textActions.ftl
+++ b/toolkit/locales/en-US/toolkit/global/textActions.ftl
@ -6,6 +6,10 @@ text-action-undo =
    .label = Undo
    .accesskey = U

+text-action-redo =
+    .label = Redo
+    .accesskey = R
+
 text-action-cut =
    .label = Cut
    .accesskey = t
--- a/toolkit/locales/en-US/toolkit/main-window/editmenu.ftl
+++ b/toolkit/locales/en-US/toolkit/main-window/editmenu.ftl
@ -1,34 +0,0 @@
-# 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/.
-
-### This file contains the entities needed for the 'edit' menu
-### It's currently only used for the Browser Console and Developer Toolbox
-
-editmenu-undo =
-    .label = Undo
-    .accesskey = U
-
-editmenu-redo =
-    .label = Redo
-    .accesskey = R
-
-editmenu-cut =
-    .label = Cut
-    .accesskey = t
-
-editmenu-copy =
-    .label = Copy
-    .accesskey = C
-
-editmenu-paste =
-    .label = Paste
-    .accesskey = P
-
-editmenu-delete =
-    .label = Delete
-    .accesskey = D
-
-editmenu-select-all =
-    .label = Select All
-    .accesskey = A