Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 0267e42c0db5 (bug 1604960) for causing bc permafails

Browse Source
This commit is contained in:
Ciure Andrei 2019-12-25 05:15:16 +02:00
parent 048a275780
commit c79fc6e32a
21 changed files with 190 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/base/content/browser-menubar.inc
View File

@ -96,27 +96,27 @@
onpopuphidden="updateEditUIVisibility()">
<menuitem id="menu_undo"
key="key_undo"
command="cmd_undo" data-l10n-id="text-action-undo"/>
command="cmd_undo" data-l10n-id="menu-edit-undo"/>
<menuitem id="menu_redo"
key="key_redo"
command="cmd_redo" data-l10n-id="text-action-redo"/>
command="cmd_redo" data-l10n-id="menu-edit-redo"/>
<menuseparator/>
<menuitem id="menu_cut"
key="key_cut"
command="cmd_cut" data-l10n-id="text-action-cut"/>
command="cmd_cut" data-l10n-id="menu-edit-cut"/>
<menuitem id="menu_copy"
key="key_copy"
command="cmd_copy" data-l10n-id="text-action-copy"/>
command="cmd_copy" data-l10n-id="menu-edit-copy"/>
<menuitem id="menu_paste"
key="key_paste"
command="cmd_paste" data-l10n-id="text-action-paste"/>
command="cmd_paste" data-l10n-id="menu-edit-paste"/>
<menuitem id="menu_delete"
key="key_delete"
command="cmd_delete" data-l10n-id="text-action-delete"/>
command="cmd_delete" data-l10n-id="menu-edit-delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"
key="key_selectAll"
command="cmd_selectAll" data-l10n-id="text-action-select-all"/>
command="cmd_selectAll" data-l10n-id="menu-edit-select-all"/>
<menuseparator/>
<menuitem id="menu_find"
key="key_find"

18
browser/base/content/browser.xhtml
View File

@ -629,19 +629,25 @@
</menupopup>
<menupopup id="SyncedTabsSidebarTabsFilterContext"
class="textbox-contextmenu">
<menuitem data-l10n-id="text-action-undo"
<menuitem label="&undoCmd.label;"
accesskey="&undoCmd.accesskey;"
cmd="cmd_undo"/>
<menuseparator/>
<menuitem data-l10n-id="text-action-cut"
<menuitem label="&cutCmd.label;"
accesskey="&cutCmd.accesskey;"
cmd="cmd_cut"/>
<menuitem data-l10n-id="text-action-copy"
<menuitem label="&copyCmd.label;"
accesskey="&copyCmd.accesskey;"
cmd="cmd_copy"/>
<menuitem data-l10n-id="text-action-paste"
<menuitem label="&pasteCmd.label;"
accesskey="&pasteCmd.accesskey;"
cmd="cmd_paste"/>
<menuitem data-l10n-id="text-action-delete"
<menuitem label="&deleteCmd.label;"
accesskey="&deleteCmd.accesskey;"
cmd="cmd_delete"/>
<menuseparator/>
<menuitem data-l10n-id="text-action-select-all"
<menuitem label="&selectAllCmd.label;"
accesskey="&selectAllCmd.accesskey;"
cmd="cmd_selectAll"/>
<menuseparator/>
<menuitem data-lazy-l10n-id="synced-tabs-context-sync-now"

1
browser/base/content/macWindow.inc.xhtml
View File

@ -13,7 +13,6 @@
<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>

5
browser/components/places/content/bookmarksSidebar.xhtml
View File

@ -19,7 +19,6 @@
<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);"
@ -32,10 +31,6 @@
<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

5
browser/components/places/content/historySidebar.xhtml
View File

@ -20,7 +20,6 @@
<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);"
@ -33,10 +32,6 @@
<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

33
browser/components/places/content/places.xhtml
View File

