diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-10 20:46:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-10 20:46:30 +0200 |
| commit | 27783db85a4d3c38b041e51b088ed2dbd35e96c1 (patch) | |
| tree | bdecff2c72ae61e598585a2821a53c523fc89a4a /application/basilisk/locales | |
| parent | 25f9c54aded0f514e6be7eb3105fcdb214431a59 (diff) | |
| parent | 7128f0d21de4d03be75133fbbd698f996fcd2a50 (diff) | |
| download | UXP-27783db85a4d3c38b041e51b088ed2dbd35e96c1.tar UXP-27783db85a4d3c38b041e51b088ed2dbd35e96c1.tar.gz UXP-27783db85a4d3c38b041e51b088ed2dbd35e96c1.tar.lz UXP-27783db85a4d3c38b041e51b088ed2dbd35e96c1.tar.xz UXP-27783db85a4d3c38b041e51b088ed2dbd35e96c1.zip | |
Merge pull request #469 from JustOff/PR_SB_DoNotTrack
[BASILISK] Remove tracking protection controls from the UI if safebrowsing isn't built
Diffstat (limited to 'application/basilisk/locales')
| -rw-r--r-- | application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd | 8 | ||||
| -rw-r--r-- | application/basilisk/locales/jar.mn | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd index 4c38c111a..e6a7955fb 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -2,6 +2,8 @@ - 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/. --> +<!ENTITY tracking.label "Tracking"> +#ifdef MOZ_SAFE_BROWSING <!ENTITY trackingProtectionHeader.label "Use Tracking Protection"> <!ENTITY trackingProtectionAlways.label "Always"> <!ENTITY trackingProtectionAlways.accesskey "y"> @@ -13,7 +15,6 @@ <!ENTITY trackingProtectionExceptions.label "Exceptions…"> <!ENTITY trackingProtectionExceptions.accesskey "x"> -<!ENTITY tracking.label "Tracking"> <!ENTITY trackingProtectionPBM5.label "Use Tracking Protection in Private Windows"> <!ENTITY trackingProtectionPBM5.accesskey "v"> <!ENTITY trackingProtectionPBMLearnMore.label "Learn more"> @@ -25,6 +26,11 @@ <!ENTITY doNotTrack.pre.label "You can also "> <!ENTITY doNotTrack.settings.label "manage your Do Not Track settings"> <!ENTITY doNotTrack.post.label "."> +#else +<!ENTITY doNotTrack.label "Send a signal that you don’t want to be tracked"> +<!ENTITY doNotTrack.accesskey "T"> +<!ENTITY doNotTrackLearnMore.label "Learn More"> +#endif <!ENTITY history.label "History"> diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn index 31cbd9ccf..9a847c7ed 100644 --- a/application/basilisk/locales/jar.mn +++ b/application/basilisk/locales/jar.mn @@ -64,12 +64,16 @@ locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd) locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd) locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties) +#ifdef MOZ_SAFE_BROWSING locale/browser/preferences/blocklists.dtd (%chrome/browser/preferences/blocklists.dtd) +#endif locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd) locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) +#ifdef MOZ_SAFE_BROWSING locale/browser/preferences/donottrack.dtd (%chrome/browser/preferences/donottrack.dtd) +#endif locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) locale/browser/preferences/main.dtd (%chrome/browser/preferences/main.dtd) @@ -78,7 +82,7 @@ locale/browser/preferences/preferences.dtd (%chrome/browser/preferences/preferences.dtd) locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties) locale/browser/preferences/containers.properties (%chrome/browser/preferences/containers.properties) - locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd) +* locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd) locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd) locale/browser/preferences/containers.dtd (%chrome/browser/preferences/containers.dtd) locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd) |