summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 19:34:46 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 19:34:46 +0000
commit268b8621c2d5999554eb5ff10678c9783afdbec4 (patch)
tree5d4e2b76a5c53644d689dbd0d98624c47df675a2 /chrome/app
parent0fb286e80925052c25e6b915e63b75ba6d4d43ff (diff)
downloadchromium_src-268b8621c2d5999554eb5ff10678c9783afdbec4.zip
chromium_src-268b8621c2d5999554eb5ff10678c9783afdbec4.tar.gz
chromium_src-268b8621c2d5999554eb5ff10678c9783afdbec4.tar.bz2
[Sync UI] Display error on personal options page when sync has an unrecoverable error.
BUG=99250, 94976 TEST=Cause an unrecoverable error. Go to chrome://settings/personal. There should be an error message "Oops, Sync has stopped working" with a learn more link. Review URL: http://codereview.chromium.org/8289024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106103 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 167e397..8d1b7e0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10033,6 +10033,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
setup failed due to an unrecoverable error and can't continue.">
Oops, Sync has stopped working.
</message>
+ <message name="IDS_SYNC_STATUS_UNRECOVERABLE_ERROR" desc="Message shown on the personal options page when there is an unrecoverable error.">
+ Oops, Sync has stopped working. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;</ph>Learn More<ph name="END_LINK">&lt;/a&gt;</ph>
+ </message>
<message name="IDS_SYNC_CONFIGURE_ENCRYPTION" desc="Link to configure sync encryption for passwords">
Please update your sync passphrase.
</message>