Bug 1728460 - Migrate appmenu-viewcache.inc.xhtml to Fluent. r=mtigley,fluent-reviewers,flod (416c5975) · Commits · The Tor Project / Applications / Tor Browser

browser/base/content/appmenu-viewcache.inc.xhtml

+11 −12

Original line number	Diff line number	Diff line
		@@ -66,12 +66,12 @@
		oncommand="BookmarkingUI.showSubView(this);"/>
		<toolbarbutton id="appMenu-history-button"
		class="subviewbutton subviewbutton-nav"
		label="&historyMenu.label;"
		data-l10n-id="appmenuitem-history"
		closemenu="none"
		oncommand="PanelUI.showSubView('PanelUI-history', this)"/>
		<toolbarbutton id="appMenu-downloads-button"
		class="subviewbutton"
		label="&libraryDownloads.label;"
		data-l10n-id="appmenuitem-downloads"
		key="key_openDownloads"
		command="Tools:Downloads"/>
		<toolbarbutton id="appMenu-passwords-button"
		@@ -88,7 +88,7 @@
		<toolbarseparator/>
		<toolbarbutton id="appMenu-print-button2"
		class="subviewbutton"
		label="&printCmd.label;"
		data-l10n-id="appmenuitem-print"
		key="printKb"
		#ifdef XP_MACOSX
		command="cmd_print"
		@@ -107,7 +107,7 @@
		key="key_find"
		command="cmd_find"/>
		<toolbaritem id="appMenu-zoom-controls2" class="subviewbutton toolbaritem-combined-buttons" closemenu="none">
		<label class="toolbarbutton-text" value="&fullZoom.label;"/>
		<label class="toolbarbutton-text" data-l10n-id="appmenuitem-zoom"/>
		<toolbarbutton id="appMenu-zoomReduce-button2"
		class="subviewbutton subviewbutton-iconic"
		command="cmd_fullZoomReduce"
		@@ -547,8 +547,7 @@
		<vbox flex="1">
		<label id="fxa-menu-header-title"
		crop="end"
		value="&fxa.menu.signin.label;"
		defaultLabel="&fxa.menu.signin.label;"/>
		data-l10n-id="appmenuitem-fxa-sign-in"/>
		<label id="fxa-menu-header-description"
		crop="end"
		data-l10n-id="fxa-menu-turn-on-sync"/>
		@@ -614,7 +613,7 @@
		<panelview id="PanelUI-sendTabToDevice" flex="1" class="PanelUI-subView">
		<vbox class="panel-subview-body">
		<toolbarbutton id="PanelUI-sendTabToDevice-syncingDevices" class="subviewbutton subviewbutton-iconic pageAction-sendToDevice-notReady"
		label="&sendToDevice.syncNotReady.label;"
		data-l10n-id="fxa-menu-send-tab-to-device-syncnotready"
		disabled="true"/>
		</vbox>
		</panelview>
		@@ -622,10 +621,10 @@
		<panelview id="PanelUI-fxa-menu-sendtab-not-configured" flex="1" class="PanelUI-subView">
		<vbox id="PanelUI-fxa-sendtab-not-configured" align="center" class="panel-subview-body">
		<image class="fxaSendToDeviceLogo" role="presentation"/>
		<label class="PanelUI-fxa-service-description-label">&fxa.service.sendTab.description;</label>
		<label class="PanelUI-fxa-service-description-label" data-l10n-id="fxa-menu-send-tab-to-device-description"></label>
		<toolbarbutton id="PanelUI-fxa-menu-sendtab-not-configured-button"
		class="PanelUI-fxa-signin-button"
		label="&fxa.menu.signin.label;"
		data-l10n-id="appmenuitem-fxa-sign-in"
		oncommand="gSync.openPrefsFromFxaMenu('send_tab', this);"/>
		</vbox>
		</panelview>
		@@ -633,7 +632,7 @@
		<panelview id="PanelUI-fxa-menu-sendtab-no-devices" flex="1" class="PanelUI-subView">
		<vbox id="PanelUI-fxa-sendtab-no-devices" align="center" class="panel-subview-body">
		<image class="fxaSendToDeviceLogo" role="presentation"/>
		<label class="PanelUI-fxa-service-description-label">&fxa.service.sendTab.description;</label>
		<label class="PanelUI-fxa-service-description-label" data-l10n-id="fxa-menu-send-tab-to-device-description"></label>
		<toolbarbutton id="PanelUI-fxa-menu-sendtab-connect-device-button"
		class="PanelUI-fxa-signin-button"
		data-l10n-id="appmenu-remote-tabs-connectdevice"
		@@ -650,12 +649,12 @@
		oncommand="BookmarkingUI.showSubView(this);"/>
		<toolbarbutton id="appMenu-library-history-button"
		class="subviewbutton subviewbutton-nav"
		label="&historyMenu.label;"
		data-l10n-id="appmenuitem-history"
		closemenu="none"
		oncommand="PanelUI.showSubView('PanelUI-history', this)"/>
		<toolbarbutton id="appMenu-library-downloads-button"
		class="subviewbutton"
		label="&libraryDownloads.label;"
		data-l10n-id="appmenuitem-downloads"
		oncommand="DownloadsPanel.showDownloadsHistory();"/>
		</vbox>
		</panelview>

