[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a47dc67c66

Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/16938771

Change-Id: I24ce5d28bf9423dd3b3c8509cc597ee0b2223a4a
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d56f319..bf39f18 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -615,7 +615,7 @@
     <string name="ota_title_activate" msgid="4049645324841263423">"Aktivirajte telefon"</string>
     <string name="ota_touch_activate" msgid="838764494319694754">"Potrebno je da uputite poseban poziv da biste aktivirali uslugu svoj telefona. \n\nNakon što pritisnete dugme „Aktiviraj“, slušajte data uputstva da biste da biste aktivirali svoj telefon."</string>
     <string name="ota_hfa_activation_title" msgid="3300556778212729671">"Aktiviranje..."</string>
-    <string name="ota_hfa_activation_dialog_message" msgid="7921718445773342996">"Telefon aktivira uslugu mobilnih podataka.\n\nTo može da potraje i do 5 minuta."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="7921718445773342996">"Telefon aktivira uslugu mobilnog prenosa podataka.\n\nTo može da potraje i do 5 minuta."</string>
     <string name="ota_skip_activation_dialog_title" msgid="7666611236789203797">"Želite li da preskočite aktivaciju?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="6691722887019708713">"Ako preskočite aktivaciju, ne možete da upućujete pozive ili da se povezujete sa mrežama za mobilni prenos podataka (iako možete da se povežete sa WiFi mrežama). Sve dok ne aktivirate svoj telefon, bićete upitani da to učinite svaki put kada ga uključite."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="5908029466817825633">"Preskoči"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7e62fee..6d65ce7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -44,10 +44,10 @@
     <string name="pause_prompt_yes" msgid="8184132073048369575">"はい"</string>
     <string name="pause_prompt_no" msgid="2145264674774138579">"いいえ"</string>
     <string name="wild_prompt_str" msgid="5858910969703305375">"ワイルド文字を置換:"</string>
-    <string name="no_vm_number" msgid="6623853880546176930">"留守番電話の番号がありません"</string>
-    <string name="no_vm_number_msg" msgid="5165161462411372504">"SIMカードに留守番電話の番号がありません。"</string>
+    <string name="no_vm_number" msgid="6623853880546176930">"ボイスメール番号がありません"</string>
+    <string name="no_vm_number_msg" msgid="5165161462411372504">"SIMカードにボイスメールの番号がありません。"</string>
     <string name="add_vm_number_str" msgid="7368168964435881637">"番号を追加"</string>
-    <string name="voice_number_setting_primary_user_only" msgid="3394706575741912843">"留守番電話の設定を変更できるのはメインユーザーのみに限られています。"</string>
+    <string name="voice_number_setting_primary_user_only" msgid="3394706575741912843">"ボイスメール設定を変更できるのはメインユーザーのみに限られています。"</string>
     <string name="puk_unlocked" msgid="4627340655215746511">"SIMカードロックを解除しました。デバイスのロックを解除しています..."</string>
     <string name="label_ndp" msgid="7617392683877410341">"SIM のネットワーク ロック解除 PIN"</string>
     <string name="label_phoneid" msgid="8775611434123577808">"携帯通信会社の SIM ロックがかかっています"</string>
@@ -77,8 +77,8 @@
     <string name="phone_accounts_all_calling_accounts_summary" msgid="2214134955430107240">"通話できるアカウントを選択"</string>
     <string name="wifi_calling" msgid="3650509202851355742">"Wi-Fi 通話"</string>
     <string name="connection_service_default_label" msgid="7332739049855715584">"組み込みの接続サービス"</string>
-    <string name="voicemail" msgid="7697769412804195032">"留守番電話"</string>
-    <string name="voicemail_settings_with_label" msgid="4228431668214894138">"留守番電話(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail" msgid="7697769412804195032">"ボイスメール"</string>
+    <string name="voicemail_settings_with_label" msgid="4228431668214894138">"ボイスメール(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="7746778673131551185">"VM:"</string>
     <string name="make_and_receive_calls" msgid="4868913166494621109">"通話の発着と着信"</string>
     <string name="smart_forwarding_settings_menu" msgid="8850429887958938540">"スマート転送"</string>
@@ -155,12 +155,12 @@
     <item msgid="6813323051965618926">"番号を非通知"</item>
     <item msgid="9150034130629852635">"番号を通知"</item>
   </string-array>
-    <string name="vm_changed" msgid="4739599044379692505">"留守番電話の番号が変更されました。"</string>
+    <string name="vm_changed" msgid="4739599044379692505">"ボイスメールの番号が変更されました。"</string>
     <string name="vm_change_failed" msgid="7877733929455763566">"ボイスメール番号を変更できませんでした。\nこの問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
     <string name="fw_change_failed" msgid="9179241823460192148">"転送番号を変更できませんでした。\nこの問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
     <string name="fw_get_in_vm_failed" msgid="2432678237218183844">"現在の転送先番号設定の取得と保存ができませんでした。\nかまわず新しい携帯通信会社に切り替えますか?"</string>
     <string name="no_change" msgid="3737264882821031892">"変更されていません。"</string>
-    <string name="sum_voicemail_choose_provider" msgid="6750824719081403773">"留守番電話サービスを選択"</string>
+    <string name="sum_voicemail_choose_provider" msgid="6750824719081403773">"ボイスメールサービスを選択"</string>
     <string name="voicemail_default" msgid="6427575113775462077">"携帯通信会社"</string>
     <string name="vm_change_pin_old_pin" msgid="7154951790929009241">"古い PIN"</string>
     <string name="vm_change_pin_new_pin" msgid="2656200418481288069">"新しい PIN"</string>
@@ -519,7 +519,7 @@
     <string name="pin2_unblocked" msgid="4481107908727789303">"PIN2はブロックされなくなりました"</string>
     <string name="pin2_error_exception" msgid="8116103864600823641">"ネットワークまたはSIMカードのエラー"</string>
     <string name="doneButton" msgid="7371209609238460207">"完了"</string>
-    <string name="voicemail_settings_number_label" msgid="1265118640154688162">"留守番電話の番号"</string>
+    <string name="voicemail_settings_number_label" msgid="1265118640154688162">"ボイスメールの番号"</string>
     <string name="card_title_dialing" msgid="8742182654254431781">"発信中"</string>
     <string name="card_title_redialing" msgid="18130232613559964">"リダイヤル中"</string>
     <string name="card_title_conf_call" msgid="901197309274457427">"グループ通話"</string>
@@ -528,10 +528,10 @@
     <string name="card_title_on_hold" msgid="9028319436626975207">"保留中"</string>
     <string name="card_title_hanging_up" msgid="814874106866647871">"通話終了"</string>
     <string name="card_title_in_call" msgid="8231896539567594265">"着信"</string>
-    <string name="notification_voicemail_title" msgid="3932876181831601351">"新しい留守番電話"</string>
-    <string name="notification_voicemail_title_count" msgid="2806950319222327082">"新しい留守番電話(<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_title" msgid="3932876181831601351">"新しいボイスメール"</string>
+    <string name="notification_voicemail_title_count" msgid="2806950319222327082">"新しいボイスメール(<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="5720947141702312537">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>にダイヤル"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="3423686009815186750">"留守番電話の番号が不明です"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="3423686009815186750">"ボイスメールの番号が不明です"</string>
     <string name="notification_network_selection_title" msgid="255595526707809121">"通信サービスなし"</string>
     <string name="notification_network_selection_text" msgid="553288408722427659">"選択したネットワーク(<xliff:g id="OPERATOR_NAME">%s</xliff:g>)は利用できません"</string>
     <string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"通話を発信するには、モバイル ネットワークを ON にし、機内モードまたはバッテリー セーバー モードを OFF にしてください。"</string>
@@ -668,7 +668,7 @@
     <string name="description_dial_button" msgid="8614631902795087259">"発信"</string>
     <string name="description_dialpad_button" msgid="7395114120463883623">"ダイヤルパッドを表示"</string>
     <string name="pane_title_emergency_dialpad" msgid="3627372514638694401">"緊急通報ダイヤルパッド"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="6610414098912832120">"ビジュアル留守番電話"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="6610414098912832120">"ビジュアルボイスメール"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="7005128605986960003">"PIN の設定"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="4633077715231764435">"PIN の変更"</string>
     <string name="preference_category_ringtone" msgid="8787281191375434976">"着信音とバイブレーション"</string>
@@ -693,17 +693,17 @@
     <string name="callFailed_low_battery" msgid="4056828320214416182">"電池残量が低下したため、ビデオハングアウトが終了しました。"</string>
     <string name="callFailed_emergency_call_over_wfc_not_available" msgid="5944309590693432042">"この場所では Wi-Fi 通話による緊急通報はご利用いただけません。"</string>
     <string name="callFailed_wfc_service_not_available_in_this_location" msgid="3624536608369524988">"この場所では Wi-Fi 通話はご利用いただけません。"</string>
-    <string name="change_pin_title" msgid="3564254326626797321">"留守番電話 PIN の変更"</string>
+    <string name="change_pin_title" msgid="3564254326626797321">"ボイスメール PIN の変更"</string>
     <string name="change_pin_continue_label" msgid="5177011752453506371">"続行"</string>
     <string name="change_pin_cancel_label" msgid="2301711566758827936">"キャンセル"</string>
     <string name="change_pin_ok_label" msgid="6861082678817785330">"OK"</string>
     <string name="change_pin_enter_old_pin_header" msgid="853151335217594829">"古い PIN の確認"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="8801292976275169367">"続行するには留守番電話 PIN を入力してください。"</string>
+    <string name="change_pin_enter_old_pin_hint" msgid="8801292976275169367">"続行するにはボイスメール PIN を入力してください。"</string>
     <string name="change_pin_enter_new_pin_header" msgid="4739465616733486118">"新しい PIN の設定"</string>
     <string name="change_pin_enter_new_pin_hint" msgid="2326038476516364210">"PIN は <xliff:g id="MIN">%1$d</xliff:g>~<xliff:g id="MAX">%2$d</xliff:g> 桁にしてください。"</string>
     <string name="change_pin_confirm_pin_header" msgid="2606303906320705726">"PIN の確認"</string>
     <string name="change_pin_confirm_pins_dont_match" msgid="305164501222587215">"PIN が一致しません"</string>
-    <string name="change_pin_succeeded" msgid="2504705600693014403">"留守番電話 PIN を更新しました"</string>
+    <string name="change_pin_succeeded" msgid="2504705600693014403">"ボイスメール PIN を更新しました"</string>
     <string name="change_pin_system_error" msgid="7772788809875146873">"PIN を設定できません"</string>
     <string name="mobile_data_status_roaming_turned_off_subtext" msgid="6840673347416227054">"データ ローミングが OFF になっています"</string>
     <string name="mobile_data_status_roaming_turned_on_subtext" msgid="5615757897768777865">"データ ローミングが ON になっています"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 1420182..c4ea6fa 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -341,7 +341,7 @@
     <string name="general_news_settings" msgid="2670499575962080411">"Жалпы жаңылыктар"</string>
     <string name="bf_news_settings" msgid="8571709425370794221">"Ишкердик жана каржы жаңылыктары"</string>
     <string name="sports_news_settings" msgid="2684364556989168438">"Спорт жаңылыктары"</string>
-    <string name="entertainment_news_settings" msgid="4228527702346305543">"Көңүл ачуу жаатындагы жаңылыктар"</string>
+    <string name="entertainment_news_settings" msgid="4228527702346305543">"Көңүл ачуу жаңылыктары"</string>
     <string name="enable_disable_local" msgid="7654175079979415572">"Жергиликтүү"</string>
     <string name="local_enable" msgid="790606890868710629">"Жергиликтүү жаңылыктар иштетилген"</string>
     <string name="local_disable" msgid="7649945293198602877">"Жергиликтүү жаңылыктар өчүрүлгөн"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b1b1a2f..4e639eb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -86,11 +86,11 @@
     <string name="voicemail_notifications_preference_title" msgid="7829238858063382977">"Notificações"</string>
     <string name="cell_broadcast_settings" msgid="8135324242541809924">"Transmissões de emergência"</string>
     <string name="call_settings" msgid="3677282690157603818">"Configurações de chamadas"</string>
-    <string name="additional_gsm_call_settings" msgid="1561980168685658846">"Configurações avançadas"</string>
-    <string name="additional_gsm_call_settings_with_label" msgid="7973920539979524908">"Configurações avançadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="sum_gsm_call_settings" msgid="7964692601608878138">"Configurações avançadas somente de chamada GSM"</string>
+    <string name="additional_gsm_call_settings" msgid="1561980168685658846">"Configurações adicionais"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="7973920539979524908">"Configurações adicionais (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="sum_gsm_call_settings" msgid="7964692601608878138">"Configurações adicionais somente de chamada GSM"</string>
     <string name="additional_cdma_call_settings" msgid="2178016561980611304">"Configurações de chamada CDMA adicionais"</string>
-    <string name="sum_cdma_call_settings" msgid="3185825305136993636">"Configurações avançadas somente de chamada CDMA"</string>
+    <string name="sum_cdma_call_settings" msgid="3185825305136993636">"Configurações adicionais somente de chamada CDMA"</string>
     <string name="labelNwService" msgid="6015891883487125120">"Configurações do serviço de rede"</string>
     <string name="labelCallerId" msgid="2090540744550903172">"Identificador de chamadas"</string>
     <string name="sum_loading_settings" msgid="434063780286688775">"Carregando configurações…"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ecd1ff1..43633a7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -615,7 +615,7 @@
     <string name="ota_title_activate" msgid="4049645324841263423">"Активирајте телефон"</string>
     <string name="ota_touch_activate" msgid="838764494319694754">"Потребно је да упутите посебан позив да бисте активирали услугу свој телефона. \n\nНакон што притиснете дугме „Активирај“, слушајте дата упутства да бисте да бисте активирали свој телефон."</string>
     <string name="ota_hfa_activation_title" msgid="3300556778212729671">"Активирање..."</string>
-    <string name="ota_hfa_activation_dialog_message" msgid="7921718445773342996">"Телефон активира услугу мобилних података.\n\nТо може да потраје и до 5 минута."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="7921718445773342996">"Телефон активира услугу мобилног преноса података.\n\nТо може да потраје и до 5 минута."</string>
     <string name="ota_skip_activation_dialog_title" msgid="7666611236789203797">"Желите ли да прескочите активацију?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="6691722887019708713">"Ако прескочите активацију, не можете да упућујете позиве или да се повезујете са мрежама за мобилни пренос података (иако можете да се повежете са WiFi мрежама). Све док не активирате свој телефон, бићете упитани да то учините сваки пут када га укључите."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="5908029466817825633">"Прескочи"</string>
diff --git a/testapps/TestRcsApp/TestApp/res/values-as/strings.xml b/testapps/TestRcsApp/TestApp/res/values-as/strings.xml
deleted file mode 100644
index 2fac78c..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-as/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"প্ৰ’ভিজনিং পৰীক্ষা"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"অধিকাৰ প্ৰদান কৰাৰ পৰীক্ষা"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE পৰীক্ষা"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA পৰীক্ষা"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"ফলাফল:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"কলবেকৰ ফলাফল:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"সন্ধানৰ সামৰ্থ্যত নম্বৰটো দিয়ক আৰু বহুকেইটা থাকিলে \',\'ৰ দ্বাৰা পৃথক কৰক।"</string>
-    <string name="number" msgid="9096578126043995890">"সংখ্যা:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"চাট আৰম্ভ কৰক"</string>
-    <string name="to" msgid="1156781884609653284">"প্ৰতি:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"চাট বার্তা"</string>
-    <string name="send" msgid="8797467615003240434">"পঠিয়াওক"</string>
-    <string name="ok" msgid="2206671077510386729">"ঠিক আছে"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"ছেশ্বন আৰম্ভ কৰাত সফল হৈছে"</string>
-    <string name="session_failed" msgid="4524986240102190509">"ছেশ্বন আৰম্ভ কৰাত বিফল হৈছে"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"ছেশ্বন সাজু নহয়"</string>
-    <string name="organization" msgid="913518283470119113">"সংস্থা:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICCৰ ধৰণ:"</string>
-    <string name="protocol" msgid="8626139294022821930">"প্ৰট’কল:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS চাইফাৰ ছুইট:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"ষ্টেণ্ডএল’ন পেজাৰ"</string>
-    <string name="standalone_large" msgid="336170805696694543">"ষ্টেণ্ডএল’ন ডাঙৰ"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"ষ্টেণ্ডএল’ন স্থগিত ৰখা হৈছে"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"ষ্টেণ্ডএল’ন ডাঙৰ পেজাৰ"</string>
-    <string name="chat" msgid="5500583808773151982">"চাট"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"ফাইল স্থানান্তৰণ"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"জিঅ’লোকেশ্বনৰ এছএমএছ"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"চাটব’ট ছেশ্বন"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"ষ্টেণ্ডএল’ন চাটব’ট"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"চাটব’টৰ সংস্কৰণ"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"প্ৰ’ভিজনিং সম্পন্ন হৈছে"</string>
-    <string name="registration_done" msgid="492878616836655421">"পঞ্জীয়ন সম্পন্ন হৈছে"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"একো নাই"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"স্থানীয়"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"অজ্ঞাত"</item>
-    <item msgid="1715684709703792003">"ছিম"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-be/strings.xml b/testapps/TestRcsApp/TestApp/res/values-be/strings.xml
deleted file mode 100644
index 5196cf4..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-be/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Тэст ініцыялізацыі"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Дэлегаванне тэста"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Тэст UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Тэст GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Вынік:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Вынік зваротнага выкліку"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Увядзіце нумар для запыту магчымасці. Калі нумароў некалькі, раздзяліце іх коскамі."</string>
-    <string name="number" msgid="9096578126043995890">"Нумар:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Пачаць чат"</string>
-    <string name="to" msgid="1156781884609653284">"Каму:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Паведамленне чата"</string>
-    <string name="send" msgid="8797467615003240434">"Адправіць"</string>
-    <string name="ok" msgid="2206671077510386729">"ОК"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Ініцыялізацыя сеанса выканана"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Збой ініцыялізацыі сеанса"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Сеанс не гатовы"</string>
-    <string name="organization" msgid="913518283470119113">"Арганізацыя:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Тып UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Пратакол:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"Набор шыфраў TLS:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Аўтаномны пэйджар"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Аўтаномны вялікі"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Аўтаномны адкладзены"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Аўтаномны вялікі пэйджар"</string>
-    <string name="chat" msgid="5500583808773151982">"Чат"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Перадача файлаў"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"SMS геалакацыі"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Сеанс чат-бота"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Аўтаномны чат-бот"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Версія чат-бота"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Ініцыялізацыя выканана"</string>
-    <string name="registration_done" msgid="492878616836655421">"Рэгістрацыя выканана"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"НЯМА"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"МЯСЦОВАЯ СЕТКА"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"НЕВЯДОМА"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-bs/strings.xml b/testapps/TestRcsApp/TestApp/res/values-bs/strings.xml
deleted file mode 100644
index 8787d26..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-bs/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Test za dodjeljivanje"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Test ovlaštenika"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Test UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Test GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Rezultat:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Rezultat povratnog poziva:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Unesite broj da pošaljte upit o kapacitetu te upite razdvojite \",\" ako ih ima više."</string>
-    <string name="number" msgid="9096578126043995890">"Broj:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Započni chat"</string>
-    <string name="to" msgid="1156781884609653284">"Za:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Poruka chata"</string>
-    <string name="send" msgid="8797467615003240434">"Pošalji"</string>
-    <string name="ok" msgid="2206671077510386729">"Uredu"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Pokretanje sesije je uspjelo"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Pokretanje sesije nije uspjelo"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Sesija nije spremna"</string>
-    <string name="organization" msgid="913518283470119113">"Organizacija:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Vrsta UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protokol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"Paket TLS Cipher:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Samostalni pejdžer"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Samostalno veliko"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Samostalno odgođeno"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Samostalni veliki pejdžer"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Prijenos fajlova"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"SMS za geolokaciju"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Sesija bota za chat"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Samostalni bot za chat"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Vezija bota za chat"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Dodjeljivanje je završeno"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registracija je završena"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NEMA"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOKALNO"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"CERTIFIKAT_PRETPLATNIKA"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"NEPOZNATO"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rAU/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rAU/strings.xml
deleted file mode 100644
index bec17d3..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"Rcs client"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DB client"</string>
-    <string name="result" msgid="435222369457564619">"Result:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
-    <string name="number" msgid="9096578126043995890">"Number:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
-    <string name="to" msgid="1156781884609653284">"To:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
-    <string name="send" msgid="8797467615003240434">"Send"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
-    <string name="organization" msgid="913518283470119113">"Organisation:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NONE"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"UNKNOWN"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rCA/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rCA/strings.xml
deleted file mode 100644
index bec17d3..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-en-rCA/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"Rcs client"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DB client"</string>
-    <string name="result" msgid="435222369457564619">"Result:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
-    <string name="number" msgid="9096578126043995890">"Number:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
-    <string name="to" msgid="1156781884609653284">"To:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
-    <string name="send" msgid="8797467615003240434">"Send"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
-    <string name="organization" msgid="913518283470119113">"Organisation:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NONE"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"UNKNOWN"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rGB/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rGB/strings.xml
deleted file mode 100644
index bec17d3..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"Rcs client"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DB client"</string>
-    <string name="result" msgid="435222369457564619">"Result:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
-    <string name="number" msgid="9096578126043995890">"Number:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
-    <string name="to" msgid="1156781884609653284">"To:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
-    <string name="send" msgid="8797467615003240434">"Send"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
-    <string name="organization" msgid="913518283470119113">"Organisation:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NONE"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"UNKNOWN"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rIN/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rIN/strings.xml
deleted file mode 100644
index bec17d3..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"Rcs client"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DB client"</string>
-    <string name="result" msgid="435222369457564619">"Result:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
-    <string name="number" msgid="9096578126043995890">"Number:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
-    <string name="to" msgid="1156781884609653284">"To:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
-    <string name="send" msgid="8797467615003240434">"Send"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
-    <string name="organization" msgid="913518283470119113">"Organisation:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NONE"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"UNKNOWN"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rXC/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rXC/strings.xml
deleted file mode 100644
index ef9b6cb..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-en-rXC/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎RcsClient‎‏‎‎‏‎"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎Provisioning Test‎‏‎‎‏‎"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎Delegate Test‎‏‎‎‏‎"</string>
-    <string name="uce_test" msgid="6466919844953883038">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎UCE Test‎‏‎‎‏‎"</string>
-    <string name="gba_test" msgid="8786745991279224003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎GBA Test‎‏‎‎‏‎"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎TestMessageClient‎‏‎‎‏‎"</string>
-    <string name="db_client" msgid="5131401341721936367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎DBClient‎‏‎‎‏‎"</string>
-    <string name="result" msgid="435222369457564619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎Result:‎‏‎‎‏‎"</string>
-    <string name="callback_result" msgid="7162990408241244749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎Callback Result:‎‏‎‎‏‎"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎initializeSipDelegate‎‏‎‎‏‎"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎destroySipDelegate‎‏‎‎‏‎"</string>
-    <string name="uce_description" msgid="1117661457446955869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎Enter the number to query capability and separate by \',\' if multiple ones.‎‏‎‎‏‎"</string>
-    <string name="number" msgid="9096578126043995890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎Number:‎‏‎‎‏‎"</string>
-    <string name="request_capability" msgid="7644752985651089411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎requestCapability‎‏‎‎‏‎"</string>
-    <string name="request_availability" msgid="6387685341316953239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎requestNetworkAvailability‎‏‎‎‏‎"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎bootstrapAuthenticationRequest‎‏‎‎‏‎"</string>
-    <string name="start_chat" msgid="96121236227112396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎Start Chat‎‏‎‎‏‎"</string>
-    <string name="to" msgid="1156781884609653284">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎To:‎‏‎‎‏‎"</string>
-    <string name="chat_message" msgid="3945528453939746046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎Chat Message‎‏‎‎‏‎"</string>
-    <string name="send" msgid="8797467615003240434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎Send‎‏‎‎‏‎"</string>
-    <string name="ok" msgid="2206671077510386729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎OK‎‏‎‎‏‎"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎Session init succeeded‎‏‎‎‏‎"</string>
-    <string name="session_failed" msgid="4524986240102190509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎Session init failed‎‏‎‎‏‎"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎Session not ready‎‏‎‎‏‎"</string>
-    <string name="organization" msgid="913518283470119113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎Organization:‎‏‎‎‏‎"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎UICC Type:‎‏‎‎‏‎"</string>
-    <string name="protocol" msgid="8626139294022821930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎Protocol:‎‏‎‎‏‎"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎TLS Cipher Suite:‎‏‎‎‏‎"</string>
-    <string name="naf" msgid="7620247915001854662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎NAF URI:‎‏‎‎‏‎"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎Standalone Pager‎‏‎‎‏‎"</string>
-    <string name="standalone_large" msgid="336170805696694543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎Standalone Large‎‏‎‎‏‎"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎Standalone Deferred‎‏‎‎‏‎"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎Standalone Large Pager‎‏‎‎‏‎"</string>
-    <string name="chat" msgid="5500583808773151982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎Chat‎‏‎‎‏‎"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎File Transfer‎‏‎‎‏‎"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎Geolocation SMS‎‏‎‎‏‎"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎Chatbot Session‎‏‎‎‏‎"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎Chatbot Standalone‎‏‎‎‏‎"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎Chatbot Version‎‏‎‎‏‎"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎Provisioning Done‎‏‎‎‏‎"</string>
-    <string name="registration_done" msgid="492878616836655421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎Registration Done‎‏‎‎‏‎"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎NONE‎‏‎‎‏‎"</item>
-    <item msgid="7841117287115880098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎3GPP‎‏‎‎‏‎"</item>
-    <item msgid="5871357530951196401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎3GPP2‎‏‎‎‏‎"</item>
-    <item msgid="4979706772323445701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎OMA‎‏‎‎‏‎"</item>
-    <item msgid="1202873556413702218">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎GSMA‎‏‎‎‏‎"</item>
-    <item msgid="2237392451840970059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎LOCAL‎‏‎‎‏‎"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎SUBSCRIBER_CERTIFICATE‎‏‎‎‏‎"</item>
-    <item msgid="6305648228108532104">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎MBMS‎‏‎‎‏‎"</item>
-    <item msgid="4369286857827087787">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎HTTP_DIGEST_AUTH‎‏‎‎‏‎"</item>
-    <item msgid="1047245839171009229">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎3GPP_HTTP_BASED_MBMS‎‏‎‎‏‎"</item>
-    <item msgid="1728229445161381738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎GENERIC_PUSH_LAYER‎‏‎‎‏‎"</item>
-    <item msgid="8586727908453122385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎IMS_MEDIA_PLANE‎‏‎‎‏‎"</item>
-    <item msgid="5721752897501838331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎GENERATION_TMPI‎‏‎‎‏‎"</item>
-    <item msgid="1622910302975417378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎3GPP_HTTP_BASED_MBMS‎‏‎‎‏‎"</item>
-    <item msgid="7519270727796373646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎TLS_DEFAULT‎‏‎‎‏‎"</item>
-    <item msgid="7444251498958422990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎TLS_BROWSER‎‏‎‎‏‎"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎UNKNOWN‎‏‎‎‏‎"</item>
-    <item msgid="1715684709703792003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎SIM‎‏‎‎‏‎"</item>
-    <item msgid="4592543026990143036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎USIM‎‏‎‎‏‎"</item>
-    <item msgid="8763183137100323328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎RSIM‎‏‎‎‏‎"</item>
-    <item msgid="3778400020205644807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎CSIM‎‏‎‎‏‎"</item>
-    <item msgid="3774607711141191499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎ISIM‎‏‎‎‏‎"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-gu/strings.xml b/testapps/TestRcsApp/TestApp/res/values-gu/strings.xml
deleted file mode 100644
index 4842877..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-gu/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"જોગવાઈનું પરીક્ષણ"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"અધિકાર સોંપવાનું પરીક્ષણ"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE પરીક્ષણ"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA પરીક્ષણ"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"પરિણામ:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"કૉલબૅકનું પરિણામ:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"ક્વેરીની ક્ષમતામાં નંબર દાખલ કરો અને એક કરતાં વધુ હોય તો વડે \',\' જુદાં પાડો."</string>
-    <string name="number" msgid="9096578126043995890">"નંબર:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"ચૅટ શરૂ કરો"</string>
-    <string name="to" msgid="1156781884609653284">"પ્રતિ:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"ચૅટ સંદેશ"</string>
-    <string name="send" msgid="8797467615003240434">"મોકલો"</string>
-    <string name="ok" msgid="2206671077510386729">"ઓકે"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"સત્ર શરૂ કરવાનું સફળ થયું"</string>
-    <string name="session_failed" msgid="4524986240102190509">"સત્ર શરૂ કરવાનું નિષ્ફળ રહ્યું"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"સત્ર તૈયાર નથી"</string>
-    <string name="organization" msgid="913518283470119113">"સંસ્થા:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICCનો પ્રકાર:"</string>
-    <string name="protocol" msgid="8626139294022821930">"પ્રોટોકૉલ:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS સાઇફર સ્યૂટ:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"સ્ટેન્ડઅલોન પેજર"</string>
-    <string name="standalone_large" msgid="336170805696694543">"સ્ટેન્ડઅલોન મોટું"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"સ્ટેન્ડઅલોન સ્થગિત થયું"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"સ્ટેન્ડઅલોન મોટું પેજર"</string>
-    <string name="chat" msgid="5500583808773151982">"ચૅટ"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"ફાઇલ ટ્રાન્સફર"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"ભૌગોલિક સ્થાન SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"ચૅટબૉટ સત્ર"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"ચૅટબૉટ સ્ટેન્ડઅલોન"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"ચૅટબૉટ વર્ઝન"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"જોગવાઈ કરી"</string>
-    <string name="registration_done" msgid="492878616836655421">"રજિસ્ટ્રેશન થઈ ગયું"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"કોઈ નહીં"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"સ્થાનિક"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"અજાણ"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ko/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ko/strings.xml
deleted file mode 100644
index 38f1bd5..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-ko/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"프로비저닝 테스트"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"테스트 위임"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE 테스트"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA 테스트"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"결과:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"콜백 결과:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"기능을 쿼리할 숫자를 입력하고, 여러 개일 경우 \',\' 기호로 구분하세요."</string>
-    <string name="number" msgid="9096578126043995890">"번호:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"채팅 시작"</string>
-    <string name="to" msgid="1156781884609653284">"대상:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"채팅 메시지"</string>
-    <string name="send" msgid="8797467615003240434">"보내기"</string>
-    <string name="ok" msgid="2206671077510386729">"확인"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"세션 초기화 성공"</string>
-    <string name="session_failed" msgid="4524986240102190509">"세션 초기화 실패"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"세션이 준비되지 않음"</string>
-    <string name="organization" msgid="913518283470119113">"조직:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC 유형:"</string>
-    <string name="protocol" msgid="8626139294022821930">"프로토콜:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS 암호화 스위트:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"독립형 페이저"</string>
-    <string name="standalone_large" msgid="336170805696694543">"독립형 대형"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"독립형 지연됨"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"독립형 대형 페이저"</string>
-    <string name="chat" msgid="5500583808773151982">"채팅"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"파일 전송"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"위치정보 SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"챗봇 세션"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"독립형 챗봇"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"챗봇 버전"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"프로비저닝 완료"</string>
-    <string name="registration_done" msgid="492878616836655421">"등록 완료"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"없음"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"로컬"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"알 수 없음"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-lo/strings.xml b/testapps/TestRcsApp/TestApp/res/values-lo/strings.xml
deleted file mode 100644
index 6050bad..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-lo/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Provisioning Test"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"ທົດສອບຕົວແທນ"</string>
-    <string name="uce_test" msgid="6466919844953883038">"ທົດສອບ UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA Test"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"ຜົນໄດ້ຮັບ:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"ຜົນການໂທກັບ:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"ປ້ອນໝາຍເລກໃສ່ຄຳຊອກຫາ ແລະ ຂັ້ນດ້ວຍ \',\' ຖ້າມີຫຼາຍກວ່າໜຶ່ງ."</string>
-    <string name="number" msgid="9096578126043995890">"ໝາຍເລກ:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"ເລີ່ມການສົນທະນາ"</string>
-    <string name="to" msgid="1156781884609653284">"ຫາ:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"ຂໍ້ຄວາມສົນທະນາ"</string>
-    <string name="send" msgid="8797467615003240434">"ສົ່ງ"</string>
-    <string name="ok" msgid="2206671077510386729">"ຕົກລົງ"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"ເລີ່ມເຊດຊັນສຳເລັດ"</string>
-    <string name="session_failed" msgid="4524986240102190509">"ເລີ່ມເຊດຊັນຜິດພາດ"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"ເຊດຊັນບໍ່ທັນພ້ອມ"</string>
-    <string name="organization" msgid="913518283470119113">"ອົງການ:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"ປະເພດ UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"ໂປຣໂຕຄໍ:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"ຊຸດ TLS Cipher:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Standalone Pager"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Standalone Large"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Standalone Deferred"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone Large Pager"</string>
-    <string name="chat" msgid="5500583808773151982">"ສົນທະນາ"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"ການໂອນໄຟລ໌"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"ທີ່ຕັ້ງພູມສາດ SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"ເຊດຊັນ Chatbot"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot ແບບດ່ຽວ"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"ເວີຊັນ Chatbot"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Provisioning Done"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registration Done"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"ບໍ່ມີ"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"ພາຍໃນ"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"ບໍ່ຮູ້ຈັກ"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ml/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ml/strings.xml
deleted file mode 100644
index 00d9a4e..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-ml/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"പ്രൊവിഷനിംഗ് ടെസ്‌റ്റ്"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"ഡെലിഗേറ്റ് ടെസ്‌റ്റ്"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE ടെസ്‌റ്റ്"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA ടെസ്‌റ്റ്"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"ഫലം:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"തിരികെ വിളിക്കൽ ഫലം:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"ചോദ്യത്തിന്റെ കാര്യക്ഷമത എന്നതിലേക്ക് നമ്പർ നൽകുക, ഒന്നിലധികം ഉണ്ടെങ്കിൽ അവയെ \',\' ഉപയോഗിച്ച് വേർതിരിക്കുക."</string>
-    <string name="number" msgid="9096578126043995890">"നമ്പർ:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"ചാറ്റ് ആരംഭിക്കുക"</string>
-    <string name="to" msgid="1156781884609653284">"സ്വീകർത്താവ്:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Chat സന്ദേശം"</string>
-    <string name="send" msgid="8797467615003240434">"അയയ്ക്കുക"</string>
-    <string name="ok" msgid="2206671077510386729">"ശരി"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"സെഷൻ ആരംഭിച്ചു"</string>
-    <string name="session_failed" msgid="4524986240102190509">"സെഷൻ ആരംഭിക്കാനായില്ല"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"സെഷൻ തയ്യാറല്ല"</string>
-    <string name="organization" msgid="913518283470119113">"ഓർഗനൈസേഷൻ:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC തരം:"</string>
-    <string name="protocol" msgid="8626139294022821930">"പ്രോട്ടോക്കോൾ:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"സ്‌റ്റാൻഡ്എലോൺ പേജർ"</string>
-    <string name="standalone_large" msgid="336170805696694543">"സ്‌റ്റാൻഡ്എലോൺ ലാർജ്"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"സ്‌റ്റാൻഡ്എലോൺ ഡെഫേഡ്"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"സ്‌റ്റാൻഡ്എലോൺ ലാർജ് പേജർ"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"ഫയൽ കൈമാറൽ"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"ജിയോലൊക്കേഷൻ SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"ചാറ്റ്ബോട്ട് സെഷൻ"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"ചാറ്റ്ബോട്ട് സ്‌റ്റാൻഡ്എലോൺ"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"ചാറ്റ്ബോട്ട് പതിപ്പ്"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"പ്രൊവിഷനിംഗ് പൂർത്തിയായി"</string>
-    <string name="registration_done" msgid="492878616836655421">"രജിസ്‌ട്രേഷൻ പൂർത്തിയായി"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"ഒന്നുമില്ല"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"UNKNOWN"</item>
-    <item msgid="1715684709703792003">"സിം"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ms/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ms/strings.xml
deleted file mode 100644
index 758b2bd..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-ms/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Ujian Peruntukan"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Tugaskan Ujian"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Ujian UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Ujian GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Hasil:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Hasil Panggil Balik:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Masukkan nombor untuk bertanya keupayaan dan pisahkan dengan \',\' jika terdapat berbilang nombor."</string>
-    <string name="number" msgid="9096578126043995890">"Nombor:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Mulakan Sembang"</string>
-    <string name="to" msgid="1156781884609653284">"Kepada:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Mesej Sembang"</string>
-    <string name="send" msgid="8797467615003240434">"Hantar"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Pemulaan sesi berjaya"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Pemulaan sesi gagal"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Sesi belum sedia"</string>
-    <string name="organization" msgid="913518283470119113">"Organisasi:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Jenis UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protokol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"Set Sifer TLS:"</string>
-    <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Alat Kelui Kendiri"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Apl Kendiri Besar"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Apl Kendiri Ditunda"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Alat Kelui Kendiri Besar"</string>
-    <string name="chat" msgid="5500583808773151982">"Sembang"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Pemindahan Fail"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"SMS Geolokasi"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Sesi Chatbot"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Apl Kendiri Chatbot"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Versi Chatbot"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Peruntukan Selesai"</string>
-    <string name="registration_done" msgid="492878616836655421">"Pendaftaran Selesai"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"TIADA"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"SETEMPAT"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"TIDAK DIKETAHUI"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ne/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ne/strings.xml
deleted file mode 100644
index 51cf376..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-ne/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"प्रबन्ध मिलाउने परीक्षण"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"परीक्षण गर्ने जिम्मा दिनुहोस्"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE परीक्षण"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA परीक्षण"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"परिणाम:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"कलब्याकसम्बन्धी परिणाम:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"क्वेरी क्यापाबिलिटीको नम्बर हाल्नुहोस्। एकभन्दा बढी नम्बर छन् भने \',\' ले छुट्याउनुहोस्।"</string>
-    <string name="number" msgid="9096578126043995890">"नम्बर:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"च्याट गर्नुहोस्"</string>
-    <string name="to" msgid="1156781884609653284">"प्रापक:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"च्याट म्यासेज"</string>
-    <string name="send" msgid="8797467615003240434">"पठाउनुहोस्"</string>
-    <string name="ok" msgid="2206671077510386729">"ठिक छ"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"सत्र सफलतापूर्वक सुरु गरियो"</string>
-    <string name="session_failed" msgid="4524986240102190509">"सत्र सुरु गर्न सकिएन"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"सत्र तयार छैन"</string>
-    <string name="organization" msgid="913518283470119113">"सङ्गठन:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC को प्रकार:"</string>
-    <string name="protocol" msgid="8626139294022821930">"प्रोटोकोल:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"स्ट्यान्डअलोन पेजर"</string>
-    <string name="standalone_large" msgid="336170805696694543">"स्ट्यान्डअलोन ठुलो"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"स्ट्यान्डअलोन विलम्बित गरिएको"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"स्ट्यान्डअलोन ठुलो पेजर"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"फाइल स्थानान्तरण"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"भूस्थानसम्बन्धी SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"च्याटबटसँगको सत्र"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"च्याटबट स्ट्यान्डअलोन"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"च्याटबटको संस्करण"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"प्रबन्ध मिलाउने कार्य पूरा भयो"</string>
-    <string name="registration_done" msgid="492878616836655421">"दर्ता गर्ने कार्य पूरा भयो"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"कुनै पनि होइन"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"स्थानीय"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"अज्ञात"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-or/strings.xml b/testapps/TestRcsApp/TestApp/res/values-or/strings.xml
deleted file mode 100644
index 5c9491b..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-or/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"ପ୍ରୋଭିଜନିଂ ଟେଷ୍ଟ"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"ଟେଷ୍ଟ ଡେଲିଗେଟ୍ କରନ୍ତୁ"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE ଟେଷ୍ଟ"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA ଟେଷ୍ଟ"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"ଫଳାଫଳ:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"କଲବ୍ୟାକ୍ ଫଳାଫଳ:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"ସାମର୍ଥ୍ୟ ପାଇଁ କ୍ୱେରୀ କରିବାକୁ ନମ୍ବର ଲେଖନ୍ତୁ ଏବଂ ଯଦି ଏକାଧିକ ନମ୍ବର ଅଛି ତେବେ \',\' ଦ୍ୱାରା ଅଲଗା କରନ୍ତୁ।"</string>
-    <string name="number" msgid="9096578126043995890">"ନମ୍ବର:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"ଚାଟ୍ ଆରମ୍ଭ କରନ୍ତୁ"</string>
-    <string name="to" msgid="1156781884609653284">"ପ୍ରାପ୍ତେଷୁ:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"ଚାଟ୍ ମେସେଜ୍"</string>
-    <string name="send" msgid="8797467615003240434">"ପଠାନ୍ତୁ"</string>
-    <string name="ok" msgid="2206671077510386729">"ଠିକ୍ ଅଛି"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"ସେସନ୍ ଆରମ୍ଭ ସଫଳ ହୋଇଛି"</string>
-    <string name="session_failed" msgid="4524986240102190509">"ସେସନ୍ ଆରମ୍ଭ ବିଫଳ ହୋଇଛି"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"ସେସନ୍ ପ୍ରସ୍ତୁତ ନୁହେଁ"</string>
-    <string name="organization" msgid="913518283470119113">"ସଂସ୍ଥା:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC ପ୍ରକାର:"</string>
-    <string name="protocol" msgid="8626139294022821930">"ପ୍ରୋଟୋକଲ୍:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS ସାଇଫର୍ ସୁଟ୍:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ପେଜର୍"</string>
-    <string name="standalone_large" msgid="336170805696694543">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ବଡ଼"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ସ୍ଥଗିତ ହୋଇଛି"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ବଡ଼ ପେଜର୍"</string>
-    <string name="chat" msgid="5500583808773151982">"ଚାଟ୍"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"ଫାଇଲ୍ ଟ୍ରାନ୍ସଫର୍"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"ଜିଓଲୋକେସନ୍ SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"ଚାଟବଟ୍ ସେସନ୍"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"ଚାଟବଟ୍ ଷ୍ଟାଣ୍ଡଏଲୋନ୍"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"ଚାଟବଟ୍ ସଂସ୍କରଣ"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"ପ୍ରୋଭିଜନିଂ ହୋଇଗଲା"</string>
-    <string name="registration_done" msgid="492878616836655421">"ପଞ୍ଜିକରଣ ହୋଇଗଲା"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"କିଛି ନାହିଁ"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"ସ୍ଥାନୀୟ"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"ଅଜଣା"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ro/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ro/strings.xml
deleted file mode 100644
index 593cf46..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-ro/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Test de configurare a accesului pentru utilizatori"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Test delegat"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Test UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Test GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Rezultat:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Rezultatul apelării inverse:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Introduceți numărul pentru capacitatea de interogare și separați prin „,” dacă aveți mai multe."</string>
-    <string name="number" msgid="9096578126043995890">"Număr:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Începeți conversația"</string>
-    <string name="to" msgid="1156781884609653284">"Către:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Mesaj prin chat"</string>
-    <string name="send" msgid="8797467615003240434">"Trimiteți"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"S-a inițializat sesiunea"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Sesiunea nu a fost inițializată"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Sesiunea nu este gata"</string>
-    <string name="organization" msgid="913518283470119113">"Organizație:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Tip UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"Suita cifrului TLS:"</string>
-    <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Pager autonom"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Autonom mare"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Autonom amânat"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Pager autonom mare"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Transfer de fișier"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"SMS pentru localizare geografică"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Sesiune chatbot"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot autonom"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Versiune chatbot"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"S-a configurat accesul pentru utilizatori"</string>
-    <string name="registration_done" msgid="492878616836655421">"S-a înregistrat"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NICIUNA"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"NECUNOSCUTĂ"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ru/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ru/strings.xml
deleted file mode 100644
index 1276015..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-ru/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Тест инициализации"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Делегирование теста"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Тест UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Тест GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Результат:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Результат обратного вызова:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Введите номер для запроса возможности. Разделяйте номера запятыми, если их несколько."</string>
-    <string name="number" msgid="9096578126043995890">"Номер:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Начать чат"</string>
-    <string name="to" msgid="1156781884609653284">"Кому:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Сообщение чата"</string>
-    <string name="send" msgid="8797467615003240434">"Отправить"</string>
-    <string name="ok" msgid="2206671077510386729">"ОК"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Инициализация сеанса выполнена"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Сбой инициализации сеанса"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Сеанс не готов\\"</string>
-    <string name="organization" msgid="913518283470119113">"Организация:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Тип UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Протокол:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"Шифронабор TLS:"</string>
-    <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Автономный пейджер"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Автономный большой"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Автономный отложенный"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Автономный большой пейджер"</string>
-    <string name="chat" msgid="5500583808773151982">"Чат"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Передача файла"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"SMS геолокации"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Сеанс чат-бота"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Автономный чат-бот"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Версия чат-бота"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Инициализация выполнена"</string>
-    <string name="registration_done" msgid="492878616836655421">"Регистрация выполнена"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"НЕТ"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"МЕСТНАЯ СЕТЬ"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"НЕИЗВЕСТНО"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-sl/strings.xml b/testapps/TestRcsApp/TestApp/res/values-sl/strings.xml
deleted file mode 100644
index ca62620..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-sl/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Preizkus priprave za uporabo"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Preizkus dodelitve"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Preizkus UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Preizkus GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Rezultat:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Rezultat povratnega klica:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Vnesite številko, da pošljete poizvedbo za zmogljivost. Če jih je več, jih ločite z vejicami."</string>
-    <string name="number" msgid="9096578126043995890">"Številka:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Zaženi Chat"</string>
-    <string name="to" msgid="1156781884609653284">"Za:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Sporočilo v storitvi Chat"</string>
-    <string name="send" msgid="8797467615003240434">"Pošlji"</string>
-    <string name="ok" msgid="2206671077510386729">"V redu"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Inicializacija seje je uspela"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Inicializacija seje ni uspela"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Seja ni pripravljena"</string>
-    <string name="organization" msgid="913518283470119113">"Organizacija:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Vrsta UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protokol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"Zbirka šifriranja TLS:"</string>
-    <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Samostojni pozivnik"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Samostojno veliko"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Samostojno odloženo"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Samostojni veliki pozivnik"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Prenos datotek"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"Geolokacijski SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Seja bota za klepet"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Samostojni bot za klepet"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Različica bota za klepet"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Priprava za uporabo je končana"</string>
-    <string name="registration_done" msgid="492878616836655421">"Registracija je končana"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"NONE"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"UNKNOWN"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-te/strings.xml b/testapps/TestRcsApp/TestApp/res/values-te/strings.xml
deleted file mode 100644
index 7a0643d..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-te/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"నిర్వహణ టెస్ట్"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"డెలిగేట్ టెస్ట్"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE టెస్ట్"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA టెస్ట్"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"ఫలితం:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"కాల్‌బ్యాక్ ఫలితం:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"క్వెరీ సామర్థ్యం కోసం నంబర్‌ను ఎంటర్ చేసి, అవి ఒకటి కంటే ఎక్కువ ఉంటే \',\'తో వేరు చేయండి."</string>
-    <string name="number" msgid="9096578126043995890">"నంబర్:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"చాట్‌ను ప్రారంభించండి"</string>
-    <string name="to" msgid="1156781884609653284">"వీరికి:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"చాట్ మెసేజ్"</string>
-    <string name="send" msgid="8797467615003240434">"పంపు"</string>
-    <string name="ok" msgid="2206671077510386729">"సరే"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"సెషన్ ప్రారంభం విజయవంతమైంది"</string>
-    <string name="session_failed" msgid="4524986240102190509">"సెషన్ ప్రారంభం విఫలమైంది"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"సెషన్ సిద్ధంగా ఉంది"</string>
-    <string name="organization" msgid="913518283470119113">"సంస్థ:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC రకం:"</string>
-    <string name="protocol" msgid="8626139294022821930">"ప్రోటోకాల్:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"స్టాండ్ఎలోన్ పేజర్"</string>
-    <string name="standalone_large" msgid="336170805696694543">"స్టాండ్ఎలోన్ లార్జ్"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"స్టాండ్ఎలోన్ వాయిదా వేయబడింది"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"స్టాండ్ఎలోన్ లార్జ్ పేజర్"</string>
-    <string name="chat" msgid="5500583808773151982">"చాట్"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"ఫైల్ బదిలీ"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"భౌగోళిక స్థాన SMS"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"చాట్‌బాట్ సెషన్"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"చాట్‌బాట్ స్టాండ్ఎలోన్"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"చాట్‌బాట్ వెర్షన్"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"నిర్వహణ పూర్తయింది"</string>
-    <string name="registration_done" msgid="492878616836655421">"రిజిస్ట్రేషన్ పూర్తయింది"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"ఏదీ కాదు"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOCAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"తెలియదు"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-tl/strings.xml b/testapps/TestRcsApp/TestApp/res/values-tl/strings.xml
deleted file mode 100644
index e2dc0cb..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-tl/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Pagsusuri ng Provisioning"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Pagsusuri ng Pinaglaanan"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Pagsusuri ng UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Pagsusuri ng GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Resulta:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Resulta ng Callback:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Ilagay ang numero para i-query ang kakayahan at paghiwa-hiwalayin gamit ang \',\' kung marami ito."</string>
-    <string name="number" msgid="9096578126043995890">"Numero:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Simulan ang Chat"</string>
-    <string name="to" msgid="1156781884609653284">"Para sa:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Mensahe sa Chat"</string>
-    <string name="send" msgid="8797467615003240434">"Ipadala"</string>
-    <string name="ok" msgid="2206671077510386729">"OK"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Matagumpay na nasimulan ang session"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Hindi nasimulan ang session"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Hindi pa handa ang session"</string>
-    <string name="organization" msgid="913518283470119113">"Organisasyon:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Uri ng UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"URI ng NAF:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Standalone Pager"</string>
-    <string name="standalone_large" msgid="336170805696694543">"Standalone Large"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"Standalone Deferred"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone Large Pager"</string>
-    <string name="chat" msgid="5500583808773151982">"Chat"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Paglilipat ng File"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"SMS ng Geolocation"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Chatbot Session"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot Standalone"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Bersyon ng Chatbot"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Tapos na ang Provisioning"</string>
-    <string name="registration_done" msgid="492878616836655421">"Tapos na ang Pagpaparehistro"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"WALA"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"LOKAL"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"HINDI ALAM"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-zh-rHK/strings.xml b/testapps/TestRcsApp/TestApp/res/values-zh-rHK/strings.xml
deleted file mode 100644
index ec7f74a..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"佈建測試"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"委派測試"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE 測試"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA 測試"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"結果:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"回撥電話結果:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"輸入要查詢功能的號碼;如果有多組號碼,請以半形逗號 (,) 分隔。"</string>
-    <string name="number" msgid="9096578126043995890">"號碼:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"發起即時通訊"</string>
-    <string name="to" msgid="1156781884609653284">"收件者:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"即時通訊訊息"</string>
-    <string name="send" msgid="8797467615003240434">"傳送"</string>
-    <string name="ok" msgid="2206671077510386729">"確定"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"工作階段初始化失敗成功"</string>
-    <string name="session_failed" msgid="4524986240102190509">"工作階段初始化失敗"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"工作階段尚未就緒"</string>
-    <string name="organization" msgid="913518283470119113">"機構:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC 類型:"</string>
-    <string name="protocol" msgid="8626139294022821930">"通訊協定:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS 加密套裝組合:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"一般版 UI:呼叫器"</string>
-    <string name="standalone_large" msgid="336170805696694543">"一般版 UI:大型"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"一般版 UI:已延後"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"一般版 UI:大型呼叫器"</string>
-    <string name="chat" msgid="5500583808773151982">"即時通訊"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"檔案傳輸"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"地理位置簡訊"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"聊天機器人工作階段"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"聊天機器人一般版 UI"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"聊天機器人版本"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"已完成佈建"</string>
-    <string name="registration_done" msgid="492878616836655421">"已完成註冊"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"無"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"本地"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"不明"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-zh-rTW/strings.xml b/testapps/TestRcsApp/TestApp/res/values-zh-rTW/strings.xml
deleted file mode 100644
index ec7f74a..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"佈建測試"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"委派測試"</string>
-    <string name="uce_test" msgid="6466919844953883038">"UCE 測試"</string>
-    <string name="gba_test" msgid="8786745991279224003">"GBA 測試"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
-    <string name="result" msgid="435222369457564619">"結果:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"回撥電話結果:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"輸入要查詢功能的號碼;如果有多組號碼,請以半形逗號 (,) 分隔。"</string>
-    <string name="number" msgid="9096578126043995890">"號碼:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"發起即時通訊"</string>
-    <string name="to" msgid="1156781884609653284">"收件者:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"即時通訊訊息"</string>
-    <string name="send" msgid="8797467615003240434">"傳送"</string>
-    <string name="ok" msgid="2206671077510386729">"確定"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"工作階段初始化失敗成功"</string>
-    <string name="session_failed" msgid="4524986240102190509">"工作階段初始化失敗"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"工作階段尚未就緒"</string>
-    <string name="organization" msgid="913518283470119113">"機構:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"UICC 類型:"</string>
-    <string name="protocol" msgid="8626139294022821930">"通訊協定:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"TLS 加密套裝組合:"</string>
-    <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"一般版 UI:呼叫器"</string>
-    <string name="standalone_large" msgid="336170805696694543">"一般版 UI:大型"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"一般版 UI:已延後"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"一般版 UI:大型呼叫器"</string>
-    <string name="chat" msgid="5500583808773151982">"即時通訊"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"檔案傳輸"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"地理位置簡訊"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"聊天機器人工作階段"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"聊天機器人一般版 UI"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"聊天機器人版本"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"已完成佈建"</string>
-    <string name="registration_done" msgid="492878616836655421">"已完成註冊"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"無"</item>
-    <item msgid="7841117287115880098">"3GPP"</item>
-    <item msgid="5871357530951196401">"3GPP2"</item>
-    <item msgid="4979706772323445701">"OMA"</item>
-    <item msgid="1202873556413702218">"GSMA"</item>
-    <item msgid="2237392451840970059">"本地"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"不明"</item>
-    <item msgid="1715684709703792003">"SIM"</item>
-    <item msgid="4592543026990143036">"USIM"</item>
-    <item msgid="8763183137100323328">"RSIM"</item>
-    <item msgid="3778400020205644807">"CSIM"</item>
-    <item msgid="3774607711141191499">"ISIM"</item>
-  </string-array>
-</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-zu/strings.xml b/testapps/TestRcsApp/TestApp/res/values-zu/strings.xml
deleted file mode 100644
index d05fa16..0000000
--- a/testapps/TestRcsApp/TestApp/res/values-zu/strings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="1411081210960307023">"I-RcsClient"</string>
-    <string name="provisioning_test" msgid="1035549386706009246">"Isivivinyo Sokunikezwa"</string>
-    <string name="delegate_test" msgid="8212368545489779643">"Susa Isivivinyo"</string>
-    <string name="uce_test" msgid="6466919844953883038">"Isivivinyo se-UCE"</string>
-    <string name="gba_test" msgid="8786745991279224003">"Isivivinyo se-GBA"</string>
-    <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
-    <string name="db_client" msgid="5131401341721936367">"I-DBClient"</string>
-    <string name="result" msgid="435222369457564619">"Umphumela:"</string>
-    <string name="callback_result" msgid="7162990408241244749">"Imiphumela yokuphinda ushaye:"</string>
-    <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
-    <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
-    <string name="uce_description" msgid="1117661457446955869">"Faka inombolo ukubuza amandla futhi uhlukanise ngokuthi \',\' uma kukuningi."</string>
-    <string name="number" msgid="9096578126043995890">"Inombolo:"</string>
-    <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
-    <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
-    <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
-    <string name="start_chat" msgid="96121236227112396">"Qalisa Ingxoxo"</string>
-    <string name="to" msgid="1156781884609653284">"Ku:"</string>
-    <string name="chat_message" msgid="3945528453939746046">"Umlayezo Wengxoxo"</string>
-    <string name="send" msgid="8797467615003240434">"Thumela"</string>
-    <string name="ok" msgid="2206671077510386729">"KULUNGILE"</string>
-    <string name="session_succeeded" msgid="4692992136758212220">"Ukuqaliswa kweseshini kuphumelele"</string>
-    <string name="session_failed" msgid="4524986240102190509">"Ukuqaliswa kweseshini kwehlulekile"</string>
-    <string name="session_not_ready" msgid="4612635394279901948">"Iseshini ayilungile"</string>
-    <string name="organization" msgid="913518283470119113">"Inhlangano:"</string>
-    <string name="uicc_type" msgid="5584433205228698588">"Uhlobo lwe-UICC:"</string>
-    <string name="protocol" msgid="8626139294022821930">"Iphrothokholi:"</string>
-    <string name="tls_cs" msgid="5410567052979996834">"I-TLS Cipher Suite:"</string>
-    <string name="naf" msgid="7620247915001854662">"I-NAF URI:"</string>
-    <string name="standalone_pager" msgid="1351341861641131423">"Ipheja ye-Standalone"</string>
-    <string name="standalone_large" msgid="336170805696694543">"I-Standalone Enkulu"</string>
-    <string name="standalone_deferred" msgid="4906576900729108844">"I-Standalone Iyekiswe ukubhekiswa"</string>
-    <string name="standalone_pager_large" msgid="5662294171123433547">"Ipheja ye-Standalone Enkulu"</string>
-    <string name="chat" msgid="5500583808773151982">"Ingxoxo"</string>
-    <string name="file_transfer" msgid="5522080545470609737">"Ukudluliselwa kwefayela"</string>
-    <string name="geolocation_sms" msgid="4463328438708195479">"I-SMS ye-Geolocation"</string>
-    <string name="chatbot_session" msgid="5639314220589146717">"Iseshini ye-Chatbot"</string>
-    <string name="chatbot_standalone" msgid="8159185526765238041">"I-Chatbot Standalone"</string>
-    <string name="chatbot_version" msgid="2431939061806512544">"Inguqulo ye-Chatbot"</string>
-    <string name="provisioning_done" msgid="204618840179891984">"Ukunikezwa kwenziwe"</string>
-    <string name="registration_done" msgid="492878616836655421">"Ukubhalisa Kwenziwe"</string>
-  <string-array name="organization">
-    <item msgid="9074061482474975772">"LUTHO"</item>
-    <item msgid="7841117287115880098">"I-3GPP"</item>
-    <item msgid="5871357530951196401">"I-3GPP2"</item>
-    <item msgid="4979706772323445701">"I-OMA"</item>
-    <item msgid="1202873556413702218">"I-GSMA"</item>
-    <item msgid="2237392451840970059">"OKWENDAWO"</item>
-  </string-array>
-  <string-array name="protocol">
-    <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
-    <item msgid="6305648228108532104">"I-MBMS"</item>
-    <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
-    <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
-    <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
-    <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
-    <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
-    <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
-    <item msgid="7444251498958422990">"TLS_BROWSER"</item>
-  </string-array>
-  <string-array name="uicc_type">
-    <item msgid="5878327014492655902">"AKWAZIWA"</item>
-    <item msgid="1715684709703792003">"I-SIM"</item>
-    <item msgid="4592543026990143036">"I-USIM"</item>
-    <item msgid="8763183137100323328">"I-RSIM"</item>
-    <item msgid="3778400020205644807">"I-CSIM"</item>
-    <item msgid="3774607711141191499">"I-ISIM"</item>
-  </string-array>
-</resources>