summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 00:21:20 +0000
committerjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 00:21:20 +0000
commitbb7f4095f73cf4c0ce0fe8a3cff37def81311d57 (patch)
tree7622be5faaa5342ea48c2627eb45ab1586d2be4d /chrome/app
parent31ae9addcfc81537293f5c4fc6c12ac9d8006159 (diff)
downloadchromium_src-bb7f4095f73cf4c0ce0fe8a3cff37def81311d57.zip
chromium_src-bb7f4095f73cf4c0ce0fe8a3cff37def81311d57.tar.gz
chromium_src-bb7f4095f73cf4c0ce0fe8a3cff37def81311d57.tar.bz2
Show crashed extensions on chrome://extensions.
BUG=31535 TEST=updated JSON serialization tests, added check in browsertest, manual test using task manager to terminate an extension process Review URL: http://codereview.chromium.org/6158001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 0bf1ea4..3ca5235 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3817,6 +3817,9 @@ each locale. -->
<message name="IDS_EXTENSIONS_NONE_INSTALLED_SUGGEST_GALLERY" desc="Text on next line after IDS_EXTENSIONS_NONE_INSTALLED that suggests the user look in the gallery for extensions to install.">
Want to <ph name="BEGIN_LINK">$1</ph>browse the gallery<ph name="END_LINK">$2</ph> instead?
</message>
+ <message name="IDS_EXTENSIONS_CRASHED_EXTENSION" desc="Text that signifies that the extension process was terminated, usually because it has crashed.">
+ (Crashed)
+ </message>
<message name="IDS_EXTENSIONS_DISABLED_EXTENSION" desc="Text that signifies that the extension is currently disabled.">
(Disabled)
</message>