From dc0fcce6eb47127293f3abed626897f0b1890499 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 25 Jul 2013 08:54:25 -0700 Subject: [PATCH] Bug 896156 - Fix problems in plurals and comments for Metro download bar strings [r=emtwo] --- browser/metro/base/content/downloads.js | 3 +-- .../locales/en-US/chrome/browser.properties | 16 +++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/browser/metro/base/content/downloads.js b/browser/metro/base/content/downloads.js index 73020a9eb025..dc828299a0e8 100644 --- a/browser/metro/base/content/downloads.js +++ b/browser/metro/base/content/downloads.js @@ -212,8 +212,7 @@ var Downloads = { _showDownloadCompleteNotification: function (aDownload) { let message = ""; - let showInFilesButtonText = PluralForm.get(this._downloadCount, - Strings.browser.GetStringFromName("downloadsShowInFiles")); + let showInFilesButtonText = Strings.browser.GetStringFromName("downloadShowInFiles"); let buttons = [ { diff --git a/browser/metro/locales/en-US/chrome/browser.properties b/browser/metro/locales/en-US/chrome/browser.properties index 9fafd2d75a24..702e673a043f 100644 --- a/browser/metro/locales/en-US/chrome/browser.properties +++ b/browser/metro/locales/en-US/chrome/browser.properties @@ -61,9 +61,8 @@ downloadRun=Run downloadSave=Save downloadCancel=Cancel downloadTryAgain=Try Again -# LOCALIZATION NOTE (downloadsShowInFiles): Semicolon-separated list of plural forms. -# 'Files' refers to the Windows 8 file explorer -downloadsShowInFiles=Show download in Files;Show downloads in Files +# LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer +downloadShowInFiles=Show in Files # Alerts alertLinkBookmarked=Bookmark added @@ -79,16 +78,19 @@ alertDownloadsSize=Download too big alertDownloadsNoSpace=Not enough storage space # LOCALIZATION NOTE (alertDownloadSave): #1 is the file name, #2 is the file size, #3 is the file host alertDownloadSave=Do you want to run or save #1 (#2) from #3? -# LOCALIZATION NOTE (alertDownloadMultiple): Semicolon-separated list of plural forms. +# LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms. +# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining -alertDownloadMultiple=Downloading one file, #2, #3; Downloading #1 files, #2, #3 -# LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semicolon-separated list of plural forms. +alertDownloadMultiple=Downloading one file, #2, #3;Downloading #1 files, #2, #3 +# LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semi-colon list of plural forms. +# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 is the number of downloads completed alertMultipleDownloadsComplete=One download has been completed;#1 downloads have been completed alertDownloadFailed=Sorry, downloading %S failed. # Popup Blocker -# LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms. +# LOCALIZATION NOTE (popupWarning.message): Semi-colon list of plural forms. +# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 is brandShortName and #2 is the number of pop-ups blocked. popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows. popupButtonAllowOnce2=Allow once