summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authoryiyaoliu@google.com <yiyaoliu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-09 20:48:53 +0000
committeryiyaoliu@google.com <yiyaoliu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-09 20:48:53 +0000
commit22c1d05e1d769df249ccf83d91174bff333cf87b (patch)
treed006b31841adb81a545e77328ab76f8217e1e815 /chrome/app
parent7cfbcc72200aac29c961580687eb8501b0ec10cd (diff)
downloadchromium_src-22c1d05e1d769df249ccf83d91174bff333cf87b.zip
chromium_src-22c1d05e1d769df249ccf83d91174bff333cf87b.tar.gz
chromium_src-22c1d05e1d769df249ccf83d91174bff333cf87b.tar.bz2
Add link https://support.google.com/chrome/answer/96817 to the checkbox text of the session crashed bubble.
BUG=293702 Review URL: https://codereview.chromium.org/266193013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chromium_strings.grd3
-rw-r--r--chrome/app/generated_resources.grd7
-rw-r--r--chrome/app/google_chrome_strings.grd3
3 files changed, 10 insertions, 3 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index ca46a32..a0041ca 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -289,6 +289,9 @@ name="DOMAIN">$1<ex>paypal.com</ex></ph>&lt;/strong&gt;, but the server presente
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
Chromium didn't shut down correctly. To reopen the pages you had open, click Restore.
</message>
+ <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
+ Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
+ </message>
<!-- Browser Window Title Format -->
<message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows">
<ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 8e94f45..f20f281 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6841,15 +6841,15 @@ Keep your key file in a safe place. You will need it to create new versions of y
<ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> has been disabled. To re-enable it, please go to <ph name="CHROME_PLUGINS_LINK">chrome://plugins</ph>.
</message>
- <!-- Session Crashed Info Bar-->
+ <!-- Session Crashed Info Bar/Bubble-->
<message name="IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON" desc="Title of the restore button in the session crashed view.">
Restore
</message>
<message name="IDS_SESSION_CRASHED_BUBBLE_TITLE" desc="Title of the session crashed bubble view.">
Restore pages?
</message>
- <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
- Help make Google Chrome better by sending crash reports and usage statistics to Google
+ <message name="IDS_SESSION_CRASHED_BUBBLE_UMA_LINK_TEXT" desc="The text attached to the link that explains UMA optin option">
+ usage statistics
</message>
<message name="IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME" desc="Title for the flag to enable showing session restore request in bubbles.">
Enable session restore bubble UI.
@@ -6858,6 +6858,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
If enabled, the session restore UI will be shown in a bubble instead of an info bar.
</message>
+
<!-- Bad Flags Info Bar-->
<message name="IDS_BAD_FLAGS_WARNING_MESSAGE" desc="Message shown when an unsupported command-line flag is used. [Keep it short so it fits in the infobar.]">
You are using an unsupported command-line flag: <ph name="BAD_FLAG">$1<ex>--no-sandbox</ex></ph>. Stability and security will suffer.
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index d31e971..fb48f95 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -212,6 +212,9 @@ name="DOMAIN">$1<ex>paypal.com</ex></ph>&lt;/strong&gt;, but the server presente
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
Google Chrome didn't shut down correctly. To reopen the pages you had open, click Restore.
</message>
+ <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
+ Help make Google Chrome better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
+ </message>
<!-- Browser Window Title Format -->
<message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows">
<ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Google Chrome