diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/resources/options/chromeos_language_options.html | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/resources/options/chromeos_language_options.html')
| -rw-r--r-- | chrome/browser/resources/options/chromeos_language_options.html | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/chrome/browser/resources/options/chromeos_language_options.html b/chrome/browser/resources/options/chromeos_language_options.html index 7d8ef82..844b05d 100644 --- a/chrome/browser/resources/options/chromeos_language_options.html +++ b/chrome/browser/resources/options/chromeos_language_options.html @@ -2,36 +2,44 @@ <div class="page hidden" id="languagePage"> <h1 i18n-content="languagePage"></h1> + <div id="notification"> + <span> </span> + <span class="link"><span class="link-color"></span></span> + </div> + <div class="language-options-header"> + <div i18n-content="add_language_instructions"></div> + <div i18n-content="input_method_instructions"></div> + </div> <div class="language-options"> <div class="language-options-left"> <h3 i18n-content="languages"></h3> - <list id="language-options-list"> - <!-- TODO: The contents should be dynamically changed. --> - <li>English (United States)</li> - <li>Spanish</li> - <li>French</li> - <li>Japanese</li> - </list> + <list id="language-options-list"></list> <div class="language-options-lower-left"> - <button id="add-button" i18n-content="add_button"></button> - <button id="remove-button" i18n-content="remove_button"></button> + <button id="language-options-add-button" + i18n-content="add_button"></button> + <button id="language-options-remove-button" + i18n-content="remove_button"></button> </div> </div> <div class="language-options-right"> - <!-- TODO: The contents should be dynamically changed. --> - <h3>English (United States)</h3> + <h3 id="language-options-language-name"></h3> <div class="language-options-contents"> - <button id="ui-language-button" - i18n-content="display_in_this_language"></button> + <button id="language-options-ui-language-button"></button> + </div> + <div id="language-options-ui-notification-bar" + class="language-options-notification"> + <div i18n-content="restart_required"></div> + <button id="language-options-ui-restart-button" + i18n-content="restart_button"></button> </div> <h3 i18n-content="input_method"></h3> - <div class="language-options-contents"> - <!-- TODO: The contents should be dynamically changed. --> - <label><input type="checkbox">US English</label> - <label><input type="checkbox">Dvorak</label> - <label><input type="checkbox">Dvorak - Left</label> - <label><input type="checkbox">Dvorak - Right</label> + <div id="language-options-input-method-list" + class="language-options-contents"> </div> </div> </div> + <div class="language-options-footer"> + <div i18n-content="switch_input_methods_hint"></div> + <div i18n-content="select_previous_input_method_hint"></div> + </div> </div> |