Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Stk into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

5 files changed, 6 insertions, 8 deletions

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index a691961..7796b37 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -29,7 +29,6 @@
     <string name="alphabet" msgid="1583185545938805861">"Əlifbalar"</string>
     <string name="digits" msgid="1746796679021682388">"Rəqəmlər (0-9, *, #, +)"</string>
     <string name="default_call_setup_msg" msgid="7960194995759849940">"Zəng davam edir..."</string>
-    <string name="default_setup_call_msg" msgid="6126904475461162162">"Zəng quraşdırılır"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Tətbiq vəziyyəti"</string>
     <string name="enable_app" msgid="3701224550936728203">"Aktivləşdirilib"</string>
     <string name="disable_app" msgid="6725081975611415214">"Deaktiv"</string>
@@ -40,5 +39,4 @@
     <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal Bağlıdır"</string>
     <string name="stk_dialog_accept" msgid="8498901537508923727">"BƏLİ"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"XEYR"</string>
-    <string name="no_sim_card_inserted" msgid="5316620398365235988">"SİM Alət-panelini başlatmaq üçün SİM taxın."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index eca4563..17df7fb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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-nb/strings.xml b/res/values-nb/strings.xml
index e4a7488..b1c9dbc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -32,7 +32,7 @@
     <string name="default_setup_call_msg" msgid="6126904475461162162">"Samtalen settes opp"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Applikasjonstilstand"</string>
     <string name="enable_app" msgid="3701224550936728203">"Aktivert"</string>
-    <string name="disable_app" msgid="6725081975611415214">"Slått av"</string>
+    <string name="disable_app" msgid="6725081975611415214">"Deaktivert"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"Verktøykasse for SIM-kort"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Åpen kanal?"</string>
     <string name="default_send_data_msg" msgid="6011219698689931272">"Sending av data"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index c7f3843..71846a2 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -22,7 +22,7 @@
     <string name="menu_back" msgid="301227740977453364">"Prapa"</string>
     <string name="service_name" msgid="6860303747999592491">"Emri i shërbimit"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"Nuk ofrohet asnjë shërbim"</string>
-    <string name="button_ok" msgid="5760722312558549555">"Në rregull"</string>
+    <string name="button_ok" msgid="5760722312558549555">"Në rregull!"</string>
     <string name="button_cancel" msgid="1997847915560800261">"Anulo"</string>
     <string name="button_yes" msgid="624420260648337203">"Po"</string>
     <string name="button_no" msgid="1824959157582605627">"Jo"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index e00596b..5add38d 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -31,8 +31,8 @@
     <string name="default_call_setup_msg" msgid="7960194995759849940">"Qo‘ng‘iroq amalda…"</string>
     <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">"O‘chiq"</string>
+    <string name="enable_app" msgid="3701224550936728203">"Yoqilgan"</string>
+    <string name="disable_app" msgid="6725081975611415214">"O‘chirilgan"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"SIM vositalar majmuasi"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
     <string name="default_send_data_msg" msgid="6011219698689931272">"Ma’lumot yuborilmoqda"</string>
@@ -40,5 +40,5 @@
     <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal yopilgan"</string>
     <string name="stk_dialog_accept" msgid="8498901537508923727">"Ha"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"Yo‘q"</string>
-    <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM-karta menyusini ochish uchun SIM-kartani soling."</string>
+    <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM karta menyusini ochish uchun SIM kartani soling."</string>
 </resources>