diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:34:06 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:34:06 +0000 |
| commit | aec33934567035c88d248b626cd136bed36b7075 (patch) | |
| tree | 6543c1773b79f3bcb365f03db2960c63c3af06b3 | |
| parent | 0d019fe525558feff21f3188703a750c7d7443e3 (diff) | |
| parent | 894b7204ea7021941a57d29c1d5deb4b4a1fbc91 (diff) | |
| download | android_packages_apps_Stk-aec33934567035c88d248b626cd136bed36b7075.tar.gz android_packages_apps_Stk-aec33934567035c88d248b626cd136bed36b7075.tar.bz2 android_packages_apps_Stk-aec33934567035c88d248b626cd136bed36b7075.zip | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
src/com/android/stk/StkAppService.java
Change-Id: I4e27eed9b5a99a7d09de58cba519f0e2ca940001
| -rw-r--r-- | res/values-fa/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-uz-rUZ/strings.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 17df7fb..eca4563 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-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 952bd41..e00596b 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">"Yoqilgan"</string> - <string name="disable_app" msgid="6725081975611415214">"O‘chirilgan"</string> + <string name="enable_app" msgid="3701224550936728203">"Yoniq"</string> + <string name="disable_app" msgid="6725081975611415214">"O‘chiq"</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> |