[tbb-commits] [torbutton/master] Bug 10280: Strings and pref for preventing plugin initialization.

[mikeperry at torproject.org]

commit 433fa8b779a4e7b9e5ec3cf09cb49979d5fcc038
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Feb 12 16:22:47 2015 -0800

    Bug 10280: Strings and pref for preventing plugin initialization.
---
 src/chrome/content/torbutton.js |    2 ++
 src/chrome/locale/en/brand.dtd  |    6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 8ae1d5d..69891c8 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2062,6 +2062,8 @@ function torbutton_tor_check_ok()
 // toggles plugins: true for disabled, false for enabled
 function torbutton_toggle_plugins(disable_plugins) {
   if (m_tb_tbb) {
+    m_tb_prefs.setBoolPref("plugin.disable", disable_plugins);
+
     var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
     var P=PH.getPluginTags({});
     for(var i=0; i<P.length; i++) {
diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en/brand.dtd
index 59f665e..cc65346 100644
--- a/src/chrome/locale/en/brand.dtd
+++ b/src/chrome/locale/en/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">