@ -42,10 +42,6 @@
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
@ -202,41 +198,48 @@
<menuitem id="orgUndo"
command="cmd_undo"
data-l10n-id="text-action-undo"
key="key_undo"/>
label="&undoCmd.label;"
key="key_undo"
accesskey="&undoCmd.accesskey;"/>
<menuitem id="orgRedo"
command="cmd_redo"
data-l10n-id="text-action-redo"
key="key_redo"/>
label="&redoCmd.label;"
key="key_redo"
accesskey="&redoCmd.accesskey;"/>
<menuseparator id="orgCutSeparator"/>
<menuitem id="orgCut"
command="cmd_cut"
data-l10n-id="text-action-cut"
label="&cutCmd.label;"
key="key_cut"
accesskey="&cutCmd.accesskey;"
selection="separator|link|folder|mixed"/>
<menuitem id="orgCopy"
command="cmd_copy"
data-l10n-id="text-action-copy"
label="&copyCmd.label;"
key="key_copy"
accesskey="&copyCmd.accesskey;"
selection="separator|link|folder|mixed"/>
<menuitem id="orgPaste"
command="cmd_paste"
data-l10n-id="text-action-paste"
label="&pasteCmd.label;"
key="key_paste"
accesskey="&pasteCmd.accesskey;"
selection="mutable"/>
<menuitem id="orgDelete"
command="cmd_delete"
data-l10n-id="text-action-delete"
key="key_delete"/>
label="&deleteCmd.label;"
key="key_delete"
accesskey="&deleteCmd.accesskey;"/>
<menuseparator id="selectAllSeparator"/>
<menuitem id="orgSelectAll"
command="cmd_selectAll"
data-l10n-id="text-action-select-all"
key="key_selectAll"/>
label="&selectAllCmd.label;"
key="key_selectAll"
accesskey="&selectAllCmd.accesskey;"/>
<menuseparator id="orgCloseSeparator"/>

12
browser/components/places/content/placesContextMenu.inc.xhtml
View File

@ -80,25 +80,29 @@
forcehideselection="bookmark|tagChild"/>
<menuitem id="placesContext_cut"
command="placesCmd_cut"
data-l10n-id="text-action-cut"
label="&cutCmd.label;"
accesskey="&cutCmd.accesskey;"
closemenu="single"
selection="bookmark|folder|separator|query"
forcehideselection="tagChild"/>
<menuitem id="placesContext_copy"
command="placesCmd_copy"
data-l10n-id="text-action-copy"
label="&copyCmd.label;"
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"

16
browser/components/search/content/searchbar.js
View File

