[automerger skipped] Merge Coral/Flame into AOSP master am: 9f99ce7286 -s ours
am: 1eb0fcaf54 -s ours
am skip reason: change_id I94702cae40999e1af4420435a9a95f737a683c61 with SHA1 451682d0ba is in history
Change-Id: Iede8e40d7391ee239eea800d01072d1faa40842c
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5adf46e..5b17537 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"Nazad"</string>
<string name="service_name" msgid="6860303747999592491">"Ime usluge"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Usluga nije dostupna"</string>
- <string name="button_ok" msgid="5760722312558549555">"Uredu"</string>
+ <string name="button_ok" msgid="5760722312558549555">"UREDU"</string>
<string name="button_cancel" msgid="1997847915560800261">"Otkaži"</string>
<string name="button_yes" msgid="624420260648337203">"Da"</string>
<string name="button_no" msgid="1824959157582605627">"Ne"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 39b75f0..d61ed31 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"Zurück"</string>
<string name="service_name" msgid="6860303747999592491">"Name des Dienstes"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Kein Dienst verfügbar"</string>
- <string name="button_ok" msgid="5760722312558549555">"Ok"</string>
+ <string name="button_ok" msgid="5760722312558549555">"OK"</string>
<string name="button_cancel" msgid="1997847915560800261">"Abbrechen"</string>
<string name="button_yes" msgid="624420260648337203">"\"Ja\""</string>
<string name="button_no" msgid="1824959157582605627">"Nein"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8ace2a1..5b38f4b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"सिम टूलकिट"</string>
- <string name="menu_end_session" msgid="7368541737750982217">"सत्र खत्म करें"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"सत्र समाप्त करें"</string>
<string name="help" msgid="9209980881219397319">"सहायता"</string>
<string name="menu_back" msgid="301227740977453364">"वापस जाएं"</string>
<string name="service_name" msgid="6860303747999592491">"सेवा का नाम"</string>
@@ -30,14 +30,14 @@
<string name="digits" msgid="1746796679021682388">"अंक (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"कॉल चल रही है..."</string>
<string name="default_setup_call_msg" msgid="6126904475461162162">"कॉल सेट हो रहा है"</string>
- <string name="stk_app_state" msgid="18582277302584082">"ऐप्लिकेशन स्थिति"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"ऐप्स स्थिति"</string>
<string name="enable_app" msgid="3701224550936728203">"सक्षम की गई"</string>
<string name="disable_app" msgid="6725081975611415214">"अक्षम की गई"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"सिम टूलकिट"</string>
<string name="default_tone_dialog_msg" msgid="4595366992944391641">"टोन बजाया जा रहा है"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"चैनल खोलें?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"डेटा भेजा जा रहा है"</string>
- <string name="default_receive_data_msg" msgid="618096941772010682">"डेटा मिल रहा है"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"डेटा प्राप्त हो रहा है"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"चैनल बंद हो गया"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"हां"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"नहीं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c468d74..81b4243 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"Alati za SIM"</string>
+ <string name="app_name" msgid="8396461461738434341">"Alatni komplet za SIM"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Završi sesiju"</string>
<string name="help" msgid="9209980881219397319">"Pomoć"</string>
<string name="menu_back" msgid="301227740977453364">"Natrag"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fe06396..9c7c290 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM-kártya eszközkészlete"</string>
+ <string name="app_name" msgid="8396461461738434341">"SIM kártya eszközkészlete"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Munkamenet befejezése"</string>
<string name="help" msgid="9209980881219397319">"Súgó"</string>
<string name="menu_back" msgid="301227740977453364">"Vissza"</string>
@@ -33,7 +33,7 @@
<string name="stk_app_state" msgid="18582277302584082">"Alkalmazás állapota"</string>
<string name="enable_app" msgid="3701224550936728203">"Engedélyezve"</string>
<string name="disable_app" msgid="6725081975611415214">"Letiltva"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"SIM-kártya eszközkészlete"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM kártya eszközkészlete"</string>
<string name="default_tone_dialog_msg" msgid="4595366992944391641">"Playing Tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Megnyitja a csatornát?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Adatok küldése"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index ddb76fa..c030ff5 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
+ <string name="app_name" msgid="8396461461738434341">"SIM аспаптар жинағы"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Сессияны аяқтау"</string>
<string name="help" msgid="9209980881219397319">"Көмек"</string>
<string name="menu_back" msgid="301227740977453364">"Артқа"</string>
@@ -33,7 +33,7 @@
<string name="stk_app_state" msgid="18582277302584082">"Қолданба күйі"</string>
<string name="enable_app" msgid="3701224550936728203">"Қосылған"</string>
<string name="disable_app" msgid="6725081975611415214">"Өшірілген"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"SIM ToolKit"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM аспаптар жинағы"</string>
<string name="default_tone_dialog_msg" msgid="4595366992944391641">"Әуенді ойнату"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Арнаны ашу?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Деректер жіберуде"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ebe14b9..5ed9a87 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"SIM-toolkit"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Sessie beëindigen"</string>
- <string name="help" msgid="9209980881219397319">"Hulp"</string>
+ <string name="help" msgid="9209980881219397319">"Help"</string>
<string name="menu_back" msgid="301227740977453364">"Terug"</string>
<string name="service_name" msgid="6860303747999592491">"Servicenaam"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Geen service beschikbaar"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 0440ce9..01eb52f 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,7 +30,7 @@
<string name="digits" msgid="1746796679021682388">"இலக்கங்கள் (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"அழைப்பில்…"</string>
<string name="default_setup_call_msg" msgid="6126904475461162162">"அழைப்பு அமைக்கப்படுகிறது"</string>
- <string name="stk_app_state" msgid="18582277302584082">"ஆப்ஸ் நிலை"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"பயன்பாட்டு நிலை"</string>
<string name="enable_app" msgid="3701224550936728203">"இயக்கப்பட்டது"</string>
<string name="disable_app" msgid="6725081975611415214">"முடக்கப்பட்டது"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"சிம் கருவிப்பெட்டி"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 6793f15..d9ecefb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,7 +32,7 @@
<string name="default_setup_call_msg" msgid="6126904475461162162">"Qo‘ng‘iroq sozlanmoqda"</string>
<string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
<string name="enable_app" msgid="3701224550936728203">"Yoniq"</string>
- <string name="disable_app" msgid="6725081975611415214">"Yoqilmagan"</string>
+ <string name="disable_app" msgid="6725081975611415214">"O‘chiq"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM menyusi"</string>
<string name="default_tone_dialog_msg" msgid="4595366992944391641">"Signal ijrosi"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1169b6b..59db8c4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM 卡工具包"</string>
+ <string name="app_name" msgid="8396461461738434341">"SIM卡工具包"</string>
<string name="menu_end_session" msgid="7368541737750982217">"结束会话"</string>
<string name="help" msgid="9209980881219397319">"帮助"</string>
<string name="menu_back" msgid="301227740977453364">"返回"</string>
@@ -33,7 +33,7 @@
<string name="stk_app_state" msgid="18582277302584082">"应用状态"</string>
<string name="enable_app" msgid="3701224550936728203">"已启用"</string>
<string name="disable_app" msgid="6725081975611415214">"已停用"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"SIM 卡工具包"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM卡工具包"</string>
<string name="default_tone_dialog_msg" msgid="4595366992944391641">"正在播放音效"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"是否打开通道？"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"正在发送数据"</string>