Bug 746110 - Expose click-to-play plugins preference in the UI. r=Neil ui-r=IanN
authorJens Hatlak <jh@junetz.de>
Sat, 07 Jul 2012 16:22:13 +0200
changeset 7851 b30b349cfd58cb58c8137401432f8b6d2c946f21
parent 7850 87ad02ab25fefdba5495faa33f756dc176b2dfed
child 7852 d9a41bb7611029a873ec1d5a4ff223277e8de3e4
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersNeil, IanN
Bug 746110 - Expose click-to-play plugins preference in the UI. r=Neil ui-r=IanN X-Channel-Repo: comm-central X-Channel-Converted-Revision: f9abd1dbd5991ef5cf0958513cdf7bba46e3eeb2
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -119,22 +119,33 @@
   <li><strong>Enable Plugins for</strong>: Use these checkboxes to control how
     plugins are used:
       <li><strong>Suite</strong>: Globally enables or disables plugins.</li>
       <li><strong>Mail &amp; Newsgroups</strong>: Allows plugins to be used in
         Mail &amp; Newsgroups.</li>
-  <li><strong>When additional plugins are required</strong>: Check this
-    checkbox if you want to be informed whenever a website requires additional
+  <li><strong>When a page requires plugins</strong>: Select these
+    checkboxes to control what &brandShortName; should do if a web page requires
-      <li><strong>Display a notification bar at the top of the content
-        area</strong>: When a website requires a plugin which is not installed,
+      <li><strong>Activate all plugins by default</strong>: If you select this,
+        &brandShortName; will load and run all plugins found on the web page.
+        Otherwise, if the page requires plugins, &brandShortName; will show a
+        notification (plugin icon in the location bar or notification bar), plus
+        a placeholder for every plugin instance found on the page (unless the
+        website is whitelisted, see below).
+        You can activate individual visible plugin instances with a left mouse
+        click or use the notification to activate all the plugins on the page.
+        From the notification you have the option to either temporarily activate
+        the plugins or remember the choice for the current website. Remembered
+        choices can be edited using the Data Manager (Permissions tab).</li>
+      <li><strong>Warn me if additional plugins need to be installed</strong>:
+        When a website requires a plugin which is not installed,
         a notification bar will be displayed above the website content area.
         From the bar you will be able to download and install the missing
 <p>For more information about plugins, see
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -16,15 +16,17 @@
 <!ENTITY allowScripts.accesskey          "s">
 <!ENTITY allowWindowMoveResize.label     "Move or resize existing windows">
 <!ENTITY allowWindowFlip.label           "Raise or lower windows">
 <!ENTITY allowWindowStatusChange.label   "Change status bar text">
 <!ENTITY allowWindowImageSrcChange.label "Change images">
 <!ENTITY allowContextmenuDisable.label   "Disable or replace context menus">
 <!ENTITY allowHideStatusBar.label        "Hide the status bar">
-<!ENTITY enablePlugin.label              "Enable Plugins for:">
+<!ENTITY enablePlugins.label             "Enable Plugins for">
 <!ENTITY enablePluginForSuite.label      "Suite">
 <!ENTITY enablePluginForSuite.accesskey  "u">
-<!ENTITY whenPluginsRequired.label       "When additional plugins are required">
-<!ENTITY displayNotification.label       "Display a notification bar at the top of the content area">
-<!ENTITY displayNotification.accesskey   "N">
+<!ENTITY whenPageRequiresPlugins.label   "When a page requires plugins">
+<!ENTITY activateAllPlugins.label        "Activate all plugins by default">
+<!ENTITY activateAllPlugins.accesskey    "d">
+<!ENTITY warnPluginsRequired.label       "Warn me if additional plugins need to be installed">
+<!ENTITY warnPluginsRequired.accesskey   "W">