browser/base/content/browser-sync.js

+4 −1

Original line number	Diff line number	Diff line
		@@ -857,7 +857,9 @@ var gSync = {
		"fxa-manage-account-button"
		);

		let headerTitle = menuHeaderTitleEl.getAttribute("defaultLabel");
		let headerTitle = this.fluentStrings.formatValueSync(
		"appmenuitem-fxa-sign-in"
		);
		let headerDescription = this.fluentStrings.formatValueSync(
		"fxa-menu-turn-on-sync-default"
		);
		@@ -925,6 +927,7 @@ var gSync = {
		// We remove the data-l10n-id attribute here to prevent the node's value
		// attribute from being overwritten by Fluent when the panel is moved
		// around in the DOM.
		menuHeaderTitleEl.removeAttribute("data-l10n-id");
		menuHeaderDescriptionEl.removeAttribute("data-l10n-id");
		},

browser/locales/en-US/browser/appmenu.ftl

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,12 +17,20 @@ appmenuitem-new-window =
		.label = New window
		appmenuitem-new-private-window =
		.label = New private window
		appmenuitem-history =
		.label = History
		appmenuitem-downloads =
		.label = Downloads
		appmenuitem-passwords =
		.label = Passwords
		appmenuitem-addons-and-themes =
		.label = Add-ons and themes
		appmenuitem-print =
		.label = Print…
		appmenuitem-find-in-page =
		.label = Find in page…
		appmenuitem-zoom =
		.value = Zoom
		appmenuitem-more-tools =
		.label = More tools
		appmenuitem-help =
		@@ -85,6 +93,7 @@ appmenu-remote-tabs-welcome = View a list of tabs from your other devices.
		appmenu-remote-tabs-unverified = Your account needs to be verified.

		appmenuitem-fxa-toolbar-sync-now2 = Sync now
		appmenuitem-fxa-sign-in = Sign in to { -brand-product-name }
		appmenuitem-fxa-manage-account = Manage account
		appmenu-fxa-header2 = { -fxaccount-brand-name(capitalization: "sentence") }
		# Variables

browser/locales/en-US/browser/sync.ftl

+7 −0

Original line number	Diff line number	Diff line
		@@ -22,5 +22,12 @@ fxa-menu-turn-on-sync-default = Turn on sync
		fxa-menu-connect-another-device =
		.label = Connect another device…

		# This is shown dynamically within "Send tab to device" in fxa menu.
		fxa-menu-send-tab-to-device-syncnotready =
		.label = Syncing Devices…

		# This is shown within "Send tab to device" in fxa menu if account is not configured.
		fxa-menu-send-tab-to-device-description = Send a tab instantly to any device you’re signed in on.

		fxa-menu-sign-out =
		.label = Sign out…

browser/locales/en-US/chrome/browser/browser.dtd

+0 −20

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@
		<!ENTITY listAllTabs.label "List all tabs">

		<!ENTITY tabCmd.label "New Tab">
		<!ENTITY printCmd.label "Print…">

		<!ENTITY menubarCmd.label "Menu Bar">
		<!ENTITY menubarCmd.accesskey "M">
		@@ -22,16 +21,6 @@ this container is a toolbar. This avoids double-speaking. -->
		<!ENTITY navbar.accessibleLabel "Navigation">
		<!ENTITY fullScreenCmd.label "Full Screen">


		<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
		for the Firefox Account toolbar menu screen. The `Signed in as` text is
		followed by the user's email. -->
		<!ENTITY fxa.menu.signin.label "Sign in to &brandProductName;">

		<!-- LOCALIZATION NOTE (fxa.service) Used to define the different FxA services
		for the Firefox Account toolbar menu screen. -->
		<!ENTITY fxa.service.sendTab.description "Send a tab instantly to any device you’re signed in on.">

		<!ENTITY printButton.label "Print">
		<!ENTITY printButton.tooltip "Print this page">

		@@ -44,15 +33,10 @@ this container is a toolbar. This avoids double-speaking. -->
		<!ENTITY historyButton.label "History">

		<!ENTITY downloads.label "Downloads">
		<!-- LOCALIZATION NOTE (libraryDownloads.label): This label is similar to
		- downloads.label, but used in the Library panel. -->
		<!ENTITY libraryDownloads.label "Downloads">

		<!ENTITY newNavigatorCmd.label "New Window">
		<!ENTITY newPrivateWindow.label "New Private Window">

		<!ENTITY historyMenu.label "History">

		<!ENTITY contentSearchSubmit.tooltip "Submit search">

		<!-- LOCALIZATION NOTE (searchInput.placeholder):
		@@ -60,14 +44,10 @@ this container is a toolbar. This avoids double-speaking. -->
		<!ENTITY searchInput.placeholder "Search">
		<!ENTITY searchIcon.tooltip "Search">

		<!ENTITY fullZoom.label "Zoom">

		<!-- Name for the tabs toolbar as spoken by screen readers.
		The word "toolbar" is appended automatically and should not be contained below! -->
		<!ENTITY tabsToolbar.label "Browser tabs">

		<!ENTITY sendToDevice.syncNotReady.label "Syncing Devices…">

		<!ENTITY libraryButton.tooltip "View history, saved bookmarks, and more">

		<!-- LOCALIZATION NOTE: (accessibilityIndicator.tooltip): This is used to