merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 40656d1..9081f03 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -30,7 +30,7 @@
<string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Verificatorul ortografic utilizează intrări din lista de contacte"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrare la apăsarea tastei"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sunet la apăsarea tastei"</string>
- <string name="popup_on_keypress" msgid="123894815723512944">"Fereastră pop-up la apăsarea tastei"</string>
+ <string name="popup_on_keypress" msgid="123894815723512944">"Pop-up la apăsarea tastei"</string>
<string name="general_category" msgid="1859088467017573195">"General"</string>
<string name="correction_category" msgid="2236750915056607613">"Corectare text"</string>
<string name="gesture_typing_category" msgid="497263612130532630">"Tastare gestuală"</string>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index 2560fc7..6f8add7 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -27,10 +27,10 @@
<string name="english_ime_input_options" msgid="3909945612939668554">"Mga pagpipilian sa input"</string>
<string name="english_ime_research_log" msgid="8492602295696577851">"Cmmnd sa Log ng Pnnliksik"</string>
<string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Maghanap pangalan contact"</string>
- <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Gumagamit pang-check pagbabaybay entry sa iyong listahan contact"</string>
+ <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Gumagamit ang Spell Checker ng entries mula sa iyong contact list."</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Mag-vibrate sa keypress"</string>
- <string name="sound_on_keypress" msgid="6093592297198243644">"Tunog sa keypress"</string>
- <string name="popup_on_keypress" msgid="123894815723512944">"Popup sa keypress"</string>
+ <string name="sound_on_keypress" msgid="6093592297198243644">"Tumunog sa keypress"</string>
+ <string name="popup_on_keypress" msgid="123894815723512944">"Mag-popup sa keypress"</string>
<string name="general_category" msgid="1859088467017573195">"Pangkalahatan"</string>
<string name="correction_category" msgid="2236750915056607613">"Pagwawasto ng teksto"</string>
<string name="gesture_typing_category" msgid="497263612130532630">"Gesture na pag-type"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index d06557e..75b589d 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -75,7 +75,7 @@
<string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"在滑行输入过程中显示建议字词"</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>
+ <string name="label_next_key" msgid="362972844525672568">"下个"</string>
<string name="label_previous_key" msgid="1211868118071386787">"后退"</string>
<string name="label_done_key" msgid="2441578748772529288">"完成"</string>
<string name="label_send_key" msgid="2815056534433717444">"发送"</string>
