From 80eb356d57fc310cdf812cae63de30d6e56c1788 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 26 Jun 2018 15:35:33 -0400 Subject: [AllAM] De-duplicate Locales --- .../en-US/chrome/mozapps/extensions/extensions.dtd | 23 ++ .../en-US/chrome/mozapps/webextensions/about.dtd | 9 - .../chrome/mozapps/webextensions/blocklist.dtd | 17 -- .../chrome/mozapps/webextensions/extensions.dtd | 251 --------------------- .../mozapps/webextensions/extensions.properties | 184 --------------- .../chrome/mozapps/webextensions/newaddon.dtd | 15 -- .../mozapps/webextensions/newaddon.properties | 10 - .../en-US/chrome/mozapps/webextensions/update.dtd | 65 ------ .../chrome/mozapps/webextensions/update.properties | 21 -- .../mozapps/webextensions/xpinstallConfirm.dtd | 13 -- .../webextensions/xpinstallConfirm.properties | 11 - toolkit/locales/jar.mn | 18 -- 12 files changed, 23 insertions(+), 614 deletions(-) delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd delete mode 100644 toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd index febc18dfd..76f5570f9 100644 --- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd +++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd @@ -24,6 +24,11 @@ + + + + + @@ -235,3 +240,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd deleted file mode 100644 index 4f9098966..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd deleted file mode 100644 index a9490db5e..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd deleted file mode 100644 index 99c940b33..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties deleted file mode 100644 index b51c3e12d..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties +++ /dev/null @@ -1,184 +0,0 @@ -# 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/. - -#LOCALIZATION NOTE (aboutWindowTitle) %S is the addon name -aboutWindowTitle=About %S -aboutWindowCloseButton=Close -#LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version -aboutWindowVersionString=version %S -#LOCALIZATION NOTE (aboutAddon) %S is the addon name -aboutAddon=About %S - -#LOCALIZATION NOTE (uninstallNotice) %S is the add-on name -uninstallNotice=%S has been removed. - -#LOCALIZATION NOTE (numReviews): Semicolon-separated list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #1 is the number of reviews -numReviews=#1 review;#1 reviews - -#LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated -dateUpdated=Updated %S - -#LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version -notification.incompatible=%1$S is incompatible with %2$S %3$S. -#LOCALIZATION NOTE (notification.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name -notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled. -notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution. -notification.unsigned.link=More Information -#LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name -notification.blocked=%1$S has been disabled due to security or stability issues. -notification.blocked.link=More Information -#LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name -notification.softblocked=%1$S is known to cause issues. -notification.softblocked.link=More Information -#LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name -notification.outdated=An important update is available for %1$S. -notification.outdated.link=Update Now -#LOCALIZATION NOTE (notification.vulnerableUpdatable) %1$S is the add-on name -notification.vulnerableUpdatable=%1$S is known to be vulnerable and should be updated. -notification.vulnerableUpdatable.link=Update Now -#LOCALIZATION NOTE (notification.vulnerableNoUpdate) %1$S is the add-on name -notification.vulnerableNoUpdate=%1$S is known to be vulnerable. Use with caution. -notification.vulnerableNoUpdate.link=More Information -#LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name -notification.enable=%1$S will be enabled after you restart %2$S. -#LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name -notification.disable=%1$S will be disabled after you restart %2$S. -#LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name -notification.install=%1$S will be installed after you restart %2$S. -#LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name -notification.uninstall=%1$S will be uninstalled after you restart %2$S. -#LOCALIZATION NOTE (notification.upgrade) %1$S is the add-on name, %2$S is brand name -notification.upgrade=%1$S will be updated after you restart %2$S. -#LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name. -notification.downloadError=There was an error downloading %1$S. -notification.downloadError.retry=Try again -notification.downloadError.retry.tooltip=Try downloading this add-on again -#LOCALIZATION NOTE (notification.installError) %1$S is the add-on name. -notification.installError=There was an error installing %1$S. -notification.installError.retry=Try again -notification.installError.retry.tooltip=Try downloading and installing this add-on again -#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name. -notification.gmpPending=%1$S will be installed shortly. - -#LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions -contributionAmount2=Suggested Contribution: %S - -installDownloading=Downloading -installDownloaded=Downloaded -installDownloadFailed=Error downloading -installVerifying=Verifying -installInstalling=Installing -installEnablePending=Restart to enable -installDisablePending=Restart to disable -installFailed=Error installing -installCancelled=Install cancelled - -#LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version -details.notification.incompatible=%1$S is incompatible with %2$S %3$S. -#LOCALIZATION NOTE (details.notification.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name -details.notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled. -details.notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution. -details.notification.unsigned.link=More Information -#LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name -details.notification.blocked=%1$S has been disabled due to security or stability issues. -details.notification.blocked.link=More Information -#LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name -details.notification.softblocked=%1$S is known to cause issues. -details.notification.softblocked.link=More Information -#LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name -details.notification.outdated=An important update is available for %1$S. -details.notification.outdated.link=Update Now -#LOCALIZATION NOTE (details.notification.vulnerableUpdatable) %1$S is the add-on name -details.notification.vulnerableUpdatable=%1$S is known to be vulnerable and should be updated. -details.notification.vulnerableUpdatable.link=Update Now -#LOCALIZATION NOTE (details.notification.vulnerableNoUpdate) %1$S is the add-on name -details.notification.vulnerableNoUpdate=%1$S is known to be vulnerable. Use with caution. -details.notification.vulnerableNoUpdate.link=More Information -#LOCALIZATION NOTE (details.notification.enable) %1$S is the add-on name, %2$S is brand name -details.notification.enable=%1$S will be enabled after you restart %2$S. -#LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name -details.notification.disable=%1$S will be disabled after you restart %2$S. -#LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name -details.notification.install=%1$S will be installed after you restart %2$S. -#LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name -details.notification.uninstall=%1$S will be uninstalled after you restart %2$S. -#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name -details.notification.upgrade=%1$S will be updated after you restart %2$S. -#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name -details.notification.gmpPending=%1$S will be installed shortly. - -# LOCALIZATION NOTE (details.experiment.time.daysRemaining): -# Semicolon-separated list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #1 is the number of days from now that the experiment will remain active (detail view). -details.experiment.time.daysRemaining=#1 day remaining;#1 days remaining -#LOCALIZATION NOTE (details.experiment.time.endsToday) The experiment will end in less than a day (detail view). -details.experiment.time.endsToday=Less than a day remaining -# LOCALIZATION NOTE (details.experiment.time.daysPassed): -# Semicolon-separated list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #1 is the number of days since the experiment ran (detail view). -details.experiment.time.daysPassed=#1 day ago;#1 days ago -#LOCALIZATION NOTE (details.experiment.time.endedToday) The experiment ended less than a day ago (detail view). -details.experiment.time.endedToday=Less than a day ago -#LOCALIZATION NOTE (details.experiment.state.active) This experiment is active (detail view). -details.experiment.state.active=Active -#LOCALIZATION NOTE (details.experiment.state.complete) This experiment is complete (it was previously active) (detail view). -details.experiment.state.complete=Complete - -# LOCALIZATION NOTE (experiment.time.daysRemaining): -# Semicolon-separated list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #1 is the number of days from now that the experiment will remain active (list view item). -experiment.time.daysRemaining=#1 day remaining;#1 days remaining -#LOCALIZATION NOTE (experiment.time.endsToday) The experiment will end in less than a day (list view item). -experiment.time.endsToday=Less than a day remaining -# LOCALIZATION NOTE (experiment.time.daysPassed): -# Semicolon-separated list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #1 is the number of days since the experiment ran (list view item). -experiment.time.daysPassed=#1 day ago;#1 days ago -#LOCALIZATION NOTE (experiment.time.endedToday) The experiment ended less than a day ago (list view item). -experiment.time.endedToday=Less than a day ago -#LOCALIZATION NOTE (experiment.state.active) This experiment is active (list view item). -experiment.state.active=Active -#LOCALIZATION NOTE (experiment.state.complete) This experiment is complete (it was previously active) (list view item). -experiment.state.complete=Complete - -installFromFile.dialogTitle=Select add-on to install -installFromFile.filterName=Add-ons - -uninstallAddonTooltip=Uninstall this add-on -uninstallAddonRestartRequiredTooltip=Uninstall this add-on (restart required) -enableAddonTooltip=Enable this add-on -enableAddonRestartRequiredTooltip=Enable this add-on (restart required) -disableAddonTooltip=Disable this add-on -disableAddonRestartRequiredTooltip=Disable this add-on (restart required) - -#LOCALIZATION NOTE (showAllSearchResults): Semicolon-separated list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #1 is the total number of search results -showAllSearchResults=See one result;See all #1 results - -#LOCALIZATION NOTE (addon.purchase.label) displayed on a button in the list -# view, %S is the price of the add-on including currency symbol -addon.purchase.label=Purchase for %S… -addon.purchase.tooltip=Visit the add-ons gallery to purchase this add-on -#LOCALIZATION NOTE (cmd.purchaseAddon.label) displayed on a button in the detail -# view, %S is the price of the add-on including currency symbol -cmd.purchaseAddon.label=Purchase for %S… -cmd.purchaseAddon.accesskey=u - -#LOCALIZATION NOTE (eulaHeader) %S is name of the add-on asking the user to agree to the EULA -eulaHeader=%S requires that you accept the following End User License Agreement before installation can proceed: - -type.extension.name=Extensions -type.theme.name=Appearance -type.locale.name=Languages -type.plugin.name=Plugins -type.dictionary.name=Dictionaries -type.service.name=Services -type.experiment.name=Experiments diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd deleted file mode 100644 index 1307cebb9..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties deleted file mode 100644 index bd5997a26..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties +++ /dev/null @@ -1,10 +0,0 @@ -# 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/. - -#LOCALIZATION NOTE (name) %1$S is the add-on name, %2$S is the add-on version -name=%1$S %2$S -#LOCALIZATION NOTE (author) %S is the author of the add-on -author=By %S -#LOCALIZATION NOTE (location) %S is the path the add-on is installed in -location=Location: %S diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd deleted file mode 100644 index 6dd64a9c6..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties deleted file mode 100644 index c2d4ed90f..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties +++ /dev/null @@ -1,21 +0,0 @@ -# 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/. - -mismatchCheckNow=Check Now -mismatchCheckNowAccesskey=C -mismatchDontCheck=Don’t Check -mismatchDontCheckAccesskey=D -installButtonText=Install Now -installButtonTextAccesskey=I -nextButtonText=Next > -nextButtonTextAccesskey=N -cancelButtonText=Cancel -cancelButtonTextAccesskey=C -statusPrefix=Finished checking %S -downloadingPrefix=Downloading: %S -installingPrefix=Installing: %S -closeButton=Close -installErrors=%S was unable to install updates for the following add-ons: -checkingErrors=%S was unable to check for updates for the following add-ons: -installErrorItemFormat=%S (%S) diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd deleted file mode 100644 index 6a7d17a16..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties deleted file mode 100644 index d0b4e46ad..000000000 --- a/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties +++ /dev/null @@ -1,11 +0,0 @@ -# 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/. - -unverified=(Author not verified) -signed=(%S) - -itemWarnIntroMultiple=You have asked to install the following %S items: -itemWarnIntroSingle=You have asked to install the following item: -installButtonDisabledLabel=Install (%S) -installButtonLabel=Install Now diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 0b3a5dc72..1254047cb 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -108,18 +108,6 @@ locale/@AB_CD@/mozapps/downloads/settingsChange.dtd (%chrome/mozapps/downloads/settingsChange.dtd) locale/@AB_CD@/mozapps/downloads/downloads.dtd (%chrome/mozapps/downloads/downloads.dtd) locale/@AB_CD@/mozapps/downloads/downloads.properties (%chrome/mozapps/downloads/downloads.properties) -#ifdef MOZ_WEBEXTENSIONS - locale/@AB_CD@/mozapps/extensions/extensions.dtd (%chrome/mozapps/webextensions/extensions.dtd) -#ifndef MOZ_FENNEC - locale/@AB_CD@/mozapps/extensions/extensions.properties (%chrome/mozapps/webextensions/extensions.properties) - locale/@AB_CD@/mozapps/extensions/blocklist.dtd (%chrome/mozapps/webextensions/blocklist.dtd) - locale/@AB_CD@/mozapps/extensions/about.dtd (%chrome/mozapps/webextensions/about.dtd) - locale/@AB_CD@/mozapps/extensions/update.dtd (%chrome/mozapps/webextensions/update.dtd) - locale/@AB_CD@/mozapps/extensions/update.properties (%chrome/mozapps/webextensions/update.properties) - locale/@AB_CD@/mozapps/extensions/newaddon.dtd (%chrome/mozapps/webextensions/newaddon.dtd) - locale/@AB_CD@/mozapps/extensions/newaddon.properties (%chrome/mozapps/webextensions/newaddon.properties) -#endif -#else locale/@AB_CD@/mozapps/extensions/extensions.dtd (%chrome/mozapps/extensions/extensions.dtd) locale/@AB_CD@/mozapps/extensions/extensions.properties (%chrome/mozapps/extensions/extensions.properties) locale/@AB_CD@/mozapps/extensions/blocklist.dtd (%chrome/mozapps/extensions/blocklist.dtd) @@ -130,7 +118,6 @@ locale/@AB_CD@/mozapps/extensions/update.properties (%chrome/mozapps/extensions/update.properties) locale/@AB_CD@/mozapps/extensions/newaddon.dtd (%chrome/mozapps/extensions/newaddon.dtd) locale/@AB_CD@/mozapps/extensions/newaddon.properties (%chrome/mozapps/extensions/newaddon.properties) -#endif locale/@AB_CD@/mozapps/handling/handling.dtd (%chrome/mozapps/handling/handling.dtd) locale/@AB_CD@/mozapps/handling/handling.properties (%chrome/mozapps/handling/handling.properties) locale/@AB_CD@/mozapps/preferences/changemp.dtd (%chrome/mozapps/preferences/changemp.dtd) @@ -144,13 +131,8 @@ locale/@AB_CD@/mozapps/update/updates.properties (%chrome/mozapps/update/updates.properties) #endif locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd) -#ifdef MOZ_WEBEXTENSIONS - locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/webextensions/xpinstallConfirm.dtd) - locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/webextensions/xpinstallConfirm.properties) -#else locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/extensions/xpinstallConfirm.dtd) locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/extensions/xpinstallConfirm.properties) -#endif % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/ locale/@AB_CD@/pluginproblem/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd) % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/ -- cgit v1.2.3