[tor-commits] [torbutton/master] Bug 8313: Don't display the plugin confirmation at startup.

[mikeperry at torproject.org]

commit 7d75c8a9b390abdf40810bc43dd677c659b3831e
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Sat Mar 2 11:20:46 2013 -0800

    Bug 8313: Don't display the plugin confirmation at startup.
    
    Also tweak the text slightly.
---
 src/chrome/content/torbutton.js           |    1 +
 src/chrome/locale/en/torbutton.properties |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 96e2a7b..49cd9b8 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -124,6 +124,7 @@ var torbutton_unique_pref_observer =
           // Hrmm. should we inspect subject too? it's just mime type..
           subject.QueryInterface(Ci.nsISupportsCString);
           if (data == "Gecko-Content-Viewers" &&
+              !m_tb_prefs.getBoolPref("extensions.torbutton.startup") &&
               m_tb_prefs.getBoolPref("extensions.torbutton.confirm_plugins")) {
              torbutton_confirm_plugins();
           }
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index e7ade8e..dc6684c 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -44,7 +44,7 @@ torbutton.title.prompt_torbrowser = Important Torbutton Information
 torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
 torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and can bypass Tor to reveal your current IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
 torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.