Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1695671 - Update strings in the global menubar r=Gijs,flod

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D107533
This commit is contained in:
Greg Tatum 2021-03-09 20:17:32 +00:00
parent 340a2daf9d
commit eec448bd47
6 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@
<menuseparator/>
<menuitem id="menu_find"
key="key_find"
command="cmd_find" data-l10n-id="menu-edit-find-on"/>
command="cmd_find" data-l10n-id="menu-edit-find-in-page"/>
<menuitem id="menu_findAgain"
class="show-only-for-keyboard"
key="key_findAgain"
@ -134,7 +134,7 @@
#ifndef XP_MACOSX
<menuseparator/>
<menuitem id="menu_preferences"
oncommand="openPreferences(undefined);" data-l10n-id="menu-preferences"/>
oncommand="openPreferences(undefined);" data-l10n-id="menu-settings"/>
#endif
#endif
</menupopup>
@ -147,7 +147,7 @@
<menupopup id="view-menu-popup" onpopupshowing="onViewToolbarsPopupShowing(event);">
<menuseparator/>
<menuitem id="menu_customizeToolbars"
command="cmd_CustomizeToolbars" data-l10n-id="menu-view-customize-toolbar"/>
command="cmd_CustomizeToolbars" data-l10n-id="menu-view-customize-toolbar2"/>
</menupopup>
</menu>
<menu id="viewSidebarMenuMenu" data-l10n-id="menu-view-sidebar">
@ -325,7 +325,7 @@
<menuitem id="menu_bookmarkThisPage"
command="Browser:AddBookmarkAs"
key="addBookmarkAsKb"
data-l10n-id="menu-bookmark-this-page"/>
data-l10n-id="menu-bookmark-current-tab"/>
<menuitem id="menu_bookmarkAllTabs"
class="show-only-for-keyboard"
command="Browser:BookmarkAllTabs"
@ -384,13 +384,13 @@
command="Tools:Downloads" data-l10n-id="menu-tools-downloads"/>
<menuitem id="menu_openAddons"
key="key_openAddons"
command="Tools:Addons" data-l10n-id="menu-tools-addons"/>
command="Tools:Addons" data-l10n-id="menu-tools-extensions"/>
<!-- only one of sync-setup, sync-enable, sync-unverifieditem, sync-syncnowitem or sync-reauthitem will be showing at once -->
<menuitem id="sync-setup"
class="sync-ui-item"
hidden="true"
oncommand="gSync.openPrefs('menubar')" data-l10n-id="menu-tools-fxa-sign-in"/>
oncommand="gSync.openPrefs('menubar')" data-l10n-id="menu-tools-fxa-sign-in2"/>
<menuitem id="sync-enable"
class="sync-ui-item"
hidden="true"
@ -398,7 +398,7 @@
<menuitem id="sync-unverifieditem"
class="sync-ui-item"
hidden="true"
oncommand="gSync.openPrefs('menubar')" data-l10n-id="menu-tools-fxa-sign-in"/>
oncommand="gSync.openPrefs('menubar')" data-l10n-id="menu-tools-fxa-sign-in2"/>
<menuitem id="sync-syncnowitem"
class="sync-ui-item"
hidden="true"
@ -421,7 +421,7 @@
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences"
oncommand="openPreferences(undefined);" data-l10n-id="menu-preferences"/>
oncommand="openPreferences(undefined);" data-l10n-id="menu-settings"/>
#endif
#ifdef MOZ_DEBUG
<menuitem id="menu_layout_debugger"
@ -431,7 +431,7 @@
#endif
#ifdef XP_MACOSX
<!-- nsMenuBarX hides these and uses them to build the Application menu. -->
<menuitem id="menu_preferences" data-l10n-id="menu-preferences" key="key_preferencesCmdMac" oncommand="openPreferences(undefined);"/>
<menuitem id="menu_preferences" data-l10n-id="menu-settings" key="key_preferencesCmdMac" oncommand="openPreferences(undefined);"/>
<menuitem id="menu_mac_services" data-l10n-id="menu-application-services"/>
<menuitem id="menu_mac_hide_app" data-l10n-id="menu-application-hide-this" key="key_hideThisAppCmdMac"/>
<menuitem id="menu_mac_hide_others" data-l10n-id="menu-application-hide-other" key="key_hideOtherAppsCmdMac"/>

2
browser/base/content/browser-places.js
View File

