diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
| commit | 2627431bef905332e55a90960aed8049b681689f (patch) | |
| tree | 4d15c42eb95a48241e2bc9a109bbb77c3eafad00 /chrome/app | |
| parent | d328413b739ed1150369743a64cacfb167086a32 (diff) | |
| download | chromium_src-2627431bef905332e55a90960aed8049b681689f.zip chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.gz chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.bz2 | |
Lands http://codereview.chromium.org/193032 for Charlie:
First pass at adding ChromeOS settings
- a mock wifi selector combobox
- touchpad settings that makes calls to synclient
- on startup, touchpad settings are initialized to what's stored in
preferences
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/203073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index fe464c4..bb6ed9e 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5031,6 +5031,25 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> + <!-- Chrome OS Strings --> + <if expr="pp_ifdef('chromeos')"> + <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_NETWORK"> + Network + </message> + <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_TOUCHPAD"> + Touchpad + </message> + <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_PASSWORD"> + Network Password + </message> + <message name="IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION" desc="In the settings tab, the text next to the checkbox that enables tap-to-click."> + Enable tap-to-click + </message> + <message name="IDS_OPTIONS_SETTINGS_VERT_EDGE_SCROLL_ENABLED_DESCRIPTION" desc="In the settings tab, the text next to the checkbox that enables vertical edge scrolling."> + Enable vertical edge scrolling + </message> + </if> + </messages> </release> </grit> |