commit 7d87a3603057b9bcafc82bde16abc0f8b31a1f7e Author: Mike Perry <mikeperry-git@torproject.org> Date: Tue Apr 22 09:35:10 2014 -0700 Bug 7439: Improve download warning dialog text. --- src/chrome/locale/en/torbutton.properties | 12 ++++++------ src/components/external-app-blocker.js | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index dc6684c..d34432d 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use To torbutton.prefs.recommended = (recommended) torbutton.prefs.optional = (optional) torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = Load external content? -torbutton.popup.external.app = An external application is needed to handle:\n\n -torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n -torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n -torbutton.popup.launch = Launch application +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Always launch applications from now on +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 057f4ae..38ddcd7 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -177,9 +177,12 @@ ExternalWrapper.prototype = var cancel = chrome.torbutton_get_property_string("torbutton.popup.cancel"); var dontask = chrome.torbutton_get_property_string("torbutton.popup.dontask"); - var result = prompts.confirmEx(chrome, title, app+urispec+note+suggest+" ", + var result = prompts.confirmEx(chrome, title, app+note+suggest+" ", flags, launch, cancel, "", dontask, check); + //var result = prompts.confirmEx(chrome, title, app+urispec+note+suggest+" ", + // flags, launch, cancel, "", dontask, check); + if (check.value) { this._prefs.setBoolPref("extensions.torbutton.launch_warning", false); }