summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chromium_strings.grd4
-rw-r--r--chrome/app/generated_resources.grd23
-rw-r--r--chrome/app/google_chrome_strings.grd4
3 files changed, 31 insertions, 0 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 78bbb04..b9671a2 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -506,6 +506,10 @@ be available for now. -->
<message name="IDS_CONFLICTS_CHECK_WARNING_SUSPECTED" desc="Warning label on the compatibility page">
A module with the same name has been known to conflict with Chromium.
</message>
+ <!-- chrome://crashes strings -->
+ <message name="IDS_CRASHES_DISABLED_MESSAGE" desc="The explanatory message for chrome://crashes when crash reporting is disabled">
+ Crash reporting is not available in Chromium.
+ </message>
<if expr="os == 'darwin'">
<message name="IDS_SHORT_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2fb2eba..303ca23 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4108,6 +4108,29 @@ Keep your key file in a safe place. You will need it to create new versions of y
Disable showing validation messages and preventing form submission.
</message>
+ <!-- Crashes -->
+ <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes page.">
+ Crashes
+ </message>
+ <message name="IDS_CRASHES_CRASH_COUNT_BANNER_FORMAT" desc="Format for crash count banner on chrome://crashes">
+ Crashes (<ph name="CRASH_COUNT">$1<ex>3</ex></ph>)
+ </message>
+ <message name="IDS_CRASHES_CRASH_HEADER_FORMAT" desc="Format for crash entry headings on chrome://crashes">
+ Crash ID <ph name="CRASH_ID">$1<ex>8fa95dbb6f2ec862</ex></ph>
+ </message>
+ <message name="IDS_CRASHES_CRASH_TIME_FORMAT" desc="Format for crash entry occurence time on chrome://crashes">
+ Occurred <ph name="CRASH_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>
+ </message>
+ <message name="IDS_CRASHES_BUG_LINK_LABEL" desc="Link text for filing a crash bug on chrome://crashes">
+ File bug
+ </message>
+ <message name="IDS_CRASHES_NO_CRASHES_MESSAGE" desc="The explanatory message for chrome://crashes when there are no crashes">
+ You have no recently reported crashes. Crashes that occurred when crash reporting was disabled will not appear here.
+ </message>
+ <message name="IDS_CRASHES_DISABLED_HEADER" desc="The header for chrome://crashes when crash reporting is disabled">
+ Crash reporting is disabled.
+ </message>
+
<!-- Instant -->
<message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibox dropdown for enabling instant">
Enable...
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index a3e772d..d3996ed 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -513,6 +513,10 @@ Chrome supports. -->
<message name="IDS_CONFLICTS_CHECK_WARNING_SUSPECTED" desc="Warning label on the compatibility page">
A module with the same name has been known to conflict with Google Chrome.
</message>
+ <!-- chrome://crashes strings -->
+ <message name="IDS_CRASHES_DISABLED_MESSAGE" desc="The explanatory message for chrome://crashes when crash reporting is disabled">
+ This page only shows information on your recent crashes if you <ph name="BEGIN_LINK">&lt;a href="http://google.com/support/chrome/bin/answer.py?answer=96817"&gt;</ph>enable crash reporting<ph name="END_LINK">&lt;/a&gt;</ph>.
+ </message>
<if expr="os == 'darwin'">
<message name="IDS_SHORT_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">