From a812ab606dcec3ed4ba79e5abf291e5e9a30a71e Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 1 Jun 2016 07:04:16 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I1b54309e756a9bfd7df18ef208beacaeae0baada
Auto-generated-cl: translation import
---
 InCallUI/res/values-my-rMM/strings.xml | 2 +-
 res/values-km-rKH/strings.xml          | 6 +++---
 res/values-sl/strings.xml              | 2 +-
 res/values-zh-rCN/strings.xml          | 2 +-
 res/values-zh-rTW/strings.xml          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/InCallUI/res/values-my-rMM/strings.xml b/InCallUI/res/values-my-rMM/strings.xml
index 5c128bf32..8e1fb09c3 100644
--- a/InCallUI/res/values-my-rMM/strings.xml
+++ b/InCallUI/res/values-my-rMM/strings.xml
@@ -32,7 +32,7 @@
     <string name="pause_prompt_str" msgid="4507496811727697620">"အသံများ ပို့နေသည်\n"</string>
     <string name="send_button" msgid="4054398309483035794">"ပို့ပါ"</string>
     <string name="pause_prompt_yes" msgid="6738588490007499118">"ဟုတ်ပါသည်"</string>
-    <string name="pause_prompt_no" msgid="417286529736964178">"မလိုပါ"</string>
+    <string name="pause_prompt_no" msgid="417286529736964178">"No"</string>
     <string name="wild_prompt_str" msgid="8178750766679617355">"အစားထိုး အထူးအက္ခရာတွင် အစားထိုးရန်"</string>
     <string name="caller_manage_header" msgid="4036790479287738218">"အစည်းအဝေးခေါ်ဆိုမှု <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="2951965862286532957">"အသံစာနံပါတ်"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 33313a27e..8f8985f34 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -163,7 +163,7 @@
     <string name="migrate_blocked_numbers_dialog_title" msgid="2039363199438872626">"ថ្មី ការ​ទប់ស្កាត់​ដែល​ងាយស្រួល"</string>
     <string name="migrate_blocked_numbers_dialog_message" msgid="5598530398682662860">"ដើម្បីការពារអ្នកឲ្យបានប្រសើរជាងមុន ទូរសព្ទ​ត្រូវធ្វើការផ្លាស់ប្តូររបៀប​​​ដែល​ការ​ទប់ស្កាត់​ដំណើរការ។ លេខដែល​បាន​ទប់ស្កាត់​របស់អ្នក​ឥឡូវ​នឹងបញ្ឈប់​ទាំង​ការហៅ និងការផ្ញើសារ និងអាច​ត្រូវបានចែករំលែកជាមួយកម្មវិធីផ្សេងទៀត។"</string>
     <string name="migrate_blocked_numbers_dialog_allow_button" msgid="3116140286537760629">"អនុញ្ញាត"</string>
-    <string name="block_number_confirmation_title" msgid="6862219558186931304">"រារាំង <xliff:g id="NUMBER">%1$s</xliff:g> ឬ?"</string>
+    <string name="block_number_confirmation_title" msgid="6862219558186931304">"រារាំង <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
     <string name="block_number_confirmation_message_vvm" msgid="5655646611437082611">"ការហៅចេញពីលេខនេះនឹងត្រូវបានរារាំង ហើយសារជាសំឡេងនឹងត្រូវបានលុបដោយស្វ័យប្រវត្តិ។"</string>
     <string name="block_number_confirmation_message_no_vvm" msgid="4511900601491718173">"ការហៅចេញពីលេខនេះនឹងត្រូវបានរារាំង ប៉ុន្តែអ្នកហៅនៅតែអាចទុកសារជាសំឡេងឲ្យអ្នកបាន។"</string>
     <string name="block_number_confirmation_message_new_filtering" msgid="4524854769790960179">"អ្នក​នឹង​លែង​ទទួល​​ការ​ហៅ ឬ​​សារ​​អត្ថបទ​ពី​លេខ​នេះ​ទៀត​ហើយ។"</string>
