diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:54:25 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:54:25 +0000 |
| commit | a47eeb53aefd86ed2f4f9864bdd7a5da6cca668a (patch) | |
| tree | 78392c06916e514258d76e103e4b189700eb5ab6 /chrome/app | |
| parent | 64268ce6b86e7f46dba3313c93e823e544528666 (diff) | |
| download | chromium_src-a47eeb53aefd86ed2f4f9864bdd7a5da6cca668a.zip chromium_src-a47eeb53aefd86ed2f4f9864bdd7a5da6cca668a.tar.gz chromium_src-a47eeb53aefd86ed2f4f9864bdd7a5da6cca668a.tar.bz2 | |
Add support for the "clear pending" server / storage backend state.
BUG=46807
TEST=SyncerThreadWithSyncerTest, SyncSetupWizardTest, SyncerProtoUtilTest
Review URL: http://codereview.chromium.org/2976011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ea31152..6322e68 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6846,6 +6846,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an unspecified but unrecoverable error occurs during sync setup."> An error occurred while trying to set up sync. </message> + <message name="IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR" desc="The error message displayed to the user when setup was aborted because the server reported that a pending clear private data operation is in progress"> + The sync server is busy, please try again later. + </message> <message name="IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME" desc="The message that appears in the options dialog indicating that account is synced to a user with the given email address. The last sync also appears in the message."> Synced to <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Last synced: <ph name="LAST_SYNC_TIME">$2<ex>12 seconds ago</ex></ph> </message> |