From 23fe7b129bf13b65708149281625b82ea2af4161 Mon Sep 17 00:00:00 2001 From: Lebar Date: Tue, 19 Oct 2021 15:15:26 +0000 Subject: [PATCH] Bug 1729447 - Changed downloads context menu string for non-Mac from "Open Containing Folder" to "Show in Folder" to align terminology. r=mak,fluent-reviewers,flod Differential Revision: https://phabricator.services.mozilla.com/D128538 --- .../components/downloads/DownloadsViewUI.jsm | 6 ++-- .../content/downloadsContextMenu.inc.xhtml | 7 +---- .../content/downloadsPanel.inc.xhtml | 7 +---- browser/locales/en-US/browser/downloads.ftl | 31 +++++++++---------- .../browser/downloads/downloads.properties | 14 --------- 5 files changed, 19 insertions(+), 46 deletions(-) diff --git a/browser/components/downloads/DownloadsViewUI.jsm b/browser/components/downloads/DownloadsViewUI.jsm index 3d2743c4a313..a3246a055e97 100644 --- a/browser/components/downloads/DownloadsViewUI.jsm +++ b/browser/components/downloads/DownloadsViewUI.jsm @@ -63,9 +63,9 @@ var gDownloadElementButtons = { }, show: { commandName: "downloadsCmd_show", - l10nId: "downloads-cmd-show-button", - descriptionL10nId: "downloads-cmd-show-description", - panelL10nId: "downloads-cmd-show-panel", + l10nId: "downloads-cmd-show-button-2", + descriptionL10nId: "downloads-cmd-show-description-2", + panelL10nId: "downloads-cmd-show-panel-2", iconClass: "downloadIconShow", }, subviewOpenOrRemoveFile: { diff --git a/browser/components/downloads/content/downloadsContextMenu.inc.xhtml b/browser/components/downloads/content/downloadsContextMenu.inc.xhtml index 75d49a9a6a92..5b3c88a3be24 100644 --- a/browser/components/downloads/content/downloadsContextMenu.inc.xhtml +++ b/browser/components/downloads/content/downloadsContextMenu.inc.xhtml @@ -22,12 +22,7 @@ data-l10n-id="downloads-cmd-always-use-system-default"/> + data-l10n-id="downloads-cmd-show-menuitem-2"/> diff --git a/browser/components/downloads/content/downloadsPanel.inc.xhtml b/browser/components/downloads/content/downloadsPanel.inc.xhtml index e20bc0d6dbc0..32eadbd4f2af 100644 --- a/browser/components/downloads/content/downloadsPanel.inc.xhtml +++ b/browser/components/downloads/content/downloadsPanel.inc.xhtml @@ -85,12 +85,7 @@ data-l10n-id="downloads-cmd-always-use-system-default"/> + data-l10n-id="downloads-cmd-show-menuitem-2"/> diff --git a/browser/locales/en-US/browser/downloads.ftl b/browser/locales/en-US/browser/downloads.ftl index efd8e7a45bd3..b2e476fb8aea 100644 --- a/browser/locales/en-US/browser/downloads.ftl +++ b/browser/locales/en-US/browser/downloads.ftl @@ -29,14 +29,11 @@ downloads-cmd-cancel = downloads-cmd-cancel-panel = .aria-label = Cancel -# This message is only displayed on Windows and Linux devices -downloads-cmd-show-menuitem = - .label = Open Containing Folder - .accesskey = F - -# This message is only displayed on macOS devices -downloads-cmd-show-menuitem-mac = - .label = Show In Finder +downloads-cmd-show-menuitem-2 = + .label = { PLATFORM() -> + [macos] Show in Finder + *[other] Show in Folder + } .accesskey = F downloads-cmd-use-system-default = @@ -47,21 +44,21 @@ downloads-cmd-always-use-system-default = .label = Always Open In System Viewer .accesskey = w -downloads-cmd-show-button = +downloads-cmd-show-button-2 = .tooltiptext = { PLATFORM() -> - [macos] Show In Finder - *[other] Open Containing Folder + [macos] Show in Finder + *[other] Show in Folder } -downloads-cmd-show-panel = +downloads-cmd-show-panel-2 = .aria-label = { PLATFORM() -> - [macos] Show In Finder - *[other] Open Containing Folder + [macos] Show in Finder + *[other] Show in Folder } -downloads-cmd-show-description = +downloads-cmd-show-description-2 = .value = { PLATFORM() -> - [macos] Show In Finder - *[other] Open Containing Folder + [macos] Show in Finder + *[other] Show in Folder } downloads-cmd-show-downloads = diff --git a/browser/locales/en-US/chrome/browser/downloads/downloads.properties b/browser/locales/en-US/chrome/browser/downloads/downloads.properties index f5342650bc84..f90672aff7a9 100644 --- a/browser/locales/en-US/chrome/browser/downloads/downloads.properties +++ b/browser/locales/en-US/chrome/browser/downloads/downloads.properties @@ -82,17 +82,3 @@ statusSeparatorBeforeNumber=%1$S \u2014 %2$S # semi-colon list of plural forms. # See: http://developer.mozilla.org/en/Localization_and_Plurals otherDownloads3=%1$S file downloading;%1$S files downloading - -# LOCALIZATION NOTE (showLabel, showMacLabel): -# This is displayed when you hover a download item in the Library widget view. -# showMacLabel is only shown on Mac OSX. -showLabel=Open Containing Folder -showMacLabel=Open In Finder -# LOCALIZATION NOTE (openFileLabel): -# Displayed when hovering a complete download, indicates that it's possible to -# open the file using an app available in the system. -openFileLabel=Open File -# LOCALIZATION NOTE (retryLabel): -# Displayed when hovering a download which is able to be retried by users, -# indicates that it's possible to download this file again. -retryLabel=Retry Download