diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-10 16:59:13 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-10 16:59:13 +0100 |
| commit | 9697bfa68f32984b196748e388d743dddbe6aa7b (patch) | |
| tree | 3d8d23560d512199fbc8334bd15514d70ea00268 /application/palemoon/locales/en-US/chrome/browser | |
| parent | 7d398710beb67e03bf1690f73cdfd1ef2b76d31a (diff) | |
| parent | fbbda481dce5c367b4ccdeacc70cdcd7f68ac8af (diff) | |
| download | UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.gz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.lz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.xz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'application/palemoon/locales/en-US/chrome/browser')
| -rw-r--r-- | application/palemoon/locales/en-US/chrome/browser/aboutHome.dtd | 4 | ||||
| -rw-r--r-- | application/palemoon/locales/en-US/chrome/browser/browser.dtd | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/application/palemoon/locales/en-US/chrome/browser/aboutHome.dtd b/application/palemoon/locales/en-US/chrome/browser/aboutHome.dtd index 03ffe629d..d3bd85fc8 100644 --- a/application/palemoon/locales/en-US/chrome/browser/aboutHome.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/aboutHome.dtd @@ -4,8 +4,10 @@ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD; +#ifdef MOZ_SERVICES_SYNC <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd"> %syncBrandDTD; +#endif <!-- These strings are used in the about:home page --> @@ -19,4 +21,6 @@ <!ENTITY abouthome.addonsButton.label "Add-ons"> <!ENTITY abouthome.appsButton.label "Marketplace"> <!ENTITY abouthome.downloadsButton.label "Downloads"> +#ifdef MOZ_SERVICES_SYNC <!ENTITY abouthome.syncButton.label "&syncBrand.shortName.label;"> +#endif
\ No newline at end of file diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.dtd b/application/palemoon/locales/en-US/chrome/browser/browser.dtd index 8632b44b4..439057a84 100644 --- a/application/palemoon/locales/en-US/chrome/browser/browser.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/browser.dtd @@ -567,6 +567,7 @@ just addresses the organization to follow, e.g. "This site is run by " --> The word "toolbar" is appended automatically and should not be contained below! --> <!ENTITY tabsToolbar.label "Browser tabs"> +#ifdef MOZ_SERVICES_SYNC <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu --> <!ENTITY syncTabsMenu2.label "Tabs From Other Devices"> @@ -577,6 +578,7 @@ just addresses the organization to follow, e.g. "This site is run by " --> <!ENTITY syncSyncNowItem.label "Sync Now"> <!ENTITY syncSyncNowItem.accesskey "S"> <!ENTITY syncToolbarButton.label "Sync"> +#endif <!ENTITY addonBarCloseButton.tooltip "Close Add-on Bar"> <!ENTITY toggleAddonBarCmd.key "/"> |