diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-20 18:50:55 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-20 18:50:55 +0200 |
| commit | 5c0b3b7d3224778c9421f8dcd7f8dd1d09f62675 (patch) | |
| tree | 0ae4a491945ec3ff4dc39ff0b8ddcbd5dbedf42a | |
| parent | 475728c698fe624e82da73b2352c79391f1eb54a (diff) | |
| parent | cd9709ff5636c1a95d8d075b22a53fd5e62ed74e (diff) | |
| download | UXP-5c0b3b7d3224778c9421f8dcd7f8dd1d09f62675.tar UXP-5c0b3b7d3224778c9421f8dcd7f8dd1d09f62675.tar.gz UXP-5c0b3b7d3224778c9421f8dcd7f8dd1d09f62675.tar.lz UXP-5c0b3b7d3224778c9421f8dcd7f8dd1d09f62675.tar.xz UXP-5c0b3b7d3224778c9421f8dcd7f8dd1d09f62675.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
| -rw-r--r-- | services/sync/locales/en-US/errors.properties | 2 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/global/preferences.dtd | 2 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd | 2 |
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 ""> |