[or-cvs] [torbutton/master 33/47] Improve message about external content.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Tue, 6 Apr 2010 16:52:47 -0700
Subject: Improve message about external content.
Commit: dd5e7a40d19b6d483182607dabe85312872466f9

---
 src/chrome/locale/en/torbutton.properties |    1 +
 src/components/external-app-blocker.js    |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index c87c011..e2e8754 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -24,6 +24,7 @@ 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 Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js
index c423300..dfaf588 100644
--- a/src/components/external-app-blocker.js
+++ b/src/components/external-app-blocker.js
@@ -171,12 +171,13 @@ ExternalWrapper.prototype =
     var title = bundle.GetStringFromName("torbutton.popup.external.title");
     var app = bundle.GetStringFromName("torbutton.popup.external.app");
     var note = bundle.GetStringFromName("torbutton.popup.external.note");
+    var suggest = bundle.GetStringFromName("torbutton.popup.external.suggest");
     var launch = bundle.GetStringFromName("torbutton.popup.launch");
     var cancel = bundle.GetStringFromName("torbutton.popup.cancel");
     var dontask = bundle.GetStringFromName("torbutton.popup.dontask");
 
-    var result = prompts.confirmEx(chrome, title, app+urispec+note+" ", 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);
-- 
1.7.1