@ -838,22 +838,24 @@
_buildContextMenu() {
const raw = `
<menuitem data-l10n-id="text-action-undo" cmd="cmd_undo"/>
<menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"/>
<menuseparator/>
<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 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 class="searchbar-paste-and-search"/>
<menuitem data-l10n-id="text-action-delete" cmd="cmd_delete"/>
<menuitem label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;" cmd="cmd_delete"/>
<menuseparator/>
<menuitem data-l10n-id="text-action-select-all" cmd="cmd_selectAll"/>
<menuitem label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;" cmd="cmd_selectAll"/>
<menuseparator/>
<menuitem class="searchbar-clear-history"/>
`;
this._menupopup = this.querySelector(".textbox-contextmenu");
let frag = MozXULElement.parseXULToFragment(raw);
let frag = MozXULElement.parseXULToFragment(raw, [
"chrome://global/locale/textcontext.dtd",
]);
// Insert attributes that come from localized properties
this._pasteAndSearchMenuItem = frag.querySelector(

21
browser/locales/en-US/browser/menubar.ftl
View File

@ -60,6 +60,27 @@ 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

14
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -186,12 +186,26 @@ 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">

10
devtools/client/framework/test/browser_menu_api.js
View File

@ -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/global/textActions.ftl"
"toolkit/main-window/editmenu.ftl"
);
loadFTL(toolbox, "toolkit/global/textActions.ftl");
loadFTL(toolbox, "toolkit/main-window/editmenu.ftl");
await testMenuItems();
await testMenuPopup(toolbox);
@ -72,7 +72,7 @@ async function testMenuPopup(toolbox) {
disabled: true,
}),
new MenuItem({
l10nID: "text-action-undo",
l10nID: "editmenu-undo",
}),
];
@ -151,7 +151,7 @@ async function testSubmenu(toolbox) {
);
menu.append(
new MenuItem({
l10nID: "text-action-copy",
l10nID: "editmenu-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"),
"text-action-copy",
"editmenu-copy",
"Correct localization attribute"
);

14
devtools/client/framework/toolbox-context-menu.js
View File

@ -21,7 +21,7 @@ function loadEditMenuStrings(win) {
if (win.MozXULElement) {
stringsLoaded.set(win, true);
win.MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
win.MozXULElement.insertFTLIfNeeded("toolkit/main-window/editmenu.ftl");
}
}
@ -46,7 +46,7 @@ function createEditContextMenu(win, id) {
menu.append(
new MenuItem({
id: "editmenu-undo",
l10nID: "text-action-undo",
l10nID: "editmenu-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: "text-action-cut",
l10nID: "editmenu-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: "text-action-copy",
l10nID: "editmenu-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: "text-action-paste",
l10nID: "editmenu-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: "text-action-delete",
l10nID: "editmenu-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: "text-action-select-all",
l10nID: "editmenu-select-all",
disabled: !docshell.isCommandEnabled("cmd_selectAll"),
click: () => {
docshell.doCommand("cmd_selectAll");

28
devtools/client/styleeditor/index.xhtml
View File

@ -23,10 +23,6 @@
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"/>
@ -48,20 +44,20 @@
<menupopup id="sourceEditorContextMenu"
incontentshell="false"
onpopupshowing="goUpdateSourceEditorMenuItems()">
<menuitem id="cMenu_undo"
data-l10n-id="text-action-undo" command="cmd_undo"/>
<menuitem id="cMenu_undo" label="&undoCmd.label;"
accesskey="&undoCmd.accesskey;" command="cmd_undo"/>
<menuseparator/>
<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"/>
<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"/>
<menuseparator/>
<menuitem id="cMenu_selectAll"
data-l10n-id="text-action-select-all" command="cmd_selectAll"/>
<menuitem id="cMenu_selectAll" label="&selectAllCmd.label;"
accesskey="&selectAllCmd.accesskey;" command="cmd_selectAll"/>
<menuseparator/>
<menuitem id="se-menu-find"
label="&findCmd.label;" accesskey="&findCmd.accesskey;" command="cmd_find"/>

2
devtools/client/webconsole/index.html
View File

@ -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/global/textActions.ftl"/>
<link rel="localization" href="toolkit/main-window/editmenu.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"/>

24
python/l10n/fluent_migrations/bug_1604960_text_actions.py
View File

@ -1,24 +0,0 @@
# 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")
)

14
toolkit/content/editMenuOverlay.js
View File

@ -109,18 +109,18 @@ window.addEventListener("contextmenu", e => {
let popup = document.getElementById("textbox-contextmenu");
if (!popup) {
MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
MozXULElement.insertFTLIfNeeded("toolkit/main-window/editmenu.ftl");
document.documentElement.appendChild(
MozXULElement.parseXULToFragment(`
<menupopup id="textbox-contextmenu" class="textbox-contextmenu">
<menuitem data-l10n-id="text-action-undo" command="cmd_undo"></menuitem>
<menuitem data-l10n-id="editmenu-undo" command="cmd_undo"></menuitem>
<menuseparator></menuseparator>
<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>
<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>
<menuseparator></menuseparator>
<menuitem data-l10n-id="text-action-select-all" command="cmd_selectAll"></menuitem>
<menuitem data-l10n-id="editmenu-select-all" command="cmd_selectAll"></menuitem>
</menupopup>
`)
);

16
toolkit/content/widgets/textbox.js
View File

@ -13,14 +13,14 @@
},
get editMenuItems() {
return `
<menuitem data-l10n-id="text-action-undo" cmd="cmd_undo"></menuitem>
<menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"></menuitem>
<menuseparator></menuseparator>
<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>
<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>
<menuseparator></menuseparator>
<menuitem data-l10n-id="text-action-select-all" cmd="cmd_selectAll"></menuitem>
<menuitem label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;" 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() {

14
toolkit/locales/en-US/chrome/global/editMenuOverlay.dtd
View File

@ -4,12 +4,26 @@
<!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">

13
toolkit/locales/en-US/chrome/global/textcontext.dtd
View File

@ -2,6 +2,19 @@
- 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">

4
toolkit/locales/en-US/toolkit/global/textActions.ftl
View File

@ -6,10 +6,6 @@ text-action-undo =
.label = Undo
.accesskey = U
text-action-redo =
.label = Redo
.accesskey = R
text-action-cut =
.label = Cut
.accesskey = t

34
toolkit/locales/en-US/toolkit/main-window/editmenu.ftl Normal file
View File

@ -0,0 +1,34 @@
# 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