aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2012-05-31 15:50:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-31 15:50:27 -0700
commit80f9931af15aebc7be6a6d2e326ce16631c6bb2a (patch)
treeb71217c559be3ec7b9afafb1dd30a052fc67449a /java
parent4f44181acdedf1541169b67eecc5099fee5ea2ba (diff)
parent59949559021198f3ce064a1334a46a3a313029cb (diff)
downloadlatinime-80f9931af15aebc7be6a6d2e326ce16631c6bb2a.tar.gz
latinime-80f9931af15aebc7be6a6d2e326ce16631c6bb2a.tar.xz
latinime-80f9931af15aebc7be6a6d2e326ce16631c6bb2a.zip
Merge "Import translations. DO NOT MERGE"
Diffstat (limited to 'java')
-rw-r--r--java/res/values-ru/strings.xml2
-rw-r--r--java/res/values-zh-rCN/strings.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index ad1f1410c..1eacb44d8 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -121,7 +121,7 @@
<string name="subtype_with_layout_en_GB" msgid="2179097748724725906">"Английская (Великобр.) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
<string name="subtype_with_layout_en_US" msgid="1362581347576714579">"Английская (США) (<xliff:g id="LAYOUT">%s</xliff:g>)"</string>
<string name="subtype_no_language" msgid="141420857808801746">"Язык не указан"</string>
- <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Язык не указан (QWERTY)"</string>
+ <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"QWERTY-клавиатура"</string>
<string name="subtype_no_language_qwertz" msgid="1177848172397202890">"Язык не задан (QWERTZ)"</string>
<string name="subtype_no_language_azerty" msgid="8721460968141187394">"Язык не задан (AZERTY)"</string>
<string name="subtype_no_language_dvorak" msgid="3122976737669823935">"Язык не задан (Dvorak)"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index 06728cc05..c1479b634 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -134,10 +134,10 @@
<string name="save" msgid="7646738597196767214">"保存"</string>
<string name="subtype_locale" msgid="8576443440738143764">"语言"</string>
<string name="keyboard_layout_set" msgid="4309233698194565609">"布局"</string>
- <string name="custom_input_style_note_message" msgid="8826731320846363423">"您需要先启用自定义输入样式,然后才能开始使用。要立即启用该样式吗?"</string>
+ <string name="custom_input_style_note_message" msgid="8826731320846363423">"您需要先启用自定义输入风格,然后才能开始使用。要立即启用该风格吗?"</string>
<string name="enable" msgid="5031294444630523247">"启用"</string>
<string name="not_now" msgid="6172462888202790482">"以后再说"</string>
- <string name="custom_input_style_already_exists" msgid="8008728952215449707">"已经存在相同的输入样式:<xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+ <string name="custom_input_style_already_exists" msgid="8008728952215449707">"已经存在相同的输入风格:<xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"可用性研究模式"</string>
<string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"按键振动持续时间设置"</string>
<string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"按键音量设置"</string>