summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorscr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-22 09:27:39 +0000
committerscr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-22 09:27:39 +0000
commit003be3bd3b14f46d286fdab90add740d4b9de5b0 (patch)
tree00a32933b10ab91f3aad85ae92a8fae997897e64 /chrome/app
parentdad10c308a7055c51030da99659c6d22f5475c56 (diff)
downloadchromium_src-003be3bd3b14f46d286fdab90add740d4b9de5b0.zip
chromium_src-003be3bd3b14f46d286fdab90add740d4b9de5b0.tar.gz
chromium_src-003be3bd3b14f46d286fdab90add740d4b9de5b0.tar.bz2
Modify settings page text when syncing.
- Created new strings for syncing with and without profile. - Altered sync service observation to check service's StatusSummary for SYNCING. - use innerHTML to allow links in the status string. BUG=80892 R=jhawkins@chromium.org TEST=set up sync, view chrome://settings/personal, change, add, or delete a bookmark - see syncing briefly, then back to synced. Review URL: http://codereview.chromium.org/6961014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 997b43f..69c48dc 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8749,6 +8749,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
<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>
+ <message name="IDS_SYNC_ACCOUNT_SYNCING_TO_USER" desc="The message that appears in the options dialog indicating that account is syncing to a user with the given email address.">
+ Last synced to <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>.
+ Manage sync data on <ph name="BEGIN_LINK">&lt;a href="$2"&gt;</ph>Google Dashboard<ph name="END_LINK">&lt;/a&gt;</ph>
+ </message>
<message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials.">
Account sign-in details are not yet entered.
</message>