@@ -271,8 +271,8 @@
     <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"កម្មវិធីទូរស័ព្ទមិនមានសិទ្ធិអនុញ្ញាតដើម្បីសរសេរការកំណត់ប្រព័ន្ធទេ។"</string>
     <string name="blocked_number_call_log_label" msgid="8912042441473014712">"បានរារាំង"</string>
     <string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> គឺសកម្ម"</string>
-    <string name="call_log_action_block_report_number" msgid="8288915197641750257">"ទប់ស្កាត់/រាយការណ៍សារឥតបានការ"</string>
-    <string name="call_log_action_block_number" msgid="5920731882931944594">"ទប់ស្កាត់"</string>
+    <string name="call_log_action_block_report_number" msgid="8288915197641750257">"រារាំង/រាយការណ៍សារដែលមិនចង់បាន"</string>
+    <string name="call_log_action_block_number" msgid="5920731882931944594">"រារាំង"</string>
     <string name="call_log_action_remove_spam" msgid="5750557938714304455">"មិនមែន​សារ​ឥតបានការ"</string>
     <string name="call_log_action_unblock_number" msgid="8906582251480361069">"ឈប់​ទប់ស្កាត់"</string>
     <string name="spam_number_call_log_label" msgid="5601566820155823850">"សារ​ឥតបានការ"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 11edee89b..fbee52f5e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -97,7 +97,7 @@
     <string name="menu_show_voicemails_only" msgid="1898421289561435703">"Pokaži samo spor. glasovne pošte"</string>
     <string name="menu_show_all_calls" msgid="7560347482073345885">"Pokaži vse klice"</string>
     <string name="add_2sec_pause" msgid="9214012315201040129">"Dodaj 2 sekundi premora"</string>
-    <string name="add_wait" msgid="3360818652790319634">"Dodaj premor"</string>
+    <string name="add_wait" msgid="3360818652790319634">"Dodaj čakanje"</string>
     <string name="dialer_settings_label" msgid="4305043242594150479">"Nastavitve"</string>
     <string name="menu_newContact" msgid="1209922412763274638">"Nov stik"</string>
     <string name="menu_allContacts" msgid="6948308384034051670">"Vsi stiki"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ffb5b6d5b..56b6cd413 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -184,7 +184,7 @@
     <string name="search_shortcut_block_number" msgid="4787156645163436072">"屏蔽号码"</string>
     <string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g>个新的未接电话"</string>
     <string name="speed_dial_empty" msgid="8838921693673366129">"尚未给任何联系人设定快速拨号"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="7944893641496695770">"添加常用联系人"</string>
+    <string name="speed_dial_empty_add_favorite_action" msgid="7944893641496695770">"收藏联系人"</string>
     <string name="all_contacts_empty" msgid="471370638298229686">"您还没有任何联系人"</string>
     <string name="all_contacts_empty_add_contact_action" msgid="1515782853819374618">"添加联系人"</string>
     <string name="contact_tooltip" msgid="2019777545923635266">"触摸图片可查看所有号码，触摸并按住可重新排序"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 544500c12..773dd7db6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -174,7 +174,7 @@
     <string name="tab_history" msgid="2563144697322434940">"通話紀錄"</string>
     <string name="tab_all_contacts" msgid="1410922767166533690">"聯絡人"</string>
     <string name="tab_voicemail" msgid="155024725947496746">"語音信箱"</string>
-    <string name="favorite_hidden" msgid="5011234945140912047">"已從最愛的聯絡人移除"</string>
+    <string name="favorite_hidden" msgid="5011234945140912047">"已從常用聯絡人移除"</string>
     <string name="favorite_hidden_undo" msgid="2508998611039406474">"復原"</string>
     <string name="search_shortcut_call_number" msgid="7277194656832895870">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="1679917465521554093">"建立新聯絡人"</string>
-- 
cgit v1.2.3