diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 05:32:35 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 05:32:35 +0000 |
| commit | f51ef0d27f701feb2c47096c9a73039e0c389a60 (patch) | |
| tree | 07b99565f823040e757768e58c67999a3c18f1db /chrome | |
| parent | 00b14a31006540aefa47c31fa37c131e1dfc0af7 (diff) | |
| download | chromium_src-f51ef0d27f701feb2c47096c9a73039e0c389a60.zip chromium_src-f51ef0d27f701feb2c47096c9a73039e0c389a60.tar.gz chromium_src-f51ef0d27f701feb2c47096c9a73039e0c389a60.tar.bz2 | |
Fix two bugs in pinyin config.
1. Remove "display candidates in Traditonal Chinese" config as it's no longer
present in the upstream.
2. Rephrase an incorrect description "Use Shift key to select a candidate"
per suggestion from penghuang.
BUG=chromium-os:4856,chromium-os:4685
TEST=manually
Review URL: http://codereview.chromium.org/3145023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.h | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/options/chromeos_language_pinyin_options.html | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6356f71..23f3106 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8286,7 +8286,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_SHIFT_SELECT_PINYIN" desc="The checkbox label for a Pinyin input method preference"> - Use Shift to select a candidate + Use left and right Shift keys to select 2nd and 3rd candidates </message> <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_MINUS_EQUAL_PAGE" desc="The checkbox label for a Pinyin input method preference"> @@ -8320,10 +8320,6 @@ Keep your key file in a safe place. You will need it to create new versions of y desc="The checkbox label for a Pinyin input method preference"> Initial Chinese mode is Simplified Chinese </message> - <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_TRAD_CANDIDATE" - desc="The checkbox label for a Pinyin input method preference"> - Display candidates in Traditional Chinese - </message> <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA" desc="The combobox description for the double Pinyin schema"> diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h index 2609d94..66061dd 100644 --- a/chrome/browser/chromeos/language_preferences.h +++ b/chrome/browser/chromeos/language_preferences.h @@ -233,8 +233,6 @@ const LanguageBooleanPrefs kPinyinBooleanPrefs[] = { IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL_PUNCT }, { prefs::kLanguagePinyinInitSimplifiedChinese, true, "InitSimplifiedChinese", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_SIMPLIFIED_CHINESE }, - { prefs::kLanguagePinyinTradCandidate, false, "TradCandidate", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_TRAD_CANDIDATE }, // TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32 // additional boolean prefs.) }; diff --git a/chrome/browser/resources/options/chromeos_language_pinyin_options.html b/chrome/browser/resources/options/chromeos_language_pinyin_options.html index a83d49b..78da080 100644 --- a/chrome/browser/resources/options/chromeos_language_pinyin_options.html +++ b/chrome/browser/resources/options/chromeos_language_pinyin_options.html @@ -91,14 +91,6 @@ </td> </tr> <tr> - <td class="option-name" colspan="2"><label><input - id="pinyin-trad-candidate" - pref="settings.language.pinyin_trad_candidate" - type="checkbox"> - <span i18n-content="TradCandidateContent"></span></label> - </td> - </tr> - <tr> <td class="option-name" i18n-content="DoublePinyinSchemaContent"></td> <td class="option-value"> <select id="pinyin-double-pinyin-schema" class="control" |