@ -2068,7 +2068,7 @@ var BookmarkingUI = {
// that only require a label using the menubar.ftl messages.
let menuItemL10nId = isStarred
? "menu-bookmark-edit"
: "menu-bookmark-this-page";
: "menu-bookmark-current-tab";
let menuItem = document.getElementById("menu_bookmarkThisPage");
if (menuItem) {

8
browser/base/content/test/pageActions/browser_page_action_menu.js
View File

@ -96,9 +96,9 @@ add_task(async function bookmark() {
// Open the panel.
await promisePageActionPanelOpen();
// The bookmark button should read "Bookmark This Page" and not be starred.
// The bookmark button should read "Bookmark Current Tab" and not be starred.
let bookmarkButton = document.getElementById("pageAction-panel-bookmark");
Assert.equal(bookmarkButton.label, "Bookmark This Page");
Assert.equal(bookmarkButton.label, "Bookmark Current Tab");
Assert.ok(!bookmarkButton.hasAttribute("starred"));
// Click the button.
@ -162,8 +162,8 @@ add_task(async function bookmark() {
// Open the panel again.
await promisePageActionPanelOpen();
// The bookmark button should read "Bookmark This Page" and not be starred.
Assert.equal(bookmarkButton.label, "Bookmark This Page");
// The bookmark button should read "Bookmark Current Tab" and not be starred.
Assert.equal(bookmarkButton.label, "Bookmark Current Tab");
Assert.ok(!bookmarkButton.hasAttribute("starred"));
// Done.

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

@ -110,8 +110,8 @@ menu-file-go-offline =
menu-edit =
.label = Edit
.accesskey = E
menu-edit-find-on =
.label = Find in This Page…
menu-edit-find-in-page =
.label = Find in Page…
.accesskey = F
menu-edit-find-again =
.label = Find Again
@ -128,8 +128,8 @@ menu-view =
menu-view-toolbars-menu =
.label = Toolbars
.accesskey = T
menu-view-customize-toolbar =
.label = Customize…
menu-view-customize-toolbar2 =
.label = Customize Toolbar…
.accesskey = C
menu-view-sidebar =
.label = Sidebar
@ -219,8 +219,8 @@ menu-bookmarks-menu =
.accesskey = B
menu-bookmarks-show-all =
.label = Show All Bookmarks
menu-bookmark-this-page =
.label = Bookmark This Page
menu-bookmark-current-tab =
.label = Bookmark Current Tab
menu-bookmark-edit =
.label = Edit This Bookmark
menu-bookmarks-all-tabs =
@ -240,18 +240,18 @@ menu-tools =
menu-tools-downloads =
.label = Downloads
.accesskey = D
menu-tools-addons =
.label = Add-ons
.accesskey = A
menu-tools-fxa-sign-in =
.label = Sign In To { -brand-product-name }…
menu-tools-extensions =
.label = Extensions and Themes
.accesskey = E
menu-tools-fxa-sign-in2 =
.label = Sign In
.accesskey = g
menu-tools-turn-on-sync =
.label = Turn on { -sync-brand-short-name }…
.accesskey = n
menu-tools-sync-now =
.label = Sync Now
.accesskey = S
.accesskey = o
menu-tools-fxa-re-auth =
.label = Reconnect to { -brand-product-name }…
.accesskey = R
@ -264,15 +264,11 @@ menu-tools-page-source =
menu-tools-page-info =
.label = Page Info
.accesskey = I
menu-preferences =
.label =
{ PLATFORM() ->
[windows] Options
*[other] Preferences
}
menu-settings =
.label = Settings
.accesskey =
{ PLATFORM() ->
[windows] O
[windows] S
*[other] n
}
menu-tools-layout-debugger =

4
browser/locales/en-US/profile/bookmarks.inc
View File

@ -21,9 +21,9 @@
# Firefox links folder name
#define firefox_heading Mozilla Firefox
# LOCALIZATION NOTE (firefox_help):
# LOCALIZATION NOTE (firefox_get_help):
# link title for https://www.mozilla.org/en-US/firefox/help/
#define firefox_help Help and Tutorials
#define firefox_get_help Get Help
# LOCALIZATION NOTE (firefox_customize):
# link title for https://www.mozilla.org/en-US/firefox/customize/

2
browser/locales/generic/profile/bookmarks.html.in
View File

@ -27,7 +27,7 @@
</dl>
<p><dt><h3>@firefox_heading@</h3></dt>
<dl><p>
<dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_help@</a>
<dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_get_help@</a>
<dt><a href="https://support.mozilla.org/@AB_CD@/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@">@firefox_customize@</a>
<dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
<dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>