summaryrefslogtreecommitdiffstats
path: root/chrome/app/generated_resources.grd
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 06:53:25 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 06:53:25 +0000
commitd12dcdd649f0f1181ecae1f0f567c6a453a5a96d (patch)
tree5631de8aaf766884b3aae73327f2f94d9c26461b /chrome/app/generated_resources.grd
parent5a53b62b3e52202f530447f4fdf3637e39a56c35 (diff)
downloadchromium_src-d12dcdd649f0f1181ecae1f0f567c6a453a5a96d.zip
chromium_src-d12dcdd649f0f1181ecae1f0f567c6a453a5a96d.tar.gz
chromium_src-d12dcdd649f0f1181ecae1f0f567c6a453a5a96d.tar.bz2
Put some plug-ins behind an infobar, where they have:
- Been targeted by mass malware. - Do not yet have a good sandboxing story. BUG=60458 TEST=http://java.sun.com/products/plugin/1.4/demos/applets/Blink/example1.html with default plug-in settings. Review URL: http://codereview.chromium.org/6350010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 06b22c9..47de99f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4165,6 +4165,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PLUGIN_OUTDATED" desc="The placeholder text for an outdated disabled plug-in.">
The <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in is out of date.
</message>
+ <message name="IDS_PLUGIN_NOT_AUTHORIZED" desc="The placeholder text for a plug-in that requires user permission to run.">
+ The <ph name="PLUGIN_NAME">$1<ex>Java</ex></ph> plug-in needs your permission to run.
+ </message>
<!-- Session Crashed Info Bar-->
<message name="IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON" desc="Title of the restore button in the session crashed view.">
@@ -7648,6 +7651,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PLUGIN_ENABLE_TEMPORARILY" desc="Info Bar button to run a blocked outdated plugin">
Run this time
</message>
+ <message name="IDS_PLUGIN_ENABLE_ALWAYS" desc="Info Bar button to always run blocked plugins for this web site">
+ Always run on this site
+ </message>
<message name="IDS_PLUGIN_CRASHED_PROMPT" desc="Info Bar message to notify about a crashed plugin">
The following plug-in has crashed: <ph name="PLUGIN_NAME">$1<ex>Shockwave</ex></ph>
</message>