diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/drawable-hdpi/sym_keyboard_voice_holo.png | bin | 1300 -> 1889 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png | bin | 1191 -> 1741 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/sym_keyboard_voice_holo.png | bin | 843 -> 1166 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png | bin | 784 -> 1105 bytes | |||
| -rw-r--r-- | java/res/drawable-xhdpi/sym_keyboard_voice_holo.png | bin | 1753 -> 2393 bytes | |||
| -rw-r--r-- | java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png | bin | 1599 -> 2196 bytes | |||
| -rw-r--r-- | java/res/values-en/whitelist.xml | 20 | ||||
| -rw-r--r-- | java/res/values-ko/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sk/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sl/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/values/config.xml | 3 | ||||
| -rw-r--r-- | java/res/values/keypress-volumes.xml | 1 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 18 | ||||
| -rw-r--r-- | java/res/xml/rows_bulgarian_bds.xml | 2 |
14 files changed, 38 insertions, 12 deletions
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png Binary files differindex bc9f908ac..8a6336a57 100644 --- a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png +++ b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png Binary files differindex e852eec70..edf1379ab 100644 --- a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png +++ b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-mdpi/sym_keyboard_voice_holo.png Binary files differindex 960c60823..0795fcc9b 100644 --- a/java/res/drawable-mdpi/sym_keyboard_voice_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_voice_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png Binary files differindex 72086a9dc..f76da5797 100644 --- a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png b/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png Binary files differindex d338cf228..b2bb9b803 100644 --- a/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png +++ b/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png Binary files differindex 0c913e10a..23e75bfe7 100644 --- a/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png +++ b/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml index 79d6adeb2..9c1085883 100644 --- a/java/res/values-en/whitelist.xml +++ b/java/res/values-en/whitelist.xml @@ -170,6 +170,14 @@ <item>believe</item> <item>255</item> + <item>bot</item> + <item>not</item> + + <item>255</item> + <item>bur</item> + <item>but</item> + + <item>255</item> <item>butthe</item> <item>but the</item> @@ -402,6 +410,10 @@ <item>I\'ve</item> <item>255</item> + <item>jot</item> + <item>not</item> + + <item>255</item> <item>lets</item> <item>let\'s</item> @@ -426,6 +438,10 @@ <item>Monday</item> <item>255</item> + <item>mot</item> + <item>not</item> + + <item>255</item> <item>mustnt</item> <item>mustn\'t</item> @@ -760,6 +776,10 @@ <item>y\'all</item> <item>255</item> + <item>yo</item> + <item>to</item> + + <item>255</item> <item>youd</item> <item>you\'d</item> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 3e870492b..298534d76 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -64,7 +64,7 @@ <string name="bigram_suggestion" msgid="8169311444438922902">"다음 추천 검색어"</string> <string name="bigram_suggestion_summary" msgid="6635527607242625713">"이전 단어를 사용하여 추천 검색어 개선"</string> <string name="bigram_prediction" msgid="3216364899483135294">"다음 예상 검색어"</string> - <string name="bigram_prediction_summary" msgid="1747261921174300098">"이전 단어를 사용하여 예상 검색어를 표시합니다."</string> + <string name="bigram_prediction_summary" msgid="1747261921174300098">"이전 단어를 사용하여 예상 검색어 표시"</string> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: 저장됨"</string> <string name="label_go_key" msgid="1635148082137219148">"이동"</string> <string name="label_next_key" msgid="362972844525672568">"다음"</string> diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index c0c8433ef..7c8e2bd8b 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -118,7 +118,7 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Motív klávesnice"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Anglická klávesnica (UK)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Anglická klávesnica (US)"</string> - <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"angličtina (VB) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string> + <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"angličtina (UK) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"angličtina (USA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Žiadny jazyk"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Žiadny jazyk (QWERTY)"</string> diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index 9b5da7566..6d919b2e4 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -118,7 +118,7 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tema tipkovnice"</string> <string name="subtype_en_GB" msgid="88170601942311355">"angleščina (Združeno kraljestvo)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"angleščina (ZDA)"</string> - <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Angleška (VB) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string> + <string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Angleška (Zdr. kralj.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string> <string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Angleška (ZDA) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string> <string name="subtype_no_language" msgid="141420857808801746">"Ni jezika"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ni jezika (QWERTY)"</string> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index a6fd22ee1..21010b3c2 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -23,8 +23,7 @@ <bool name="config_enable_show_voice_key_option">true</bool> <bool name="config_enable_show_popup_on_keypress_option">true</bool> <bool name="config_enable_next_word_suggestions_option">true</bool> - <!-- TODO: Disable the following configuration for production. --> - <bool name="config_enable_usability_study_mode_option">true</bool> + <bool name="config_enable_usability_study_mode_option">false</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">true</bool> <!-- Default value for next word suggestion: while showing suggestions for a word should we weigh diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml index 1bec6a32b..3b433e4ab 100644 --- a/java/res/values/keypress-volumes.xml +++ b/java/res/values/keypress-volumes.xml @@ -23,5 +23,6 @@ <item>herring,0.5</item> <item>tuna,0.5</item> <item>stingray,0.4</item> + <item>grouper,0.3</item> </string-array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index cb458a4ed..8b03379ca 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -275,18 +275,24 @@ <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]--> <string name="custom_input_styles_title">Custom input styles</string> - <!-- Title of the option menu to add a new style entry in the preference settings [CHAR_LIMIT=16] --> + <!-- Title of the option menu to add a new style entry in the preference settings [CHAR LIMIT=16] --> <string name="add_style">Add style</string> - <!-- Title of the button to add custom style entry in the settings dialog [CHAR_LIMIT=12] --> + <!-- Title of the button to add custom style entry in the settings dialog [CHAR LIMIT=12] --> <string name="add">Add</string> - <!-- Title of the button to remove a custom style entry in the settings dialog [CHAR_LIMIT=12] --> + <!-- Title of the button to remove a custom style entry in the settings dialog [CHAR LIMIT=12] --> <string name="remove">Remove</string> - <!-- Title of the button to save a custom style entry in the settings dialog [CHAR_LIMIT=12] --> + <!-- Title of the button to save a custom style entry in the settings dialog [CHAR LIMIT=12] --> <string name="save">Save</string> - <!-- Title of the spinner for choosing a language of custom style in the settings dialog [CHAR_LIMIT=12] --> + <!-- Title of the spinner for choosing a language of custom style in the settings dialog [CHAR LIMIT=12] --> <string name="subtype_locale">Language</string> - <!-- Title of the spinner for choosing a keyboard layout of custom style in the settings dialog [CHAR_LIMIT=12] --> + <!-- Title of the spinner for choosing a keyboard layout of custom style in the settings dialog [CHAR LIMIT=12] --> <string name="keyboard_layout_set">Layout</string> + <!-- The message of the dialog to note that a custom input style needs to be enabled. [CHAR LIMIT=64] --> + <string name="custom_input_style_note_message">"Your custom input style needs to be enabled before you start using it. Do you want to enable it now?"</string> + <!-- Title of the button to enable a custom input style entry in the settings dialog [CHAR LIMIT=12] --> + <string name="enable">Enable</string> + <!-- Title of the button to postpone enabling a custom input style entry in the settings dialog [CHAR LIMIT=12] --> + <string name="not_now">Not now</string> <!-- Title of an option for usability study mode --> <string name="prefs_usability_study_mode">Usability study mode</string> diff --git a/java/res/xml/rows_bulgarian_bds.xml b/java/res/xml/rows_bulgarian_bds.xml index 9a2f0bc44..b4f3f1207 100644 --- a/java/res/xml/rows_bulgarian_bds.xml +++ b/java/res/xml/rows_bulgarian_bds.xml @@ -36,7 +36,7 @@ latin:keyboardLayout="@xml/rowkeys_bulgarian_bds2" /> </Row> <Row - latin:keyWidth="9.091%p" + latin:keyWidth="8.711%p" > <Key latin:keyStyle="shiftKeyStyle" |
