diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-23 21:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-23 21:50:01 +0200 |
| commit | 1dfd7afd484024d8b091d906e2817e6bd6f4b383 (patch) | |
| tree | 32c9bc64580a23026e817a8cbbf24e106734197b | |
| parent | 89ee89f14109f06bbb0e7545f7cbe88af671c5ad (diff) | |
| download | UXP-1dfd7afd484024d8b091d906e2817e6bd6f4b383.tar UXP-1dfd7afd484024d8b091d906e2817e6bd6f4b383.tar.gz UXP-1dfd7afd484024d8b091d906e2817e6bd6f4b383.tar.lz UXP-1dfd7afd484024d8b091d906e2817e6bd6f4b383.tar.xz UXP-1dfd7afd484024d8b091d906e2817e6bd6f4b383.zip | |
Fix about:rights dependencies for Safe Browsing.
This resolves #533.
| -rw-r--r-- | toolkit/content/aboutRights.xhtml | 3 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/global/aboutRights.dtd | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml index c0c73d761..0d42e6fad 100644 --- a/toolkit/content/aboutRights.xhtml +++ b/toolkit/content/aboutRights.xhtml @@ -47,6 +47,7 @@ <div id="disabling-webservices-container" style="margin-left:40px;"> <a name="disabling-webservices"/> +#ifdef MOZ_SAFE_BROWSING <p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p> <ul> <li>&rights.safebrowsing-term1;</li> @@ -54,7 +55,7 @@ <li>&rights2.safebrowsing-term3;</li> <li>&rights.safebrowsing-term4;</li> </ul> - +#endif <p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p> <ul> <li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li> diff --git a/toolkit/locales/en-US/chrome/global/aboutRights.dtd b/toolkit/locales/en-US/chrome/global/aboutRights.dtd index 28b24e1d8..dfd5a1668 100644 --- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd @@ -65,7 +65,7 @@ <!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites. If you wish to disable the feature completely, follow these steps:"> <!ENTITY rights.safebrowsing-term1 "Open the application preferences"> <!ENTITY rights.safebrowsing-term2 "Select the Security selection"> -<!ENTITY rights2.safebrowsing-term3 "Uncheck the option to "&enableSafeBrowsing.label;""> +<!ENTITY rights2.safebrowsing-term3 "Uncheck the option to enable Safe Browsing"> <!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled"> <!-- location aware browsing points for branded builds --> |