diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
| commit | 8240fb9c736f91044cabbdde8c537b179fc4921e (patch) | |
| tree | 49a4cc8dc683cf955d61b6618ad471860554ccb5 /testing/profiles | |
| parent | f9e04b54c2ccbc1f8e24b511003de09b4565193c (diff) | |
| parent | 5c83a18cde404b5c0c9fba1d35f003d951ea32e2 (diff) | |
| download | UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.gz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.lz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.xz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'testing/profiles')
| -rw-r--r-- | testing/profiles/prefs_general.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 515828d29..bf1534c12 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -284,12 +284,6 @@ user_pref("apz.content_response_timeout", 60000); // Make sure SSL Error reports don't hit the network user_pref("security.ssl.errorReporting.url", "https://example.com/browser/browser/base/content/test/general/ssl_error_reports.sjs?succeed"); -// Make sure Translation won't hit the network. -user_pref("browser.translation.bing.authURL", "http://%(server)s/browser/browser/components/translation/test/bing.sjs"); -user_pref("browser.translation.bing.translateArrayURL", "http://%(server)s/browser/browser/components/translation/test/bing.sjs"); -user_pref("browser.translation.yandex.translateURLOverride", "http://%(server)s/browser/browser/components/translation/test/yandex.sjs"); -user_pref("browser.translation.engine", "bing"); - // Make sure we don't try to load snippets from the network. user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test"); |