summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-11 01:29:33 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-11 01:29:33 +0000
commit32686a4806cd82fe16e9abbd2cc9ddddd68c20a5 (patch)
tree3dac64fb16b2afd4c3fc616f9dae39e21d8913d3 /chrome/app
parent9334b3123f9fc997493e75e08a96776552bf670f (diff)
downloadchromium_src-32686a4806cd82fe16e9abbd2cc9ddddd68c20a5.zip
chromium_src-32686a4806cd82fe16e9abbd2cc9ddddd68c20a5.tar.gz
chromium_src-32686a4806cd82fe16e9abbd2cc9ddddd68c20a5.tar.bz2
DOMUI: Remove the sync settings overlay.
* Move the sync settings into the Personal Stuff page. * Fix disabling input elements from JS. * Fix handling of boolean prefs in select controls. BUG=59279 TEST=none Review URL: http://codereview.chromium.org/5779001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4498ebd..b6aaaad 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8212,6 +8212,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
Sync
</message>
</if>
+ <message name="IDS_SYNC_OPTIONS_SELECT_DATATYPES" desc="The select ooption that allows the user to select which datatypes to sync.">
+ Choose what to Sync
+ </message>
+ <message name="IDS_SYNC_OPTIONS_SELECT_EVERYTHING" desc="The select option that selects all features to be synced.">
+ Everything
+ </message>
<message name="IDS_SYNC_NOT_SET_UP_INFO" desc="The message that appears in the options dialog when sync has not been set up by the user.">
You are not set up to sync your <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> data with your other computers.
</message>