diff options
| author |   satok <satok@google.com> | 2010-07-01 05:11:23 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-07-01 05:11:23 +0900 |
| commit | 9d2e059f835e7d845c3bbbe473f388b878e44fd2 (patch) | |
| tree | 8b4d0251ccc0431770a28ed4871572cdabb9faeb /java/res | |
| parent | 67607ea8b12a149f95a5d74b94ff550eac4bd0ff (diff) | |
| parent | 57691a35743e3705abe60db4902f9ad3c0e722d8 (diff) | |
| download | latinime-9d2e059f835e7d845c3bbbe473f388b878e44fd2.tar.gz latinime-9d2e059f835e7d845c3bbbe473f388b878e44fd2.tar.xz latinime-9d2e059f835e7d845c3bbbe473f388b878e44fd2.zip | |
Merge commit 'goog/master'
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-ko/strings.xml | 4 | ||||
| -rwxr-xr-x | java/res/xml-ru/kbd_qwerty.xml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index fbfdd4cd2..414a149bb 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -23,7 +23,7 @@ <string name="english_ime_name" msgid="7252517407088836577">"Android 키보드 2"</string> <string name="english_ime_settings" msgid="6661589557206947774">"Android 키보드 2 설정"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"키를 누를 때 진동 발생"</string> - <string name="sound_on_keypress" msgid="6093592297198243644">"버튼을 누를 때 소리 발생"</string> + <string name="sound_on_keypress" msgid="6093592297198243644">"키를 누를 때 소리 발생"</string> <string name="hit_correction" msgid="4855351009261318389">"입력 오류 수정"</string> <string name="hit_correction_summary" msgid="8761701873008070796">"입력 오류 수정 사용"</string> <string name="hit_correction_land" msgid="2567691684825205448">"가로 입력 오류"</string> @@ -87,7 +87,7 @@ <string name="voice_warning_may_not_understand" msgid="4611518823070986445">"음성 입력은 Google의 네트워크화된 음성 인식을 사용하는 실험적 기능입니다."</string> <string name="voice_warning_how_to_turn_off" msgid="5652369578498701761">"음성 입력을 사용하지 않으려면 키보드 설정으로 이동하세요."</string> <string name="voice_hint_dialog_message" msgid="6892342981545727994">"음성 입력을 사용하려면 마이크 버튼을 누르거나 터치 키보드 위로 손가락을 미끄러지듯 움직이세요."</string> - <string name="voice_listening" msgid="467518160751321844">"지금 시작하세요."</string> + <string name="voice_listening" msgid="467518160751321844">"지금 말하세요."</string> <string name="voice_working" msgid="6666937792815731889">"인식 중"</string> <!-- no translation found for voice_initializing (661962047129906646) --> <skip /> diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index cbb518f24..9773a305f 100755 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -70,7 +70,9 @@ <Key android:keyLabel="м"/> <Key android:keyLabel="и"/> <Key android:keyLabel="т"/> - <Key android:keyLabel="ь"/> + <Key android:keyLabel="ь" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="ъ" /> <Key android:keyLabel="б"/> <Key android:keyLabel="ю"/> <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" |