summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-06-20 18:46:09 +0200
committerGitHub <noreply@github.com>2018-06-20 18:46:09 +0200
commitcd9709ff5636c1a95d8d075b22a53fd5e62ed74e (patch)
treec7611dc1039e0f5611f2de158f598481105c3e95
parentdd55381507812f1ced3bb628f0ccd442cb031c6f (diff)
parent00e1f4f566f73a4dc0652a2c993d3bde8c276e92 (diff)
downloadUXP-cd9709ff5636c1a95d8d075b22a53fd5e62ed74e.tar
UXP-cd9709ff5636c1a95d8d075b22a53fd5e62ed74e.tar.gz
UXP-cd9709ff5636c1a95d8d075b22a53fd5e62ed74e.tar.lz
UXP-cd9709ff5636c1a95d8d075b22a53fd5e62ed74e.tar.xz
UXP-cd9709ff5636c1a95d8d075b22a53fd5e62ed74e.zip
Merge pull request #523 from JustOff/PR_locale_regressions
Fix misc regressions in en-US locale
-rw-r--r--services/sync/locales/en-US/errors.properties2
-rw-r--r--toolkit/locales/en-US/chrome/global/preferences.dtd2
-rw-r--r--toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd2
3 files changed, 3 insertions, 3 deletions
diff --git a/services/sync/locales/en-US/errors.properties b/services/sync/locales/en-US/errors.properties
index 3dfa074bc..f67f5ea1c 100644
--- a/services/sync/locales/en-US/errors.properties
+++ b/services/sync/locales/en-US/errors.properties
@@ -12,7 +12,7 @@ error.login.reason.server = Server incorrectly configured
error.sync.failed_partial = One or more data types could not be synced
# LOCALIZATION NOTE (error.sync.reason.serverMaintenance): We removed the extraneous period from this string
-error.sync.reason.serverMaintenance = Firefox Sync server maintenance is underway, syncing will resume automatically
+error.sync.reason.serverMaintenance = Sync server maintenance is underway, syncing will resume automatically
invalid-captcha = Incorrect words, try again
weak-password = Use a stronger password
diff --git a/toolkit/locales/en-US/chrome/global/preferences.dtd b/toolkit/locales/en-US/chrome/global/preferences.dtd
index 539dbbd5e..4824e5c06 100644
--- a/toolkit/locales/en-US/chrome/global/preferences.dtd
+++ b/toolkit/locales/en-US/chrome/global/preferences.dtd
@@ -4,6 +4,6 @@
<!ENTITY windowClose.key "w">
<!ENTITY preferencesDefaultTitleMac.title "Preferences">
-<!ENTITY preferencesDefaultTitleWin.title "Options">
+<!ENTITY preferencesDefaultTitleWin.title "Preferences">
<!ENTITY preferencesCloseButton.label "Close">
<!ENTITY preferencesCloseButton.accesskey "C">
diff --git a/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd b/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
index c2d49d683..841655127 100644
--- a/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
+++ b/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
@@ -7,7 +7,7 @@
<!ENTITY unsupportedPlatform.pre "We're very sorry, but &brandShortName; can't play Flash on this device. ">
<!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not
supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
-<!ENTITY unsupportedPlatform.learnMore "Learn More…">
+<!ENTITY unsupportedPlatform.learnMore "Learn More…">
<!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
<!ENTITY unsupportedPlatform.post "">