diff --git a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml b/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml
index efd6982..b567dbb 100644
--- a/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml
+++ b/InCallUI/res/layout/dtmf_twelve_key_dialer_view.xml
@@ -20,11 +20,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-
-    <view class="com.android.incallui.DialpadFragment$HoverIgnoringLinearLayout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-        <include layout="@layout/dialpad_view"/>
-    </view>
+    <include layout="@layout/dialpad_view"/>
 </view>
diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index c830793..fc27060 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Hou aan"</string>
     <string name="unknown" msgid="6878797917991465859">"Onbekend"</string>
     <string name="private_num" msgid="6713286113000232309">"Privaat nommer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Betaalfoon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Lyn is besig"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Netwerk besig"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Geen reaksie nie, uitgetel"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Bediener onbereikbaar"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nommer onbereikbaar"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Verkeerde gebruikernaam of wagwoord"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Geskakel van buite netwerk"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Bedienerfout. Probeer later weer."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Geen sein"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-grens oorskry"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio af"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Geen SIM of SIM-fout"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobiele netwerk is nie beskikbaar nie"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Uitgaande oproepe word beperk deur FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Jy kan nie uitgaande oproepe maak terwyl oproepblokkeer aan is nie."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle oproepe word deur toegangbeheer beperk."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Noodoproepe word beperk deur toegangbeheer."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Gewone oproepe word beperk deur toegangbeheer."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ongeldige nommer"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefoonhokkie"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferensie-oproep"</string>
-    <string name="call_lost" msgid="317670617901479594">"Oproep is verlore."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Oproep is ontkoppel"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Luidspreker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Selfoonoorstuk"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Bedraade kopfoon"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferensie-oproep <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Stemboodskapnommer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Bel"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Probeer weer"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Herbel tans"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferensie-oproep"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Inkomende oproep"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Oproep beëindig"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lui af"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In oproep"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"My nommer is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Koppel tans video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video-oproep"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Versoek tans video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Kan nie video-oproep koppel nie"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Jou terugbelnommer\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Jou noodterugbelnommer\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Bel"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepe"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Oproep aan die gang"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Inkomende video-oproep"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Inkomende videoversoek"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuwe stemboodskap"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nuwe stemboodskap (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Bel <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Stemboodskapnommer onbekend"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Geen diens nie"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Gekose netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie beskikbaar nie"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Antwoord"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Lui af"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Stem"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Aanvaar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Maak toe"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Bel terug"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Boodskap"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Om \'n oproep te maak, skakel eers vliegtuigmodus af."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nie geregistreer op netwerk nie."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiele netwerk nie beskikbaar nie."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Oproep nie gestuur nie, geen geldige nommer ingevoer nie."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Oproep nie gestuur nie."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Sellulêre netwerk nie beskikbaar nie."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Voer \'n geldige nommer in om \'n oproep te maak."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan nie bel nie."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Begin MMI-volgorde…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nieondersteunde diens."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kan nie oproepe wissel nie."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kan nie oproep verdeel nie."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Onmoontlik om oproep deur te skakel."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Kan nie konferensie-oproepe doen nie."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kan nie oproep verwerp nie."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kan nie oproepe los nie."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Stemboodskapnommer is onbekend."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetoproep"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Diens word nie gesteun nie."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan nie oproepe wissel nie."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan nie oproep skei nie."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan nie deurskakel nie."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Kan nie konferensieoproep maak nie."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan nie oproep verwerp nie."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan nie oproep(e) vrystel nie."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-oproep"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Skakel tans radio aan…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Buite diensarea, probeer tans weer…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Oproep nie gestuur nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Oproep nie gestuur nie. Bel asseblief \'n noodnommer!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen sein nie. Probeer tans weer …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan nie bel nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan nie bel nie. Skakel \'n noodnommer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gebruik sleutelbord om te bel"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Hou oproep"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Hervat oproep"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Voeg oproep by"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Voeg oproepe saam"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Verwissel oproepe"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hou aan"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Einde"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Nommerbord"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Voeg oproepe saam"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Ruil"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Bestuur oproepe"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Bestuur konferensie"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Bestuur konferensie-oproep"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Oudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video-oproep"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Verander na stemoproep"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Wissel kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Laat video wag"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Meer opsies"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Diens"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Opstelling"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nie gestel nie&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skryf jou eie..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Kanselleer"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Stuur"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"een"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"twee"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"drie"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"vier"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"vyf"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ses"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sewe"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"agt"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nege"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ster"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nul"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"huts"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"bel"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"terugvee"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Luidsprekerfoon geaktiveer."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep stilgemaak."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Stuur SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Wys af"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Antwoord as video-oproep"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Antwoord as oudio-oproep"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aanvaar videoversoek"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Keur videoversoek af"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Gly op vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Gly links vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Gly regs vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Gly af vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreer"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreer"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Klank"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Verstek klank (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Foon-luitoon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibreer wanneer lui"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Belblad-raaktone"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Belblad outo-voltooi"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Belblad-outovoltooi"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Luitoon en vibreer"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Bestuur konferensie-oproep"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Noodnommer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-am/strings.xml b/InCallUI/res/values-am/strings.xml
index 54dba57..9d439ea 100644
--- a/InCallUI/res/values-am/strings.xml
+++ b/InCallUI/res/values-am/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"ያዝናቆይ"</string>
     <string name="unknown" msgid="6878797917991465859">"ያልታወቀ"</string>
     <string name="private_num" msgid="6713286113000232309">"የግል ቁጥር"</string>
-    <string name="payphone" msgid="1931775086311769314">"የክፍያ ስልክ"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"መስመሩ ተይዟል"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"አውታረመረብ ተይዟል"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ምንም ምላሽ የለም፣ ጊዜው አልቋል"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"አገልጋይ አይደረስበትም"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ቁጥር አይደረስበትም"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"የተሳሳየ ተጠቃሚ ስም እና ይለፍ ቃል"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ከአውታረ መረብ ውጪ የተደወለ"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"የአግልጋይ ስህተት፣ እባክዎ በድጋሚ ቆይተው ይሞክሩ።"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"ምንም አመልካች የለም"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ወሰንአልፏል"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"ሬዲዮ ጠፍቷል"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"ምንም SIM ፣ ወይም የSIM ስህተት የለም"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"ወጪ ጥሪዎች በFDN ተከልክለዋል።"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"የጥሪ ክልከላ በርቶ ሳለ የወጪ ጥሪ ማድረግ አትችልም።"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ሁሉም ጥሪዎች በመድረሻ መቆጣጠሪያ የተከለከሉ ናቸው።"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"የአደጋ ጊዜ ጥሪዎች በድረስ መቆጣጠሪያተከልክልዋል።"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"መደበኛ ጥሪዎች በድረስ መቆጣጠሪያ ተከልክልዋል።"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"ተቀባይነት የሌለው ቁጥር"</string>
+    <string name="payphone" msgid="4793877574636445118">"የሕዝብ ስልክ"</string>
     <string name="confCall" msgid="1904840547188336828">"የስብሰባ ጥሪ"</string>
-    <string name="call_lost" msgid="317670617901479594">"ጥሪ ተቋርጣል።"</string>
-    <string name="ok" msgid="3811371167865772377">"እሺ"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ጥሪው ተቋርጧል።"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"ድምጽ ማጉያ"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"የስልክ እጀታ ጆሮማዳመጫ"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ባለ ገመድ የጆሮ ማዳመጫ"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"የስብሰባ ጥሪ<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"የድምፅ መልዕክት ቁጥር"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"በመደወል ላይ"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"እንደገና በመሞከር ላይ"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ዳግም በመደወል ላይ"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"የስብሰባ ጥሪ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ገቢ ጥሪ"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"ጥሪ አብቅቷል"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"በመዝጋት ላይ"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"ጥሪ ላይ"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"ቁጥሬ<xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> ነው"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ቪድዮ በማገናኘት ላይ"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"የቪዲዮ ጥሪ"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ቪድዮ በመጠየቅ ላይ"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"የቪዲዮ ጥሪን ማገናኘት አልተቻለም"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"የእርስዎ የመልሶ መደወያ ቁጥር\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"የእርስዎ የድንገተኛ አደጋ መልሶ መደወያ ቁጥር\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"በመደወል ላይ"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"ያመለጠጥሪ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ያመለጡ ጥሪዎች"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"እየተካሄደ ያለ ጥሪ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ያዝናቆይ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ገቢ ጥሪ"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ገቢ የቪዲዮ ጥሪ"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"ገቢ የቪዲዮ ጥያቄ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"አዲስ የድምፅ መልዕክት"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"አዲስ የድምፅ መልዕክት<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ደውል <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"የማይታወቅ የድምፅ መልዕክት ቁጥር"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"ምንም አገልግሎት የለም"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"የተመረጠ አውታረመረብ(<xliff:g id="OPERATOR_NAME">%s</xliff:g>) የለም"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"መልስ"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"ዝጋ"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ቪድዮ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"ድምፅ"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ተቀበል"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"አሰናብት"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"መልሰህ ደውል"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"መልዕክት"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ለመደወል፣ መጀመሪያየአውሮፕላኑን ሁነታ አጥፋ።"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"በአውታረ መረቡ ላይ አልተመዘገበም።"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"የተንቀሳቃሽ አደራጅ የለም።"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ጥሪ አልተላከም፣ ትክክለኛ ቁጥር አልገባም።"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"ጥሪ አልተላከም።"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም።"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"አንድ ጥሪ ለማድረግ የሚሰራ ቁጥር ያስገቡ።"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"መደወል አልተቻለም።"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"የMMI sequence…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"የማይደገፍ አገልግሎት።"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"ጥሪዎችን ለመቀያየር አልተቻለም።"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"ጥሪዎችን ለመለየት አልተቻለም።"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"ጥሪዎችን ለመስደድ አልተቻለም።"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"ለስብሰባ ጥሪዎች አልተቻለም።"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"ጥሪ አለመቀበል አልተቻለም።"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"ጥሪ(ዎችን) ለመተው አልተቻለም።"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"የድምጽ መልዕክት ቁጥር አይታወቅም።"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"የበይነመረብ  ጥሪ"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"አገልግሎት አይደገፍም።"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ጥሪዎችን መቀያየር አልተቻለም።"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ጥሪን መለየት አልተቻለም።"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ማስተላለፍ አልተቻለም።"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"የጉባዔ ጥሪ ማድረግ አልተቻለም።"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ጥሪውን መዝጋት አልተቻለም።"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ጥሪ(ዎች)ን መልቀቅ አልተቻለም።"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"የSIP ጥሪ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"የአደጋ ጊዜ ጥሪ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ሬዲዮ ክፈት"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"ከአገልግሎት መስጫ ክልል ውጪ፣ ድጋሚ በመሞከር ላይ..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"ጥሪ አልተላከም፣ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአደጋ  ቁጥር አይደለም!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ጥሪ አልተላከም፣ እባክህ የአደጋ ጊዜ ቁጥር ደውል።"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ምንም አገልግሎት የለም። ዳግም በመሞከር ላይ…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"መደወል አልተቻለም። <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአስቸኳይ አደጋ ቁጥር አይደለም።"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"መደወል አልተቻለም። ወደ የአስቸኳይ አደጋ ቁጥር ይደውሉ።"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ለመደወል የሰሌዳ ቁልፍ ተጠቀም"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ጥሪ አቆይ"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ጥሪ ቀጥል"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ጥሪ አክል"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ጥሪዎችን አዋህድ"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ጥሪዎችን ቀያይር"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ያዝ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"መጨረሻ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"የመደወያ ሰሌዳ"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ጥሪዎችን አዋህድ"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ማገላበጥ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ጥሪዎችን አደራጅ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ስብሰባ አደራጅ"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"የስብሰባ ስልክ ጥሪ አቀናብር"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ኦዲዮ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"የቪዲዮ ጥሪ"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ወደ ድምጽ ጥሪ ይለውጡ"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ካሜራ ቀይር"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ቪድዮ ለአፍታ አቁም"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"ተጨማሪ አማራጮች"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"አገልግሎት"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"አዋቅር"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;አልተዘጋጀም &gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"የእራስዎን ይጻፉ..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"ይቅር"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"ላክ"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"አንድ"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"ሁለት"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ሦስት"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"አራት"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"አምስት"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ስድስት"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ሰባት"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ስምንት"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ዘጠኝ"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ኮከብ"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"ዜሮ"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ፓውንድ"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ደውል"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"የኋሊት ደምሳሽ"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"የስልክ ድምፅ ማጉያ ነቅቷል።"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ጥሪ ፀጥ  ብሏል"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"መልስ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS ላክ"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"አትቀበል"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"እንደ ቪድዮ ጥሪ ይመልሱ"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"እንደ ድምጽ ጥሪ ይመልሱ"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"የቪዲዮ ጥያቄ ተቀበል"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"የቪዲዮ ጥያቄ አትቀበል"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ላይ ያንሸራትቱ።"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ግራ ያንሸራትቱ።"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ቀኝ ያንሸራትቱ።"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"ለ<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደ ታች ያንሸራትቱ።"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ንዘር"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ንዘር"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ድምፅ"</string>
     <string name="default_notification_description" msgid="78174796906240970">"ነባሪ ድምጽ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"በሚደወልበት ጊዜ ንዘር"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"የመደወያ ሰሌዳ ድምፆች ዳስ"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"የመደወያ ሰሌዳ ራስ-ሙላ"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"የስልክ ሰሌዳ ራስ-አጠናቅቅ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"የደወል ቅላጼ እና ንዘረት"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"የስብሰባስልክ ጥሪ አደራጅ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"የአደጋ ጊዜ ቁጥር"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ar/strings.xml b/InCallUI/res/values-ar/strings.xml
index 5be8110..36e5e19 100644
--- a/InCallUI/res/values-ar/strings.xml
+++ b/InCallUI/res/values-ar/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"معلقة"</string>
     <string name="unknown" msgid="6878797917991465859">"غير معروف"</string>
     <string name="private_num" msgid="6713286113000232309">"رقم خاص"</string>
-    <string name="payphone" msgid="1931775086311769314">"هاتف الدفع"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"الخط مشغول"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"الشبكة مشغولة"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ليس هناك استجابة، انقضت المهلة المحددة"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"لا يمكن الوصول إلى الخادم"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"الرقم لا يمكن الوصول إليه"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"اسم المستخدم غير صحيح أو كلمة المرور غير صحيحة"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"تم الاتصال من خارج الشبكة"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"خطأ بالخادم: إعادة المحاولة لاحقًا."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"لا إشارة"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"‏تم تعدي حد ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"تم إيقاف اللاسلكي"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"‏لا تتوفر بطاقة SIM أو حدث خطأ في البطاقة"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"شبكة الجوال غير متاحة"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"‏يتم تقييد المكالمات الصادرة بواسطة FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"لا يمكنك إجراء مكالمات صادرة أثناء تشغيل حظر المكالمات."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"تم تقييد كل المكالمات بواسطة التحكم في الدخول."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"تم تقييد مكالمات الطوارئ بواسطة التحكم في الدخول."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"تم تقييد المكالمات العادية بواسطة التحكم في الدخول."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"الرقم غير صالح"</string>
+    <string name="payphone" msgid="4793877574636445118">"هاتف يعمل بالعملة"</string>
     <string name="confCall" msgid="1904840547188336828">"مكالمة جماعية"</string>
-    <string name="call_lost" msgid="317670617901479594">"تم فقد الاتصال."</string>
-    <string name="ok" msgid="3811371167865772377">"موافق"</string>
+    <string name="call_lost" msgid="6183862117003999578">"تم قطع المكالمة"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"السماعة"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"سماعة الأذن للهاتف"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"سماعة رأس سلكية"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"مكالمة جماعية <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"رقم البريد الصوتي"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"طلب"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"جارٍ إعادة المحاولة"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"جارٍ إعادة الطلب"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"مكالمة جماعية"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"مكالمة واردة"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"تم إنهاء الاتصال"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"إنهاء المكالمة"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"قيد الاتصال"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"رقمي هو <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"جارٍ الاتصال بالفيديو"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"مكالمة فيديو"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"جارٍ طلب الفيديو"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"يتعذر إجراء مكالمة فيديو"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"رقم معاودة الاتصال\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"رقم معاودة اتصال الطوارئ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"جارٍ الطلب"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"مكالمة فائتة"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"المكالمات الفائتة"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"مكالمة حالية"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"معلقة"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"مكالمة واردة"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"مكالمة فيديو واردة"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"طلب فيديو وارد"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"بريد صوتي جديد"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"بريد صوتي جديد (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"طلب <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"رقم البريد الصوتي غير معروف"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"لا خدمة"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"الشبكة المحددة (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) غير متاحة"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"الرد"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"قطع الاتصال"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"فيديو"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"الصوت"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"قبول"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"تجاهل"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"معاودة الاتصال"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"رسالة"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"لإجراء مكالمة، أوقف تشغيل وضع الطائرة أولاً."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"غير مسجل على الشبكة."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبكة الجوال غير متاحة."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"لم يتم إرسال الاتصال، لم يتم إدخال رقم صالح."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"لم يتم إرسال الاتصال."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"شبكة الجوّال غير متاحة."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"لإجراء مكالمة، أدخل رقمًا صالحًا."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"يتعذر الاتصال."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏جارٍ بدء تسلسل MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"خدمة غير معتمدة."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"يتعذر تبديل المكالمات."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"يتعذر فصل المكالمة."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"تعذر تحويل الاتصال."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"يتعذر إجراء مكالمات جماعية."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"يتعذر رفض المكالمة."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"يتعذر إجراء مكالمات."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"رقم البريد الصوتي غير معروف."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"مكالمة عبر الإنترنت"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"الخدمة ليست متوفرة."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"يتعذر تبديل المكالمات."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"يتعذر فصل المكالمة."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"يتعذر النقل."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"يتعذر إجراء مكالمة جماعية."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"يتعذر رفض المكالمة."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"يتعذر تحرير المكالمات."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"‏مكالمة SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"مكالمة الطوارئ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"جارٍ تشغيل اللاسلكي..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"خارج نطاق الخدمة، جارٍ إعادة المحاولة..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"لم يتم إرسال المكالمة. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ليس رقم طوارئ."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"لم يتم إرسال الاتصال. اطلب رقم طوارئ."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"لا تتوفر خدمة. جارٍ إعادة المحاولة…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"يتعذر الاتصال. لا يعد <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> رقم طوارئ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"يتعذر الاتصال. يمكنك طلب رقم طوارئ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استخدام لوحة المفاتيح للطلب"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"تعطيل المكالمة مؤقتًا"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"استئناف المكالمة"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"إضافة مكالمة"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"دمج المكالمات"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"تبديل المكالمات"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"تعليق"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"الانتهاء"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"لوحة الاتصال"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"دمج المكالمات"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تبديل"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"إدارة المكالمات"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"إدارة المؤتمر"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"إدارة مكالمة جماعية"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"الصوت"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"مكالمة فيديو"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"التغيير إلى مكالمة صوتية"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"تبديل الكاميرا"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"إيقاف الفيديو مؤقتًا"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"خيارات أخرى"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"الخدمة"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"الإعداد"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;لم يتم التعيين&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"اكتب ردك..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"إلغاء"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"إرسال"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"واحد"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"اثنان"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ثلاثة"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"أربعة"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"خمسة"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ستة"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"سبعة"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ثمانية"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"تسعة"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"نجمة"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"صفر"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"رنين"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"طلب"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"مسافة للخلف"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تم تمكين مكبر صوت الهاتف."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"تم كتم صوت المكالمة."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"رد"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏إرسال رسائل قصيرة SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"رفض"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"الرد بمكالمة فيديو"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"الرد بمكالمة صوتية"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"قبول طلب الفيديو"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"رفض طلب الفيديو"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"تمرير لأعلى لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"تمرير لليسار لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"تمرير لليمين لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"تمرير لأسفل لـ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"الاهتزاز"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"الاهتزاز"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"الصوت"</string>
     <string name="default_notification_description" msgid="78174796906240970">"الصوت الافتراضي (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"نغمة رنين الهاتف"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"اهتزاز عند الرنين"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"نغمات لمس لوحة الطلب"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"الإكمال التلقائي للوحة الاتصال"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"الإكمال التلقائي للوحة الطلب"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"نغمة الرنين والاهتزاز"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"إدارة مكالمة جماعية"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"رقم الطوارئ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"٤"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index f6bac18..208a27b 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Задържане на обаждането"</string>
     <string name="unknown" msgid="6878797917991465859">"Неизвестен номер"</string>
     <string name="private_num" msgid="6713286113000232309">"Частен номер"</string>
-    <string name="payphone" msgid="1931775086311769314">"Импулсен телефон"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Линията е заета"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Мрежата е заета"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Няма отговор – времето за изчакване изтече"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Няма връзка със сървъра"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Няма достъп до номера"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неправилно потребителско име или парола"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Обаждане извън мрежата"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Грешка в сървъра. Опитайте отново по-късно."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Няма сигнал"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Надвишено ограничение за ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Радиото е изкл."</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Няма SIM карта или грешка в SIM картата"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Мобилната мрежа не е налице"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Изходящите обаждания са ограничени от FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Не можете да провеждате изходящи обаждания, докато има забрана за обаждания."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Всички обаждания са ограничени от контрола за достъп."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Спешните обаждания са ограничени от контрола за достъп."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Нормалните обаждания са ограничени от контрола за достъп."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Невалиден номер"</string>
+    <string name="payphone" msgid="4793877574636445118">"Обществен телефон"</string>
     <string name="confCall" msgid="1904840547188336828">"Конферентно обаждане"</string>
-    <string name="call_lost" msgid="317670617901479594">"Разговорът се загуби."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Обаждането бе прекъснато"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Говорител"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Телефонна слушалка"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Слушалки с кабел"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Конферентно обаждане<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер за гласова поща"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набиране"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Извършва се повторен опит"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Набира се отново"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конферентно обаждане"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Вх. обаждане"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Обаждането завърши"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Приключване на разговора"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Вх. обаждане"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Моят номер е <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Установява се видеовръзка"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Видеообаждане"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Заявява се видеовръзка"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Видеообаждането не може да се осъществи"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Номер за обратно обаждане\n– <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Номер за спешно обратно обаждане\n– <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Набира се"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуснато обаждане"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуснати обаждания"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущо обаждане"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Задържане на обаждането"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Входящо обаждане"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Входящо видеообаждане"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Входяща заявка за видеовръзка"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова гласова поща"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова гласова поща на (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Набиране на <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Неизвестен номер за гласова поща"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Няма покритие"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Избраната мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) не е налична"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Отговор"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Затваряне"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Видеообаждане"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Гласово обаждане"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Приемам"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Отхвърляне"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Обратно обаждане"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Съобщение"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Първо изключете самолетния режим, за да може да осъществите обаждане."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Няма регистрация в мрежата."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Няма мобилна мрежа."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Обаждането не е изпратено, не е въведен валиден номер."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Обаждането не е изпратено."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Няма достъп до клетъчната мрежа."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да извършите обаждане, въведете валиден номер."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не може да се извърши обаждане."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Стартира се последователността MMI…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Неподдържана услуга."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Обажданията не могат да се превключат."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Обаждането не може да се отдели."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Обаждането не може да се прехвърли."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Не могат да се правят конферентни обаждания."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Обаждането не може да се отхвърли."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Обаждането или съответно обажданията не могат да се освободят."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Неизвестен номер за гласова поща."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Интернет обаждане"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Услугата не се поддържа."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Обажданията не могат да се превключат."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Обаждането не може да се отдели."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не може да се прехвърли."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Не може да се извърши конферентно обаждане."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Обаждането не може да се отхвърли."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Обаждането или съответно обажданията не могат да се освободят."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Обаждане чрез SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Спешно обаждане"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радиото се включва…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Район без покритие, извършва се повторен опит..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Обаждането не е извършено. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е спешен номер!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Обаждането не е извършено. Наберете спешен номер!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Няма услуга. Извършва се нов опит…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Не може да се извърши обаждане. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е номер за спешни случаи."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не може да се извърши обаждане. Наберете номер за спешни случаи."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Използвайте клавиатурата за набиране"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Задържане на обаждането"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Възобновяване на обаждането"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Добавяне на обаждане"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Обединяване на обаждания"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Размяна на обажданията"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Задържане"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Край"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Клавиатура за набиране"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обединяване на обаждания"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Размяна"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управление на обажданията"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Упр. на конференция"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Упр. на конф. обаждане"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видеообаждане"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Преминаване към гласово обаждане"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Превключване на камерата"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Поставяне на видеовръзката на пауза"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Още опции"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Услуга"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Настройка"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не е зададено&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напишете свой собствен..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Отказ"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Изпращане"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"едно"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"две"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"три"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"четири"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"пет"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"шест"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"седем"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"осем"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"девет"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"звездичка"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"нула"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"диез"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"набиране"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Високоговорителят бе активиран."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Обаждането бе спряно."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Отговор"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Изпращане на SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Отхвърлям"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Приемане като видеообаждане"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Приемане като аудиообаждане"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Приемане на заявката за видеовръзка"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Отхвърляне на заявката за видеовръзка"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Плъзнете нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Плъзнете наляво за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Плъзнете надясно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Плъзнете надолу за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибриране"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибриране"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Стандартен звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Мелодия на телефона"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибриране при звънене"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Тонове при набиране"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Авт. довършване на клавиат. за набиране"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Набиране: Авт. довършване"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодия и вибриране"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управление на конферентно обаждане"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Спешен номер"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml
index 6c10a15..c7fce65 100644
--- a/InCallUI/res/values-bn-rBD/strings.xml
+++ b/InCallUI/res/values-bn-rBD/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="unknown" msgid="6878797917991465859">"অজানা"</string>
     <string name="private_num" msgid="6713286113000232309">"ব্যক্তিগত নম্বর"</string>
-    <string name="payphone" msgid="1931775086311769314">"অর্থের বিনিময়ে কল করার ফোন"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"লাইন ব্যস্ত"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"নেটওয়ার্ক ব্যস্ত"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"কোনো প্রতিক্রিয়া নেই, সময় শেষ হয়ে গেছে"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"সার্ভারে পৌঁছানো যাচ্ছে না"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"নম্বরটিতে সংযোগ স্থাপন করা যাচ্ছে না"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ভুল ব্যবহারকারীর নাম বা পাসওয়ার্ড"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"নেটওয়ার্কের বাইরে থেকে কল করা হয়েছে"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"সার্ভার ত্রুটি৷ পরে আবার চেষ্টা করুন৷"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"কোনো সংকেত নেই"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM এর সীমা অতিক্রম করেছে"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"রেডিও বন্ধ"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"কোনো SIM নেই বা SIM ত্রুটি"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"মোবাইল নেটওয়ার্ক অনুপলব্ধ"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN এর দ্বারা আউটগোয়িং কলগুলি সীমাবদ্ধ করা আছে৷"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"কল প্রতিবন্ধকতা চালু থাকা অবস্থায় আপনি আউটগোয়িং কল করতে পারবেন না৷"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"অ্যাক্সেস নিয়ন্ত্রণের দ্বারা সমস্ত কল সীমাবদ্ধ করা আছে৷"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"অ্যাক্সেস নিয়ন্ত্রণের দ্বারা জরুরি কলগুলি সীমাবদ্ধ করা আছে৷"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"অ্যাক্সেস নিয়ন্ত্রণের দ্বারা সাধারণ কলগুলি সীমাবদ্ধ করা আছে৷"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"অবৈধ নম্বর"</string>
+    <string name="payphone" msgid="4793877574636445118">"পে ফোন"</string>
     <string name="confCall" msgid="1904840547188336828">"কনফারেন্স কল"</string>
-    <string name="call_lost" msgid="317670617901479594">"কলের সংযোগ বিচ্ছিন্ন হয়ে গেছে৷"</string>
-    <string name="ok" msgid="3811371167865772377">"ঠিক আছে"</string>
+    <string name="call_lost" msgid="6183862117003999578">"কল সমাপ্ত হয়েছে"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"স্পিকার"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"হ্যান্ডসেট ইয়ারপিস"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"তারযুক্ত হেডসেট"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"কনফারেন্স কল <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ভয়েসমেল নম্বর"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ডায়াল করা হচ্ছে"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"পুনরায় চেষ্টা করা হচ্ছে"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"পুনরায় ডায়াল করা হচ্ছে"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"কনফারেন্স কল"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ইনকামিং কল"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"কল সমাপ্ত হয়েছে"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"কল নামিয়ে রাখা হচ্ছে"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"কল চলছে"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"আমার নম্বর হল <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ভিডিও সংযুক্ত করছে"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ভিডিও কল"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ভিডিওর অনুরোধ করছে"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ভিডিও কলে সংযোগ করা যাচ্ছে না"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"আপনার কলব্যাক নম্বর\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"আপনার জরুরী কলব্যাক নম্বর\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ডায়াল করা হচ্ছে"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"মিসড কল"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"মিসড কলগুলি"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"চালু থাকা কল"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ইনকামিং কল"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ইনকামিং ভিডিও কল"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"আগত ভিডিও অনুরোধ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"নতুন ভয়েসমেল"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"নতুন ভয়েসমেল (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> এ ডায়াল করুন"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ভয়েসমেল নম্বর অজানা"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"কোনো পরিষেবা নেই"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"নির্বাচিত নেটওয়ার্ক (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) অনুপলব্ধ"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"উত্তর"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"কল নামিয়ে রাখুন"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ভিডিও"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"ভয়েস"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"স্বীকার করুন"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"খারিজ করুন"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"কল ব্যাক করুন"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"বার্তা"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"একটি কল করতে, প্রথমে বিমান মোড বন্ধ করুন৷"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"নেটওয়ার্কে নিবন্ধিত নয়৷"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"মোবাইল নেটওয়ার্ক উপলব্ধ নয়৷"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"কল করা যায়নি, কোনো বৈধ নম্বর লেখা হয়নি৷"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"কল করা যায়নি৷"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"সেলুলার নেটওয়ার্ক উপলব্ধ নয়।"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"কোনো কল স্থাপন করতে, একটি বৈধ নম্বর লিখুন৷"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"কল করা যাবে না৷"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI ক্রম চালু হচ্ছে…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"অসমর্থিত পরিষেবা৷"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"কলগুলির মধ্যে স্যুইচ করা যায়নি৷"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"কল আলাদা করা যায়নি৷"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"কল স্থানান্তর করা যায়নি৷"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"কনফারেন্স কলগুলি করা যায়নি৷"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"কল প্রত্যাখ্যান করা যায়নি৷"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"কল(গুলি) রিলিজ করা যায়নি৷"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"ভয়েসমেল নম্বর অজানা৷"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ইন্টারনেট কল"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"পরিষেবা সমর্থিত নয়৷"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"কলগুলি স্যুইচ করা যাবে না৷"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"কল আলাদা করা যাবে না৷"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"হস্তান্তর করা যাবে না৷"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"কনফারেন্স করা যাবে না৷"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"কল প্রত্যাখ্যান কলা যাবে না৷"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"কল(গুলি) কাটা যাবে না৷"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP কল"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"জরুরি কল"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"রেডিও চালু করা হচ্ছে…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"পরিষেবা এলাকার বাইরে, আবার চেষ্টা করা হচ্ছে…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"কল করা যায়নি৷ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> একটি জরুরি নম্বর নয়!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"কল করা যায়নি৷ একটি জরুরি নম্বরে ডায়াল করুন!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"কোন পরিষেবা নেই৷ আবার চেষ্টা করা হচ্ছে..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"কল করা যাবে না৷ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> কোনো জরুরী নম্বর নয়৷"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"কল করা যাবে না৷ কোনো জরুরী নম্বর ডায়াল করুন৷"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ডায়াল করতে কীবোর্ড ব্যবহার করুন"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"কল সাময়িক স্থগিত করুন"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"কল পুনঃসূচনা করুন"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"কল যোগ করুন"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"কলগুলি মার্জ করুন"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"কল অদল বদল করুন"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ধরে থাকুন"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"শেষ করুন"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ডায়ালপ্যাড"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"কলগুলি মার্জ করুন"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"সোয়াপ করুন"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"কলগুলি পরিচালনা করুন"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"কনফারেন্স পরিচালনা করুন"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"কনফারেন্স কল পরিচালনা করুন"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"অডিও"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ভিডিও কল"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ভয়েস কলে পরিবর্তন করুন"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ক্যামেরা স্যুইচ করুন"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ভিডিও বিরাম দিন"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"আরো বিকল্প"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"পরিষেবা"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"সেটআপ"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;সেট করা নেই&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"আপনার নিজের পছন্দ মতো লিখুন…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"বাতিল করুন"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"পাঠান"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"এক"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"দুই"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"তিন"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"চার"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"পাঁচ"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ছয়"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"সাত"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"আট"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"নয়"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"তারকা"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"শূন্য"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"পাউন্ড"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ডায়াল করুন"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"ব্যাক-স্পেস"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"স্পীকারফোন সক্ষম করা আছে৷"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"কল নিঃশব্দ করা আছে৷"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"উত্তর"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS পাঠান"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"অস্বীকার করুন"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ভিডিও কল হিসেবে উত্তর দিন"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"অডিও কল হিসেবে উত্তর দিন"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ভিডিওর অনুরোধ গ্রহণ করুন"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ভিডিওর অনুরোধ প্রত্যাখ্যান করুন"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য উপরের দিকে স্লাইড করুন৷"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য বাম দিকে স্লাইড করুন৷"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য ডান দিকে স্লাইড করুন৷"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য নীচের দিকে স্লাইড করুন৷"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"কম্পন"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"কম্পন"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"শব্দ"</string>
     <string name="default_notification_description" msgid="78174796906240970">"ডিফল্ট শব্দ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ফোন রিংটোন"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"রিং হওয়ার সময় কম্পন হবে"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ডায়াল প্যাড স্পর্শ টোন"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"স্বয়ংসম্পূর্ণ ডায়াল প্যাড"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ডায়ালপ্যাড স্বয়ংপূর্ণ করা"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"রিংটোন ও কম্পন"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"কনফারেন্স কল পরিচালনা করুন"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"জরুরি নম্বর"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"০"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"১"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"২"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"৩"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"৪"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"৫"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"৬"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"৭"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"৮"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"৯"</string>
 </resources>
diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index 77ec3ad..7058a37 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconegut"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privat"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telèfon de monedes"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Línia ocupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Xarxa ocupada"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"No hi ha resposta, s\'ha esgotat el temps d\'espera"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"No es pot accedir al servidor"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"No es pot contactar amb aquest número"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nom d\'usuari o contrasenya incorrectes"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Trucada des de fora de la xarxa"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Error del servidor. Torna-ho a provar més tard."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Sense senyal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Límit d\'ACM superat"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Senyal mòbil desactivat"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Cap SIM o error de la SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"La xarxa de telefonia mòbil no està disponible."</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN restringeix les trucades de sortida."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"No pots fer trucades de sortida mentre la restricció de trucades estigui activada."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Totes les trucades estan restringides pel control d\'accés."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Les trucades d\'emergència estan restringides pel control d\'accés."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Les trucades normals estan restringides pel control d\'accés."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número no vàlid"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telèfon públic"</string>
     <string name="confCall" msgid="1904840547188336828">"Trucada de conferència"</string>
-    <string name="call_lost" msgid="317670617901479594">"S\'ha perdut la trucada."</string>
-    <string name="ok" msgid="3811371167865772377">"D\'acord"</string>
+    <string name="call_lost" msgid="6183862117003999578">"La trucada s\'ha interromput."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altaveu"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricular de microtelèfon"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auricular amb cable"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Trucada de conferència <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del correu de veu"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"S\'està marcant"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"S\'està tornant a provar"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"S\'està tornant a marcar"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Trucada de conferència"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Trucada entrant"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Trucada finalitzada"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"S\'està penjant"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"En una trucada"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"El meu número és <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"S\'està connectant el vídeo"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videotrucada"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"S\'està sol·licitant el vídeo"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"No es pot connectar la videotrucada"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Número de devolució de trucada\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Número de devolució de trucada d\'emergència\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Marcatge"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Trucada perduda"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Trucades perdudes"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Trucada en procés"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Trucada entrant"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videotrucada entrant"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Sol·licitud de vídeo entrant"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Correu de veu nou"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Correu de veu nou (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marca <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número del correu de veu desconegut"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sense servei"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La xarxa seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no està disponible"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Respon"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Penja"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vídeo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Veu"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accepta"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Omet"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Torna la trucada"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Missatge"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Per fer una trucada, primer apagueu el mode d\'avió."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrat a la xarxa."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"La xarxa mòbil no està disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"No s\'ha enviat la trucada perquè no s\'ha introduït cap número vàlid."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"No s\'ha enviat la trucada."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"La xarxa mòbil no està disponible."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Per realitzar una trucada, introdueix un número vàlid."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"No es pot trucar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"S\'està iniciant la seqüència MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servei no compatible."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"No es poden canviar les trucades."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"No es pot separar la trucada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"No es pot transferir la trucada."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"No es poden fer trucades de conferència."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"No es pot rebutjar la trucada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es pot alliberar les trucades."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"El número de la bústia de veu és desconegut."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Trucada per Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"El servei no és compatible."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No es pot canviar de trucada."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No es pot separar la trucada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"No es poden realitzar transferències."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"No es pot establir la conferència."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"No es pot rebutjar la trucada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"No es poden alliberar trucades."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Trucada de SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Trucada d\'emergència"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"S\'està activant el senyal mòbil..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fora de l\'àrea de servei; s\'està tornant a provar..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"No s\'ha enviat la trucada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Trucada no enviada. Marca un número d\'emergència."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No hi ha servei. S\'està tornant a provar..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"No es pot trucar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"No es pot trucar. Marca un número d\'emergència."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilitzeu el teclat per marcar"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Posa la trucada en espera"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Reprèn la trucada"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Afegeix una trucada"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Combina les trucades"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Canvia les trucades"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Posa en espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Final"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclat"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combina les trucades"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Canvia"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestiona les trucades"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestiona conferència"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gestiona la conferència"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Àudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videotrucada"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Canvia a trucada"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Canvia la càmera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Posa en pausa el vídeo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Més opcions"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servei"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuració"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;No definit&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escriu la teva…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel·la"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Envia"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatre"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinc"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"set"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"vuit"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nou"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"estrella"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"coixinet"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"marca"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retrocés"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altaveu activat."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Trucada silenciada."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Resposta"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envia SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rebutja"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Respon amb una trucada de vídeo."</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Respon amb una trucada d\'àudio."</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accepta la sol·licitud de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rebutja la sol·licitud de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Fes lliscar el dit cap amunt per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Fes lliscar el dit cap a l\'esquerra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Fes lliscar el dit cap a la dreta per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Fes lliscar el dit cap avall per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibra"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibra"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"So"</string>
     <string name="default_notification_description" msgid="78174796906240970">"So predeterminat (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"So de trucada"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar en sonar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sonar en marcar els números"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar amb teclat"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Compleció automàtica de teclat"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"So i vibració"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestiona la trucada de conferència"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número d\'emergència"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index 47b6cfd..c5b2485 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Přidržený hovor"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznámý volající"</string>
     <string name="private_num" msgid="6713286113000232309">"Soukromé číslo"</string>
-    <string name="payphone" msgid="1931775086311769314">"Veřejný telefon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linka je obsazená."</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Síť je zaneprázdněna."</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Bez odezvy, vypršel časový limit"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server je nedostupný"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Volané číslo je nedostupné"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nesprávné uživatelské jméno nebo heslo"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Volání z vně sítě"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Chyba serveru: Zkuste to znovu později."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Není signál."</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Byl dosažen limit ACM."</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio je vypnuto"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM karta chybí nebo nefunguje."</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilní síť je nedostupná"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odchozí hovory jsou omezeny na povolená telefonní čísla."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Pokud je zapnuto blokování hovorů, nelze provádět odchozí hovory."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Všechny hovory jsou omezeny řízením přístupu."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Tísňová volání jsou omezena řízením přístupu."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Běžné hovory jsou omezeny řízením přístupu."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neplatné číslo"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonní automat"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenční hovor"</string>
-    <string name="call_lost" msgid="317670617901479594">"Hovor byl ztracen."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Volání zrušeno"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Reproduktor"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Sluchátko"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabelová náhlavní soupr."</string>
@@ -57,14 +37,20 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenční hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasové schránky"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Vytáčení"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nový pokus"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Opakované vytáčení"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenční hovor"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Příchozí hovor"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Hovor ukončen"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Přidržený hovor"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"Zavěšování"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Ukončování hovoru"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Probíhá hovor"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Moje číslo je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Navazování spojení pro video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videohovor"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Požadování videa"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videohovor nelze zahájit"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Vaše číslo pro zpětné volání\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Vaše číslo pro tísňové zpětné volání\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Vytáčení"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Zmeškaný hovor"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Probíhající hovor"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Přidržený hovor"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Příchozí hovor"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Příchozí videohovor"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Příchozí žádost o videohovor"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová zpráva"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nová hlasová zpráva (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Volat hlasovou schránku <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Číslo hlasové schránky je neznámé."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Žádný signál"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Vybraná síť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) není k dispozici"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Přijmout"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Zavěsit"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Hlasový hovor"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Přijmout"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Zavřít"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zavolat zpět"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Zpráva"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Chcete-li telefonovat, vypněte nejprve režim V letadle."</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"Chcete-li telefonovat, vypněte nejprve režim Letadlo."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Přihlášení k síti nebylo úspěšné."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilní síť je nedostupná."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Hovor nelze spojit, nebylo zadáno platné číslo."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Hovor nebyl spojen."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilní síť je nedostupná."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Chcete-li uskutečnit hovor, zadejte platné telefonní číslo."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Hovor nelze uskutečnit."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Spouštění sekvence MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodporovaná služba."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Hovory nelze přepnout."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Hovor nelze oddělit."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Hovor nelze předat."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Hovory nelze spojit do konferenčního hovoru."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Hovor nelze odmítnout."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Hovor není možné uvolnit."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Číslo hlasové schránky není známo."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetový hovor"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Služba není podporována."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Hovory nelze přepnout."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Hovor nelze rozdělit."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Hovor nelze předat."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferenční hovor nelze uskutečnit."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Hovor nelze odmítnout."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Hovor nelze ukončit."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Volání SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Tísňové volání"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Zapínání rádia..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Nepokrytá oblast, opakování pokusu..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Hovor nelze spojit, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> není číslo nouzového volání."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Hovor nebyl spojen. Vytočte prosím číslo tísňového volání."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Služba je nedostupná. Probíhá další pokus…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Hovor nelze uskutečnit. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> není číslo tísňového volání."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Hovor nelze uskutečnit. Vytočte číslo tísňového volání."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Číslo vytočíte pomocí klávesnice."</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Podržet hovor"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Obnovit hovor"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Přidat hovor"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Spojit hovory"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Přepnout hovory"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Přidržet"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ukončit"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Číselník"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spojit hovory"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zaměnit"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Spravovat hovory"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Spravovat konferenci"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Správa konf. hovoru"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohovor"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Změnit na hlasové volání"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Přepnout fotoaparát"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pozastavit video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Další možnosti"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Služba"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfigurace"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nenastaveno&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napsat vlastní odpověď..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Zrušit"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Odeslat"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jedna"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dvě"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tři"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"čtyři"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pět"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šest"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedm"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osm"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devět"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"hvězdička"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nula"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"vytáčení"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Reproduktor je zapnutý."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Hovor ztlumen."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odpověď"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Odeslat SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odmítnout"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Přijmout jako videohovor"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Přijmout jako hlasový hovor"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Přijmout žádost o videhovor"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odmítnout žádost o videohovor"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Přejeďte prstem nahoru: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Přejeďte prstem doleva: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Přejeďte prstem doprava: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Přejeďte prstem dolů: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrace"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrace"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Výchozí zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Vyzváněcí tón telefonu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrace při vyzvánění"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tóny při dotyku číselníku"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autom. doplňování číselníku"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Aut. doplňování číselníku"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Vyzvánění a vibrace"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Spravovat konferenční hovor"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Číslo tísňové linky"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml
index ca93f4a..bf7c62f 100644
--- a/InCallUI/res/values-da/strings.xml
+++ b/InCallUI/res/values-da/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Ventende"</string>
     <string name="unknown" msgid="6878797917991465859">"Ukendt"</string>
     <string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Betalingstelefon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linjen er optaget"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Netværket er optaget"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Intet svar, timeout"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveren er ikke tilgængelig"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummeret er ikke tilgængeligt"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Forkert brugernavn eller adgangskode"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Opkald uden for netværk"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Serverfejl. Prøv igen senere."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Der er intet signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-grænsen er overskredet"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Slå radio fra"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Der er intet SIM-kort, eller der er SIM-kortfejl"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilnetværket er ikke tilgængeligt"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Udgående opkald er begrænset til angivne opkaldsnumre."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan ikke foretage udgående opkald, mens opkaldsspærring er slået til."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle opkald er begrænset af adgangskontrol."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nødopkald er begrænset af adgangskontrol."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normale opkald er begrænset af adgangskontrol."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ugyldigt antal"</string>
+    <string name="payphone" msgid="4793877574636445118">"Mønttelefon"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonmøde"</string>
-    <string name="call_lost" msgid="317670617901479594">"Opkaldet er mistet."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Opkaldet blev droppet."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Højttaler"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Ørestykke til håndsæt"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Headset med ledning"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøde <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Telefonsvarernummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer op"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Prøver igen"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Ringer op igen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonmøde"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Indgående opkald"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Opkaldet er afsluttet"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lægger på"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Opkald i gang"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mit nummer er <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Opretter forbindelse til video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videoopkald"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Anmoder om video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Kan ikke forbinde videoopkald"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Dit tilbagekaldsnummer\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Dit tilbagekaldsnummer til nødopkald\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Ringer op"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ubesvarede opkald"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ubesvarede opkald"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Igangværende opkald"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ventende"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Indgående opkald"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Indgående videoopkald"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Indgående videoanmodning"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ny telefonsvarerbesked"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nye telefonsvarerbeskeder (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring til <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Telefonsvarernummeret er ukendt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen dækning"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Det valgte netværk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgængeligt"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Svar"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Læg på"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Tale"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Besvar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Afvis"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring tilbage"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Besked"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Slå Flytilstand fra først for at foretage et opkald."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ikke registreret på netværk."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilnetværket er ikke tilgængeligt."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Opkaldet blev ikke sendt. Der blev ikke indtastet et gyldigt nummer."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Opkaldet blev ikke sendt."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilnetværket er ikke tilgængeligt."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Indtast et gyldigt nummer for at foretage et opkald."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan ikke ringe op."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starter MMI-sekvens ..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Tjenesten understøttes ikke."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Der kan ikke skiftes mellem opkald."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Opkaldet kunne ikke separeres."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Opkaldet kunne ikke overføres."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Der kunne ikke oprettes mødeopkald."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Opkaldet kunne ikke afvises."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Der kunne ikke foretages opkald."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Telefonsvarernummeret er ukendt"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetopkald"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Tjenesten er ikke understøttet."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan ikke skifte opkald."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan ikke adskille opkald."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan ikke overføre."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Kan ikke oprette telefonmøde."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan ikke afvise opkaldet."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan ikke frigive et eller flere opkald."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-opkald"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødopkald"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Tænder for radio ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Uden for dækning. Prøver igen ..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Opkaldet blev ikke sendt. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Opkaldet blev ikke sendt. Indtast et nødnummer."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjeneste. Prøver igen..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan ikke ringe op. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et alarmnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan ikke ringe op. Ring til et alarmnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Brug tastatur til at ringe op"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Sæt opkald i venteposition"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Genoptag opkald"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Tilføj opkald"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Saml opkald"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Byt opkald"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Afslut"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Nummerblok"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Slå opkald sammen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Skift"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrer opkald"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Admin. konference"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Administrer telefonmøde"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Lyd"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videoopkald"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Skift til stemmeopkald"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Skift kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Sæt video på pause"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Flere valgmuligheder"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Tjeneste"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfiguration"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ikke angivet&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv dit eget svar..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuller"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"en"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"to"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fire"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fem"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seks"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"syv"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"otte"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ni"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"stjerne"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nul"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pund"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ring op"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"tilbage"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Højttalertelefon aktiveret."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Lyd slået fra opkald."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send sms"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Afvis"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Besvar som videoopkald"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Besvar som lydopkald"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acceptér videoanmodning"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Afvis videoanmodning"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Skub op for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Skub til venstre for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Skub til højre for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Glid ned for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ringetone for opkald"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrer ved opringning"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tastaturtoner"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autofuldfør på num. tastatur"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autofuldfør numerisk tastatur"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibration"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer telefonmøde"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nødnummer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index b23eb1a..8d4f044 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Gehaltener Anruf"</string>
     <string name="unknown" msgid="6878797917991465859">"Unbekannt"</string>
     <string name="private_num" msgid="6713286113000232309">"Private Nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonzelle"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Leitung besetzt"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Netzwerk ausgelastet"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Keine Antwort, Zeitüberschreitung"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server nicht erreichbar"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummer nicht erreichbar"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Ungültiger Nutzername oder ungültiges Passwort"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Anruf außerhalb des Netzwerks"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Serverfehler. Bitte versuchen Sie es später erneut."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Kein Signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-Grenzwert überschritten"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Mobilfunkverbindung aus"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Keine SIM-Karte oder SIM-Kartenfehler"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilfunknetz nicht verfügbar"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Ausgehende Anrufe unterliegen der Anrufbegrenzung."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Sie können keine Anrufe tätigen, wenn die Anrufsperre aktiviert ist."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle Anrufe werden durch die Zugriffssteuerung beschränkt."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Notrufe werden durch die Zugriffssteuerung beschränkt."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normale Anrufe werden durch die Zugriffssteuerung beschränkt."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ungültige Nummer"</string>
+    <string name="payphone" msgid="4793877574636445118">"Münztelefon"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonkonferenz"</string>
-    <string name="call_lost" msgid="317670617901479594">"Anruf ist verloren gegangen."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Anruf abgebrochen"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Lautsprecher"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handy-Kopfhörer"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabelgebundenes Headset"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonkonferenz <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Mailboxnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Rufaufbau"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Wird wiederholt"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Wahlwiederholung"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonkonferenz"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Eingehender Anruf"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Anruf beendet"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Auflegen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Anruf"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Meine Nummer lautet <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>."</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Videoverbindung wird hergestellt."</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videoanruf"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Videoanfrage wird gesendet."</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videoanruf kann nicht verbunden werden."</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Ihre Rückrufnummer:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Ihre Notrufnummer:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Verbindung wird aufgebaut..."</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Entgangener Anruf"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Entgangene Anrufe"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktueller Anruf"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Gehaltener Anruf"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Eingehender Anruf"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Eingehender Videoanruf"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Eingehende Videoanfrage"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Neue Nachricht"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Neue Nachricht (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> wählen"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mailboxnummer unbekannt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"kein Dienst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Ausgewähltes Netzwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nicht verfügbar"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Annehmen"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Beenden"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Videoanruf"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Nur Audio"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Akzeptieren"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ablehnen"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zurückrufen"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Nachricht"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Deaktivieren Sie zunächst den Flugmodus, um einen Anruf zu tätigen."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nicht in Netzwerk registriert."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilfunknetz ist nicht verfügbar."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Anruf nicht verbunden; keine gültige Nummer."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Anruf nicht verbunden."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilfunknetz nicht verfügbar"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Geben Sie eine gültige Nummer ein."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Anruf nicht möglich."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-Sequenz wird gestartet..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nicht unterstützter Dienst."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Wechsel zwischen Anrufen nicht möglich."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Anruf kann nicht getrennt werden."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Anruf kann nicht übertragen werden."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Keine Telefonkonferenz möglich."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Anruf kann nicht abgelehnt werden."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Anrufe können nicht freigegeben werden."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Mailboxnummer unbekannt"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetanruf"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Dienst wird nicht unterstützt."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Anruf kann nicht gewechselt werden."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Anruf kann nicht getrennt werden."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Anruf kann nicht übergeben werden."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferenzschaltung nicht möglich."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Anruf kann nicht abgelehnt werden."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Anrufe können nicht freigegeben werden."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-Anruf"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Notruf"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Mobilfunkverbindung wird aktiviert..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Gebiet ohne Netzabdeckung, erneuter Versuch..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Anruf nicht verbunden. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ist keine Notrufnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Anruf nicht verbunden. Wählen Sie eine Notrufnummer!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Kein Service. Erneuter Versuch..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Anruf nicht möglich. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ist keine Notrufnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Anruf nicht möglich. Wählen Sie eine Notrufnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Zum Wählen Tastatur verwenden"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Anruf halten"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Anruf fortsetzen"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Anruf hinzufügen"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Anrufe verbinden"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Wechseln"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Halten"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ende"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Wähltasten"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Anrufe verbinden"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wechseln"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Anrufe verwalten"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferenz verwalten"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Konferenz verwalten"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videoanruf"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Zu Sprachanruf wechseln"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Kamera wechseln"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Video pausieren"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Weitere Optionen"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Dienst"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Einrichtung"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nicht festgelegt&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Eigene Antwort schreiben..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Abbrechen"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Senden"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"Eins"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"Zwei"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"Drei"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"Vier"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"Fünf"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"Sechs"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"Sieben"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"Acht"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"Neun"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"Sternsymbol"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"Null"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"Pfund"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"Wählen"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Rücktaste"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Freisprechfunktion aktiviert"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Anruf stummgeschaltet"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antworten"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS senden"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Ablehnen"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Antworten mit Videoanruf"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Antworten mit Audioanruf"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Videoanfrage akzeptieren"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Videoanfrage ablehnen"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach oben schieben"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach links schieben"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach rechts schieben"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Zum <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach unten schieben"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Töne"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Standardklingelton (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Klingelton"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Beim Klingeln vibrieren"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Wähltastentöne"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autovervollst. für Wähltasten"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Wähltasten-Autovervollständigung"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Klingelton &amp; Vibration"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonkonferenz verwalten"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Notrufnummer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-el/strings.xml b/InCallUI/res/values-el/strings.xml
index 5bc8b2c..e668ddf 100644
--- a/InCallUI/res/values-el/strings.xml
+++ b/InCallUI/res/values-el/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Σε αναμονή"</string>
     <string name="unknown" msgid="6878797917991465859">"Άγνωστος"</string>
     <string name="private_num" msgid="6713286113000232309">"Απόκρυψη"</string>
-    <string name="payphone" msgid="1931775086311769314">"Καρτοτηλέφωνο"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Η γραμμή είναι απασχολημένη"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Το δίκτυο είναι απασχολημένο"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Καμία απάντηση, το χρονικό όριο έληξε"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Αδυναμία πρόσβασης σε διακομιστή"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Δεν είναι δυνατή η κλήση του αριθμού"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Εσφαλμένο όνομα χρήστη ή κωδικός πρόσβασης"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Κλήση εκτός δικτύου"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Σφάλμα διακομιστή: Δοκιμάστε ξανά αργότερα."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Δεν υπάρχει σήμα"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Υπέρβαση ορίου ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Ο πομπός είναι απενεργοποιημένος"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Δεν υπάρχει κάρτα SIM ή σφάλμα κάρτας SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Μη διαθέσιμο δίκτυο κινητής τηλεφωνίας"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Οι εξερχόμενες κλήσεις περιορίζονται από το FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Δεν μπορείτε να πραγματοποιήσετε εξερχόμενες κλήσεις όσο η φραγή κλήσεων είναι ενεργοποιημένη."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Όλες οι κλήσεις περιορίζονται από τον έλεγχο πρόσβασης."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Οι κλήσεις επείγουσας ανάγκης περιορίζονται από τον έλεγχο πρόσβασης."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Οι κανονικές κλήσεις περιορίζονται από τον έλεγχο πρόσβασης."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Μη έγκυρος αριθμός"</string>
+    <string name="payphone" msgid="4793877574636445118">"Τηλέφωνο με χρέωση"</string>
     <string name="confCall" msgid="1904840547188336828">"Κλήση συνδιάσκεψης"</string>
-    <string name="call_lost" msgid="317670617901479594">"Αναπάντητη κλήση."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Η κλήση απορρίφθηκε"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Ηχείο"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Ακουστικό"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Ενσύρ. ακουστ."</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Κλήση συνδιάσκεψης <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Αριθμός αυτόματου τηλεφωνητή"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Κλήση"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Νέα προσπάθεια"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Επανάκληση"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Κλήση συνδιάσκεψης"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Εισερχόμενη κλήση"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Η κλήση τερματίστηκε"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Κλείσιμο γραμμής"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Σε κλήση"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Ο αριθμός μου είναι <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Σύνδεση βίντεο"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Βιντεοκλήση"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Αίτημα βίντεο"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Δεν είναι δυνατή η σύνδεση βιντεοκλησης"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Αριθμός επανάκλησης\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Αριθμός επανάκλησης έκτακτης ανάγκης\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Κλήση"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Αναπάντητη κλήση"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Αναπάντητες κλήσεις"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Κλήση σε εξέλιξη"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Σε αναμονή"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Εισερχόμενη κλήση"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Εισερχόμενη βιντεοκλήση"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Αίτημα εισερχόμενου βίντεο"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Νέο μήνυμα στον αυτόματο τηλεφωνητή"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Νέο μήνυμα στον αυτόματο τηλεφωνητή (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Καλέστε <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ο αριθμός αυτόματου τηλεφωνητή είναι άγνωστος"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Δίκτυο μη διαθέσιμο"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Επιλεγμένο δίκτυο (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) μη διαθέσιμο"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Απάντηση"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Τερματισμός κλήσης"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Βίντεο"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Φωνητική κλήση"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Αποδοχή"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Παράβλεψη"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Επανάκληση"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Μήνυμα"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Για να πραγματοποιήσετε μια κλήση, απενεργοποιήστε πρώτα τη λειτουργία πτήσης."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Δεν έχετε εγγραφεί στο δίκτυο."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Η κλήση δεν πραγματοποιήθηκε, δεν έγινε εισαγωγή έγκυρου αριθμού."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"H κλήση δεν πραγματοποιήθηκε."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Για να πραγματοποιήσετε κλήση, εισαγάγετε έναν έγκυρο αριθμό."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Δεν είναι δυνατή η κλήση."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Έναρξη ακολουθίας MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Μη υποστηριζόμενη υπηρεσία."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Αδύνατη η εναλλαγή κλήσεων."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Δεν ήταν δυνατός ο διαχωρισμός της κλήσης."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Δεν ήταν δυνατή η μεταφορά της κλήσης."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Αδύνατη η πραγματοποίηση κλήσεων συνδιάσκεψης."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Δεν ήταν δυνατή η απόρριψη της κλήσης."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Αδύνατη η επαναφορά κλήσης (κλήσεων)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Άγνωστος αριθμός αυτόματου τηλεφωνητή"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Κλήση Διαδικτύου"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Η υπηρεσία δεν υποστηρίζεται."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Δεν είναι δυνατή η εναλλαγή κλήσεων."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Δεν είναι δυνατός ο διαχωρισμός της κλήσης."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Δεν είναι δυνατή η μεταφορά."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Δεν είναι δυνατή η συνδιάσκεψη."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Δεν είναι δυνατή η απόρριψη της κλήσης."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Δεν είναι δυνατή η πραγματοποίηση κλήσεων."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Κλήση SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Κλήσεις επείγουσας ανάγκης"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ενεργοποίηση πομπού..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Εκτός περιοχής κάλυψης, επανάληψη κλήσης..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Η κλήση δεν πραγματοποιήθηκε. Το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός έκτακτης ανάγκης!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Η κλήση δεν πραγματοποιήθηκε. Καλέστε έναν αριθμό επείγουσας ανάγκης!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Δεν υπάρχει υπηρεσία. Νέα προσπάθεια…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Δεν είναι δυνατή η κλήση. Το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός έκτακτης ανάγκης."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Δεν είναι δυνατή η κλήση. Πληκτρολογήστε έναν αριθμό έκτακτης ανάγκης."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Χρησιμοποιήστε το πληκτρολόγιο για να πραγματοποιήσετε καλέσετε έναν αριθμό"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Αναμονή κλήσης"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Συνέχιση κλήσης"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Προσθήκη κλήσης"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Συγχώνευση κλήσεων"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Αλλαγή κλήσεων"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Αναμονή"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Τέλος"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Πληκτρολόγιο κλήσης"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Συγχώνευση κλήσεων"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Ανταλλαγή"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Διαχείριση κλήσεων"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Διαχείρ. συνεδρίασης"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Διαχ.κλήσης συνδ."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ήχος"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Κλήση βίντεο"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Αλλαγή σε φωνητική κλήση"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Εναλλαγή κάμερας"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Παύση βίντεο"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Περισσότερες επιλογές"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Υπηρεσία"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Ρυθμίσεις"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Δεν έχει οριστεί&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Συντάξτε τη δική σας…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Ακύρωση"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Αποστολή"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ένα"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"δύο"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"τρία"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"τέσσερα"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"πέντε"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"έξι"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"επτά"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"οκτώ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"εννέα"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"αστέρι"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"μηδέν"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"σύμβολο δίεσης"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"κλήση"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Η ανοικτή συνομιλία ενεργοποιήθηκε."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Η κλήση τέθηκε σε σίγαση."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Απάντηση"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Αποστολή SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Απόρριψη"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Απάντηση ως βιντεοκλήση"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Απάντηση ως φωνητική κλήση"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Αποδοχή αιτήματος βίντεο"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Απόρριψη αιτήματος βίντεο"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Κύλιση προς τα επάνω για <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Κύλιση προς τα αριστερά για <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Κύλιση προς τα δεξιά για <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Κύλιση προς τα κάτω για <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Δόνηση"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Δόνηση"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ήχος"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Προεπιλεγμένος ήχος (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Δόνηση κατά το κουδούνισμα"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Ήχοι αφής πληκτρολογίου κλήσης"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Αυτόματη συμπλήρωση πληκτρολογίου κλήσης"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Αυτόμ. συμπλ. πληκτρολ. κλήσης"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ήχος κλήσης &amp; δόνηση"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Διαχείριση κλήσης συνδιάσκεψης"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Αριθμός έκτακτης ανάγκης"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-en-rGB/strings.xml b/InCallUI/res/values-en-rGB/strings.xml
index 45cff01..3cc0c31 100644
--- a/InCallUI/res/values-en-rGB/strings.xml
+++ b/InCallUI/res/values-en-rGB/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"On hold"</string>
     <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
     <string name="private_num" msgid="6713286113000232309">"Private number"</string>
-    <string name="payphone" msgid="1931775086311769314">"Phonebox"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Line busy"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Network busy"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"No response; timed out"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server unreachable"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Number unreachable"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Incorrect username or password"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Called from out-of-network"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Server error. Try again later."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"No signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM limit exceeded"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio off"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"No SIM or SIM error"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobile network not available"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Outgoing calls are restricted by FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"You can\'t make outgoing calls while call barring is on."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"All calls are restricted by access control."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Emergency calls are restricted by access control."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normal calls are restricted by access control."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Invalid number"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="confCall" msgid="1904840547188336828">"Conference call"</string>
-    <string name="call_lost" msgid="317670617901479594">"Call has been lost."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Call dropped"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handset earpiece"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired headset"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Retrying"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Redialling"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conference call"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Incoming call"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Call ended"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"My number is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Connecting video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video call"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Requesting video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Can\'t connect video call"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Your callback number\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Your emergency callback number\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Incoming video call"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Incoming video request"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Answer"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"In-stream video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voice"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accept"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Dismiss"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobile network not available."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Call not sent. No valid number entered."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Call not sent."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobile network not available."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI sequence…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Unsupported service."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Unable to switch calls."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Unable to separate call."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Unable to transfer call."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Unable to conference calls."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Unable to reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Unable to release call(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Voicemail number unknown."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internet call"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service not supported."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Can\'t conference."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP call"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Turning on radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Out-of-service area; retrying…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Call not sent. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Call not sent. Dial an emergency number!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No service. Trying again…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Hold call"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Resume call"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Add call"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Merge calls"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Swap calls"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dial pad"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Manage calls"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Manage conference"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Manage conference call"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Change to voice call"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Switch camera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pause video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"More options"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Not set&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Write your own..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"one"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"two"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"three"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"four"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"five"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seven"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"eight"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nine"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"star"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Speakerphone enabled."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Call muted."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Answer as video call"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Answer as audio call"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accept video request"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Decline video request"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slide up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slide left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slide right for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Slide down for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Phone ringtone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrate when ringing"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dial pad touch tones"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Dial pad autocomplete"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Dialpad auto-complete"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Emergency number"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-en-rIN/strings.xml b/InCallUI/res/values-en-rIN/strings.xml
index 45cff01..3cc0c31 100644
--- a/InCallUI/res/values-en-rIN/strings.xml
+++ b/InCallUI/res/values-en-rIN/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"On hold"</string>
     <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
     <string name="private_num" msgid="6713286113000232309">"Private number"</string>
-    <string name="payphone" msgid="1931775086311769314">"Phonebox"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Line busy"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Network busy"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"No response; timed out"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server unreachable"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Number unreachable"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Incorrect username or password"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Called from out-of-network"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Server error. Try again later."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"No signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM limit exceeded"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio off"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"No SIM or SIM error"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobile network not available"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Outgoing calls are restricted by FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"You can\'t make outgoing calls while call barring is on."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"All calls are restricted by access control."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Emergency calls are restricted by access control."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normal calls are restricted by access control."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Invalid number"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="confCall" msgid="1904840547188336828">"Conference call"</string>
-    <string name="call_lost" msgid="317670617901479594">"Call has been lost."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Call dropped"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handset earpiece"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired headset"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Retrying"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Redialling"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conference call"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Incoming call"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Call ended"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"My number is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Connecting video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video call"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Requesting video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Can\'t connect video call"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Your callback number\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Your emergency callback number\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Incoming video call"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Incoming video request"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Answer"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"In-stream video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voice"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accept"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Dismiss"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobile network not available."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Call not sent. No valid number entered."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Call not sent."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobile network not available."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI sequence…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Unsupported service."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Unable to switch calls."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Unable to separate call."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Unable to transfer call."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Unable to conference calls."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Unable to reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Unable to release call(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Voicemail number unknown."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internet call"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service not supported."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Can\'t conference."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP call"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Turning on radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Out-of-service area; retrying…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Call not sent. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Call not sent. Dial an emergency number!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No service. Trying again…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Hold call"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Resume call"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Add call"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Merge calls"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Swap calls"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dial pad"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Manage calls"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Manage conference"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Manage conference call"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Change to voice call"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Switch camera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pause video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"More options"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Not set&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Write your own..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"one"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"two"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"three"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"four"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"five"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seven"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"eight"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nine"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"star"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Speakerphone enabled."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Call muted."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Answer as video call"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Answer as audio call"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accept video request"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Decline video request"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slide up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slide left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slide right for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Slide down for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Phone ringtone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrate when ringing"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dial pad touch tones"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Dial pad autocomplete"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Dialpad auto-complete"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Emergency number"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml
index 8a8fbc9..7fcd85d 100644
--- a/InCallUI/res/values-es-rUS/strings.xml
+++ b/InCallUI/res/values-es-rUS/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconocida"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Teléfono pago"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Línea ocupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Red ocupada"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"No hay respuesta, tiempo de espera agotado"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servidor inaccesible"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"No se puede establecer la llamada"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nombre de usuario o contraseña incorrecto"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"La llamada se realizó desde fuera de la red."</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Error de servidor. Inténtalo nuevamente más tarde."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"No hay señal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Se excedió el límite de ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio apagada"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"No se encuentra la tarjeta SIM o se produjo un error relacionado con ella."</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Red móvil no disponible"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Las llamadas salientes están restringidas por NMF."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"No puedes realizar llamadas salientes cuando la restricción de llamadas está activa."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas las llamadas están restringidas por control de acceso."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Las llamadas de emergencia están restringidas por control de acceso."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Las llamadas normales están restringidas por control de acceso."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"El número no es válido."</string>
+    <string name="payphone" msgid="4793877574636445118">"Teléfono público"</string>
     <string name="confCall" msgid="1904840547188336828">"Llamada en conferencia"</string>
-    <string name="call_lost" msgid="317670617901479594">"La llamada se ha perdido."</string>
-    <string name="ok" msgid="3811371167865772377">"Aceptar"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Se interrumpió la llamada."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altavoz"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricular"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auriculares con cable"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Llamada en conferencia <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Núm. de correo de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Marcando"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Intentando nuevamente"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Volviendo a marcar"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Llamada en conferencia"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Llamada entrante"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Llamada finalizada"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Colgando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"En llamada"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mi número es <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Conectando video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videollamada"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Solicitando video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"No se puede conectar la videollamada."</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Número de devolución de llamada\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Número de devolución de llamada de emergencia\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Marcando"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Llamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videollamada entrante"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Solicitud de videollamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Correo de voz nuevo"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Correo de voz nuevo (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número de correo de voz desconocido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sin servicio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Responder"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video:"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voz"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Aceptar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Descartar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver llamada"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrado en la red."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"La red móvil no está disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Llamada no enviada. No se ingresó un número válido."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Llamada no enviada."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Red móvil no disponible"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar una llamada, ingresa un número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"No se puede realizar la llamada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciar la secuencia de MMI"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servicio no admitido."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"No es posible cambiar llamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"No es posible separar la llamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"No es posible transferir la llamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"No es posible realizar llamadas en conferencia."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"No es posible rechazar la llamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es posible publicar la(s) llamada(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Número de buzón de voz desconocido"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"llamada por Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Servicio no admitido"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No se puede cambiar llamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No se puede desviar la llamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"No se puede transferir."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"No se puede realizar la conferencia."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"No se puede rechazar la llamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"No se puede liberar llamadas."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Llamada SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Llamada de emergencia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Encendiendo radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fuera de servicio. Intentando nuevamente..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"No se realizó la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"No se realizó la llamada. Marca un número de emergencia."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No hay servicio. Vuelve a intentarlo."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"No se puede realizar la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"No se puede realizar la llamada. Marca un número de emergencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Retener llamada"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Reanudar llamada"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Agregar llamada"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Combinar llamadas"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Intercambiar llamadas"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado telefónico"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combinar llamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrar llamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Administ conferencia"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Adminis. conferencia"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videollamada"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Cambiar a llamada de voz"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Cambiar cámara"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pausar video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Más opciones"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servicio"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Sin configurar&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe tu propia respuesta..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"cuatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"siete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ocho"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nueve"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"estrella"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"cero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"numeral"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altavoz habilitado"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Llamada silenciada"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar un mensaje SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videollamada"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como llamada de audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceptar solicitud de video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rechazar solicitud de video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Deslízate hacia arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Deslízate hacia la izquierda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Deslízate hacia la derecha para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Deslízate hacia abajo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Tono del dispositivo"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar al sonar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonos táctiles del teclado"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Completar automáticamente con teclado"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autocompletar con teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrar conferencia telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergencia"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index 7120d2b..70f0bea 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconocido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Teléfono público"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Línea ocupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Red ocupada"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"No hay respuesta; se ha agotado el tiempo de espera."</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"No se puede establecer conexión con el servidor."</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"No se puede establecer la llamada."</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Contraseña o nombre de usuario incorrectos"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Llamada desde fuera de la red"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Error del servidor, inténtalo de nuevo más tarde."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"No hay señal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Se ha superado el límite de ACM."</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Señal móvil desactivada"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"No hay tarjeta SIM o se ha producido un error relacionado con la misma."</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Red móvil no disponible"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Las llamadas salientes están restringidas por FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"No se pueden realizar llamadas mientras esté activada la restricción de llamadas."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas las llamadas están limitadas por el control de acceso."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Las llamadas de emergencia están limitadas por el control de acceso."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Las llamadas normales están limitadas por el control de acceso."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número no válido"</string>
+    <string name="payphone" msgid="4793877574636445118">"Teléfono público"</string>
     <string name="confCall" msgid="1904840547188336828">"Conferencia telefónica"</string>
-    <string name="call_lost" msgid="317670617901479594">"La llamada se ha perdido."</string>
-    <string name="ok" msgid="3811371167865772377">"Aceptar"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Llamada perdida"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altavoz"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricular"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auriculares"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferencia telefónica<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del buzón de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Llamando"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Reintentando"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Marcando otra vez"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conferencia telefónica"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Llamada entrante"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Llamada finalizada"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Colgando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Llamada entrante"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mi número es <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>."</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Conectando videollamada"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videollamada"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Solicitando videollamada"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"No se puede establecer la videollamada"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Tu número de devolución de llamada\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Tu número de devolución de llamada de emergencia\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Llamando..."</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Llamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videollamada entrante"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Solicitud de videollamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuevo mensaje de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Buzón de voz nuevo (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número del buzón de voz desconocido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sin servicio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible."</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Responder"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vídeo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voz"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Aceptar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ignorar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Llamar"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No se ha podido conectar a la red"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"La red móvil no está disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"No se ha realizado la llamada; el número introducido no es válido."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"La llamada no se ha enviado."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"La red móvil no está disponible."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar una llamada, introduce un número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"No se puede establecer la llamada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando secuencia MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servicio no admitido"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"No se ha podido cambiar de llamada."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"No se ha podido desvincular la llamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"No se ha podido transferir la llamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"No se ha podido realizar la conferencia telefónica."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"No se ha podido rechazar la llamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es posible finalizar las llamadas activas."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Número de buzón de voz desconocido."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Llamada por Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Servicio no admitido."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No se pueden intercambiar llamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No se pueden separar llamadas."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"No se puede transferir."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"No se puede establecer la conferencia."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"No se puede rechazar la llamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"No se pueden hacer llamadas."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Llamada SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Llamada de emergencia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando señal móvil…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fuera de servicio; reintentando..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"No se ha enviado la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"La llamada no se ha enviado. Marca un número de emergencia."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sin servicio. Reintentado…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"No se puede establecer la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"No se puede establecer la llamada. Marcar un número de emergencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Retener llamada"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Reanudar llamada"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Añadir llamada"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Llamada a tres"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Alternar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Llamada a tres"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrar llamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Administrar conferencia"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Administrar llamada"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videollamada"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Cambiar a llamada de voz"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Cambiar cámara"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pausar vídeo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Más opciones"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servicio"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;No definido&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe tu propia respuesta..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"cuatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"siete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ocho"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nueve"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"estrella"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"cero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retroceder un espacio"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altavoz habilitado"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Llamada silenciada"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videollamada"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como llamada de audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceptar solicitud de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rechazar solicitud de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Desliza el dedo hacia arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Desliza el dedo hacia la izquierda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Desliza el dedo hacia la derecha para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Desliza el dedo hacia abajo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Tono del teléfono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar al sonar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sonar al marcar número"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar con teclado"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autocompletar número"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrar conferencia telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergencia"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"s"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-et-rEE/strings.xml b/InCallUI/res/values-et-rEE/strings.xml
index c259b62..64dcc17 100644
--- a/InCallUI/res/values-et-rEE/strings.xml
+++ b/InCallUI/res/values-et-rEE/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Ootel"</string>
     <string name="unknown" msgid="6878797917991465859">"Tundmatu"</string>
     <string name="private_num" msgid="6713286113000232309">"Varjatud number"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefoniautomaat"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Liin hõivatud"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Võrk hõivatud"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Vastust ei ole, aegunud"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server on kättesaamatu"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Number pole kättesaadav"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Vale kasutajanimi või parool"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Helistas väljastpoolt võrku"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Serveri viga. Proovige hiljem uuesti."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Signaal puudub"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-piir ületatud"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Raadioside väljas"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM-kaart puudub või SIM-kaardi viga"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobiilsidevõrk pole saadaval"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Väljuvad kõned on piiratud FDN-iga."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Väljuvaid kõnesid ei saa teha, kui kõnepiirang on sisse lülitatud."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Kõiki kõnesid piiratakse juurdepääsu juhtimisega"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Hädaabikõned on piiratud juurdepääsu juhtimisega."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Tavakõned on piiratud juurdepääsu juhtimisega."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Vale number"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefoniautomaat"</string>
     <string name="confCall" msgid="1904840547188336828">"Konverentskõne"</string>
-    <string name="call_lost" msgid="317670617901479594">"Kõne on katkenud."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Kõne katkes"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Kõlar"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Käsitelefoni peatelefon"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Juhtmega peakomplekt"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konverentskõne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Kõnepostinumber"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Valimine"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Uuesti proovimine"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Uuestivalimine"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konverentskõne"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Sissetulev kõne"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Kõne lõppes"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lõpetamisel"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Kõne"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Minu number on <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Video ühendamine"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videokõne"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Video taotlemine"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videokõnet ei õnnestu ühendada"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Teie tagasihelistamise number\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Teie hädaabikõne tagasihelistamise number\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Valimine"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Vastamata kõne"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastamata kõned"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Käimasolev kõne"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ootel"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Sissetulev kõne"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Sissetulev videokõne"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Sissetulev videotaotlus"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Uus kõnepost"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Uus kõnepost (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Valige <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Kõneposti number teadmata"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Teenus puudub"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valitud võrk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) pole saadaval"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Vasta"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Lõpeta kõne"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Hääl"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Nõustu"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Loobumine"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Helista tagasi"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Sõnum"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Helistamiseks lülitage lennurežiim välja."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ei ole võrku registreeritud."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiilsidevõrk pole saadaval."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Kõnet ei tehtud, sisestati kehtetu number."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Kõnet ei tehtud."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobiilsidevõrk pole saadaval."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Helistamiseks sisestage kehtiv number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ei saa helistada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-jada alustamine ..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Toetamata teenus."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kõnesid ei saa vahetada."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kõne ei saa eraldada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Kõne ei saa üle kanda."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Konverentskõnesid ei saa teha."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kõnest ei saa keelduda."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kõne(sid) ei saa vabastada"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Kõneposti number pole teada."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Interneti-kõne"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Teenust ei toetata."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kõnesid ei saa vahetada."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kõnet ei saa eraldada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ei saa üle kanda."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konverentskõnet ei saa pidada."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kõnet ei saa tagasi lükata."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kõnet (kõnesid) ei saa vabastada."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-kõne"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hädaabikõne"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Raadioside sisselülitamine ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Teeninduspiirkonnast väljas, uuesti proovimine ..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Kõnet ei saadetud. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> pole hädaabinumber."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Kõnet ei edastatud, valige hädaabinumber."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Teenus puudub. Uuesti proovimine ..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ei saa helistada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hädaabikõne number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ei saa helistada. Valige hädaabinumber."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Kasutage valimiseks klaviatuuri"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Kõne ootele"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Kõne jätkamine"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Lisa kõne"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Kõnede ühendamine"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Kõnede vahetamine"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Pane ootele"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Lõpeta"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Numbriklahvistik"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Ühenda kõned"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Vaheta"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Halda kõnesid"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Halda konverentsi"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Halda konverentskõn."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Heli"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videokõne"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mine üle häälkõnele"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Vaheta kaamerat"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Peata video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Rohkem valikuid"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Teenus"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Seadistus"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Määramata&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kirjutage ise …"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Tühista"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Saada"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"üks"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"kaks"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"kolm"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"neli"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"viis"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"kuus"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seitse"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"kaheksa"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"üheksa"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"tärn"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"null"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"nael"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"helista"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"tagasilüke"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Valjuhääldi on sisse lülitatud."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Kõne on summutatud."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Vastamine"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-i saatmine"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Keeldumine"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Vastamine videokõnena"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Vastamine helikõnena"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Võta videotaotlus vastu"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Lükka videotaotlus tagasi"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Lohistage üles <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Lohistage vasakule <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Lohistage paremale <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Lohistage alla: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreerimine"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreerimine"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Heli"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Vaikeheli (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Telefonihelin"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibreerimine helina ajal"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valimisklahvistiku puutetoonid"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Valimisklahvistiku automaatne täitmine"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Valimisklahv. autom. täitmine"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Helin ja vibratsioon"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konverentskõne haldamine"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Hädaabinumber"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-eu-rES/strings.xml b/InCallUI/res/values-eu-rES/strings.xml
index 920395c..525d607 100644
--- a/InCallUI/res/values-eu-rES/strings.xml
+++ b/InCallUI/res/values-eu-rES/strings.xml
@@ -21,33 +21,13 @@
     <string name="onHold" msgid="9035493194749959955">"Zain"</string>
     <string name="unknown" msgid="6878797917991465859">"Ezezaguna"</string>
     <string name="private_num" msgid="6713286113000232309">"Zenbaki pribatua"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefono publikoa"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linea okupatuta"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Sarea okupatuta"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Ez dago erantzunik, denbora-muga gainditu da"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Ezin da zerbitzariarekin konektatu"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Zenbakia ez dago eskuragarri"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Erabiltzaile-izen edo pasahitz okerra"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Sarearen kanpotik deitu da"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Zerbitzariaren errorea. Saiatu berriro geroago."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Ez dago seinalerik"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM datuen muga gainditu da"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Irratia desaktibatuta"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ez dago SIM txartelik edo SIM txartelaren errore bat gertatu da"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Sare mugikorra ez dago erabilgarri"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Irteerako deiak FDN ezarpen bidez murrizten dira."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ezin duzu irteerako deirik egin deien debekuak aktibatuta dauden bitartean."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Dei guztiak sarbide-kontrolaren bidez murrizten dira."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Larrialdi-deiak sarbide-kontrolaren bidez murrizten dira."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Dei normalak sarbide-kontrolaren bidez murrizten dira."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Zenbaki baliogabea"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefono publikoa"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferentzia-deia"</string>
-    <string name="call_lost" msgid="317670617901479594">"Deia galdu da."</string>
-    <string name="ok" msgid="3811371167865772377">"Ados"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Deia eten da"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Bozgorailua"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Aurikularrak"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabledun entzungailua"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetootha"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Ondorengo tonuak bidali?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"Tonuak bidaltzen\n"</string>
     <string name="send_button" msgid="4106860097497818751">"Bidali"</string>
@@ -56,8 +36,8 @@
     <string name="wild_prompt_str" msgid="5543521676355533577">"Ordeztu komodina honekin:"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferentzia-deiaren iraupena: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Erantzungailuaren zenbakia"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Markatzen"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Berriro saiatzen"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Deitzen"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Berriro markatzen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferentzia-deia"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Sarrerako deia"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Deia amaitu da"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Deia amaitzen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Deia abian"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Nire zenbakia <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> da"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Bideoa konektatzen"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Bideo-deia"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Bideoa eskatzen"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Ezin da konektatu bideo-deia"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Deiak itzultzeko zenbakia:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Larrialdi-deiak itzultzeko zenbakia:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Markatzen"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Dei galdua"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Dei galduak"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Abian den deia"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Zain"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Sarrerako deia"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Sarrerako bideo-deia"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Sarrerako bideo-eskaera"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ahots-mezu berria"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Ahots-mezu berriak (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Markatu <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Erantzungailuaren zenbakia ezezaguna da"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ez dago zerbitzurik"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Hautatutako sarea (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ez dago erabilgarri"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Erantzun"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Amaitu deia"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Bideoa"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Ahotsa"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Onartu"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Baztertu"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Erantzun deiari"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mezua"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Dei bat egiteko, Hegaldi modua desaktibatu behar duzu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ez dago sarean erregistratuta."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Sare mugikorra ez dago erabilgarri."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Ez da deia bidali ez delako baliozko zenbakirik idatzi."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Ez da deia bidali."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Sare mugikorra ez dago erabilgarri."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Deitzeko, idatzi balio duen zenbaki bat."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ezin da deitu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI sekuentzia hasten…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ez da zerbitzua onartzen."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ezin da dei batetik bestera pasa."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Ezin da deia banandu."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Ezin da deia transferitu."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Ezin da konferentzia-deirik egin."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Ezin da deia baztertu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Ezin dira deiak askatu."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Erantzungailuaren zenbaki ezezaguna."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Interneteko deia"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Ez da onartzen."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ezin da deiz aldatu."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ezin da deia bereizi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ezin da transferitu."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Ezin da konferentzia-deirik egin."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Ezin da deia baztertu."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Ezin dira deiak bereizi."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP deia"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Larrialdi-deia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Irratia pizten…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Zerbitzu-eremutik kanpo; berriro saiatzen…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Ez da deia bidali. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ez da larrialdietarako zenbaki bat!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Ez da deia bidali. Markatu larrialdietarako zenbaki bat!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ez dago zerbitzurik. Berriro saiatzen…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ezin da deitu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ez da larrialdietarako zenbakia."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ezin da deitu. Markatu larrialdietarako zenbakia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Erabili teklatua markatzeko"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Utzi deia zain"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Berrekin deiari"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Gehitu deia"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Bateratu deiak"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Joan beste deira"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Utzi zain"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Amaitu"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Markagailua"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Bateratu deiak"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trukatu"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Kudeatu deiak"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Kudeatu konferentzia"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Kudeatu deia"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audioa"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Bideo-deia"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Aldatu ahots-deira"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Aldatu kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pausatu bideoa"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Aukera gehiago"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Zerbitzua"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfigurazioa"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ezarri gabe&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Idatzi zeure erantzuna…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Utzi"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Bidali"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"bat"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"bi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"hiru"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"lau"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"bost"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sei"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"zazpi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"zortzi"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"bederatzi"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"izarra"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"markatu"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"atzera tekla"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Bozgorailua gaitu da."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Deiaren audioa desaktibatu da."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Erantzun"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Bidali SMS mezua"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Baztertu"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Erantzun bideo-dei moduan"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Erantzun audio-dei moduan"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Onartu bideo-eskaera"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Ukatu bideo-eskaera"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Lerratu gora hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Lerratu ezkerrera hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Lerratu eskuinera hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Lerratu behera hau egiteko: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Egin dar-dar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Egin dar-dar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Soinua"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Soinu lehenetsia (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Telefonoaren tonua"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Egin dar-dar tonua jotzean"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Markagailuaren ukipen-tonuak"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Osatu markagailua automatikoki"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Markagailua osatzea"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tonua eta dardara"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Kudeatu konferentzia-deia"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Larrialdietarako zenbakia"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml
index 36b0cd9..c3529dc 100644
--- a/InCallUI/res/values-fa/strings.xml
+++ b/InCallUI/res/values-fa/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"در انتظار"</string>
     <string name="unknown" msgid="6878797917991465859">"ناشناس"</string>
     <string name="private_num" msgid="6713286113000232309">"شماره خصوصی"</string>
-    <string name="payphone" msgid="1931775086311769314">"تلفن سکه ای"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"خط مشغول است"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"شبکه مشغول است"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"پاسخی دریافت نشد، زمان پایان یافت"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"سرور غیرقابل دسترسی"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"شماره غیرقابل دسترسی"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"نام کاربر و رمز ورود اشتباه است"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"از خارج از شبکه تماس گرفته شده است"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"خطای سرور: بعداً دوباره امتحان کنید."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"بدون سیگنال"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"‏بیش از حد مجاز ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"رادیو خاموش"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"فاقد سیم، یا خطای سیم"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"شبکه تلفن همراه در دسترس نیست"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"‏تماس‌های خروجی توسط FDN محدود شده‌اند."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"هنگام روشن بودن محدودیت تماس، برقراری تماس‌های خروجی امکان‌پذیر نیست."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"همه تماس‌ها توسط کنترل دسترسی محدود شده‌اند."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"تماس‌های اضطراری توسط کنترل دسترسی محدود شده‌اند."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"تماس‌های معمولی توسط کنترل دسترسی محدود شده‌اند."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"شماره نامعتبر"</string>
+    <string name="payphone" msgid="4793877574636445118">"تلفن عمومی"</string>
     <string name="confCall" msgid="1904840547188336828">"تماس کنفرانسی"</string>
-    <string name="call_lost" msgid="317670617901479594">"تماس قطع شد."</string>
-    <string name="ok" msgid="3811371167865772377">"تأیید"</string>
+    <string name="call_lost" msgid="6183862117003999578">"تماس قطع شد"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"بلندگو"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"گوشی"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"هدست سیمی"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"تماس کنفرانسی <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"شماره پست صوتی"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"شماره گیری"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"در حال امتحان مجدد"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"در حال شماره‌گیری مجدد"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"تماس کنفرانسی"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"تماس ورودی"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"تماس پایان یافت"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"قطع تماس"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"در تماس"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"شماره من <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> است"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"در حال برقراری تماس ویدیویی"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"تماس ویدیویی"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"درحال درخواست تماس ویدیویی"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"اتصال تماس ویدیویی ممکن نیست"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"شماره پاسخ تماس شما\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"شماره پاسخ تماس اضطراری شما\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"شماره‌گیری"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"تماس بی پاسخ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"تماس‌های بی پاسخ"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"تماس جاری"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"در انتظار"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"تماس ورودی"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"تماس ویدیویی ورودی"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"درخواست تماس ویدیویی ورودی"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"پست صوتی جدید"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"پست صوتی جدید (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"شماره گیری <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"شماره پست صوتی ناشناس"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"بدون سرویس"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"شبکه انتخابی (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) قابل دسترس نیست"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"پاسخ"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"قطع تماس"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ویدیو"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"صدا"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"پذیرش"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ردکردن"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"پاسخ تماس"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"پیام"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"برای برقراری یک تماس، ابتدا حالت هواپیما را خاموش کنید."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"در شبکه ثبت نشده است."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبکهٔ تلفن همراه موجود نیست."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"تماس ارسال نشد، هیچ شماره معتبری وارد نشده است."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"تماس ارسال نشد."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"شبکه تلفن همراه در دسترس نیست."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"برای برقراری تماس، یک شماره معتبر وارد کنید."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"نمی‌توانید تماس بگیرید."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏شروع ترتیب MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"سرویس پشتیبانی نشده."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"تغییر وضعیت تماس‌ها امکان‌پذیر نیست."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"تفکیک تماس امکان‌پذیر نیست."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"انتقال تماس امکان‌پذیر نیست."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"تماس‌های کنفرانسی امکان‌پذیر نیست."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"رد کردن تماس امکان‌پذیر نیست."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"آزاد کردن تماس(ها) امکان‌پذیر نیست."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"شماره پست صوتی نامشخص."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"تماس اینترنتی"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"سرویس پشتیبانی نمی‌شود."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"نمی‌توانید بین تماس‌ها جابجا شوید."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"نمی‌توانید تماس را جدا کنید."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"نمی‌توانید انتقال دهید."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"نمی‌توانید کنفرانس برگزار کنید."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"نمی‌توانید تماس را رد کنید."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"نمی‌توانید تماس(ها) را آزاد کنید."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"‏تماس SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"تماس اضطراری"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"در حال روشن کردن رادیو..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"خارج از منطقه سرویس، در حال امتحان مجدد..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"تماس ارسال نشد. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"تماس ارسال نشد، لطفاً یک شماره اضطراری را شماره‌گیری کنید!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"نمی‌توانید تماس بگیرید. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"نمی توانید تماس بگیرید. یک شماره اضطراری را شماره‌گیری کنید."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استفاده از صفحه‌کلید برای شماره گیری"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"در انتظار نگه‌داشتن تماس"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ازسرگیری تماس"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"افزودن تماس"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ادغام تماس‌ها"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"تعویض تماس‌ها"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"نگهداشت"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"پایان"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"دکمه‌های شماره گیری"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ادغام تماس‌ها"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تعویض"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"مدیریت تماس‌ها"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"مدیریت کنفرانس"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"مدیریت تماس کنفرانسی"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"صوتی"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"تماس ویدیویی"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"تغییر به تماس صوتی"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"تغییر دوربین"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"توقف موقت ویدیو"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"گزینه‌های بیشتر"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"سرویس"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"تنظیم"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;تنظیم نشده&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"نوشتن پاسخ خود…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"لغو"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"ارسال"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"یک"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"دو"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"سه"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"چهار"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"پنج"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"شش"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"هفت"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"هشت"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"نه"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ستاره"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"صفر"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"پوند"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"شماره گیری"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تلفن آیفون‌دار فعال شد."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"تماس نادیده گرفته شد."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"پاسخ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ارسال پیامک"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"عدم پذیرش"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"پاسخ به صورت تماس ویدیویی"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"پاسخ به صورت تماس صوتی"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"پذیرش درخواست ویدیو"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"رد کردن درخواست ویدیو"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به بالا بلغزانید."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به چپ بلغزانید."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به راست بلغزانید."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> به پایین بلغزانید."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"لرزش"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"لرزش"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"صدا"</string>
     <string name="default_notification_description" msgid="78174796906240970">"صدای پیش‌فرض (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"آهنگ زنگ تلفن"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ارتعاش هنگام زنگ زدن"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"صداهای پد لمسی شماره‌گیری"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"تکمیل خودکار صفحه شماره‌گیری"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"تکمیل خودکار صفحه شماره‌گیری"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"آهنگ‌ زنگ و لرزش"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"مدیریت تماس کنفرانس"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"شماره اضطراری"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"۰"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"۱"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"۲"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"۳"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"۴"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"۵"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"۶"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"۷"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"۸"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"۹"</string>
 </resources>
diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml
index d63467e..2bef852 100644
--- a/InCallUI/res/values-fi/strings.xml
+++ b/InCallUI/res/values-fi/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Pidossa"</string>
     <string name="unknown" msgid="6878797917991465859">"Tuntematon"</string>
     <string name="private_num" msgid="6713286113000232309">"Salainen numero"</string>
-    <string name="payphone" msgid="1931775086311769314">"Puhelinautomaatti"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linja varattu"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Verkko varattu"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Ei vastausta, aikakatkaistiin"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Palvelimeen ei saada yhteyttä"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numeroon ei saada yhteyttä"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Virheellinen käyttäjänimi tai salasana"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Puhelu verkon ulkopuolelta"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Palvelinvirhe. Yritä myöhemmin uudelleen."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Ei signaalia"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-raja ylitetty"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio pois käytöstä"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ei SIM-korttia tai SIM-korttivirhe"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobiiliverkko ei ole käytettävissä"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Sallitut numerot rajoittavat soitettavia puheluita."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Et voi soittaa puheluita puheluiden eston ollessa käytössä."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Käyttörajoitus rajoittaa kaikki puhelut"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Käyttörajoitus rajoittaa hätäpuhelut."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Käyttörajoitus rajoittaa normaalit puhelut."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Virheellinen numero"</string>
+    <string name="payphone" msgid="4793877574636445118">"Maksupuhelin"</string>
     <string name="confCall" msgid="1904840547188336828">"Puhelinneuvottelu"</string>
-    <string name="call_lost" msgid="317670617901479594">"Puhelu katkesi."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Puhelu katkaistu"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Kaiutin"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Puhelimen kuuloke"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Langalliset kuulokkeet"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Puhelinneuvottelu <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Puhelinvastaajan numero"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Soitetaan"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Yritetään uudelleen"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Soitetaan uudelleen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Puhelinneuvottelu"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Uusi puhelu"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Puhelu loppui"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Katkaistaan"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Puhelun aikana"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Numeroni on <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Avataan videoyhteys"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videopuhelu"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Videota pyydetään"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videopuhelua ei voi soittaa"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Takaisinsoittonumerosi\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Hätäpuhelujen takaisinsoittonumero\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Soitetaan"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Vastaamatta jäänyt puhelu"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastaamattomat puhelut"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Käynnissä oleva puhelu"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Pidossa"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Uusi puhelu"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Saapuva videopuhelu"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Saapuva videopyyntö"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Uusia viestejä vastaajassa"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Uusia viestejä vastaajassa (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Soita numeroon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Puhelinvastaajan numero tuntematon"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Katvealueella"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valittu verkko (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ei käytettävissä."</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Vastaa"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Katkaise puhelu"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Äänipuhelu"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Hyväksy"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Hylkää"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Soita takaisin"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Viesti"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Poista lentokonetila käytöstä ennen puhelun soittamista."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ei rekisteröity verkkoon."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiiliverkko ei käytettävissä."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Puhelua ei soitettu, et antanut kelvollista numeroa."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Puhelua ei soitettu."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Matkapuhelinverkko ei ole käytettävissä."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Soita antamalla kelvollinen numero."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Puhelua ei voi soittaa."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Aloitetaan MMI-koodisekvenssiä..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Palvelua ei tueta."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Puhelujen vaihto epäonnistui."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Puhelun erottaminen epäonnistui."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Puhelun siirtäminen epäonnistui."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Puhelujen yhdistäminen epäonnistui."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Puhelun hylkääminen epäonnistui."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Puhelujen suorittaminen epäonnistui."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Puhelinvastaajan numero on tuntematon"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetpuhelu"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Yhteyttä ei tueta."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Puhelua ei voi vaihtaa."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Puhelua ei voi erottaa."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Puhelua ei voi siirtää."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Puheluja ei voi yhdistää."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Puhelua ei voi hylätä."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Puheluja ei voi vapauttaa."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-puhelu"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hätäpuhelu"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Käynnistetään radiota…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Katvealueella, yritetään uudelleen..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Puhelua ei soitettu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hätänumero!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Puhelua ei soitettu. Valitse hätänumero!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ei yhteyttä. Yritetään uudelleen…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Puhelua ei voi soittaa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hätänumero."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Puhelua ei voi soittaa. Valitse hätänumero."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Valitse numero näppäimistöstä"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Aseta puhelu pitoon"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Jatka puhelua"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Lisää puhelu"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Yhdistä puhelut"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Vaihda puhelua"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Pitoon"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Loppu"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Näppäimistö"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Yhdistä puhelut"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Vaihda"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Hallinnoi puheluita"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Puhelinneuvottelu"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Hallinnoi puhelinneuvottelua"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ääni"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videopuh."</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Muuta äänipuheluksi"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Vaihda kameraa"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Keskeytä video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Lisää vaihtoehtoja"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Palveluntarjoaja"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Asetukset"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ei asetettu&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kirjoita oma…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Peruuta"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Lähetä"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"yksi"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"kaksi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"kolme"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"neljä"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"viisi"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"kuusi"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seitsemän"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"kahdeksan"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"yhdeksän"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"tähti"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nolla"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"punta"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"soita"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"askelpalautin"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kaiutin käytössä."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Puhelu mykistetty."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Vastaa"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Lähetä tekstiviesti"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Hylkää"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Vastaa ja aloita videopuhelu"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Vastaa ja aloita äänipuhelu"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Hyväksy videopyyntö"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Hylkää videopyyntö"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla ylös."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla vasemmalle."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla oikealle."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Valitse <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> liu\'uttamalla alas."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Värinä"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Värinä"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ääni"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Oletusääni (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Puhelimen soittoääni"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Käytä värinää"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valintanäppäimien näppäinäänet"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Näppäimistön automaattinen täydennys"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Näppäimistön täydennys"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Soittoääni ja värinä"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Hallinnoi puhelinneuvottelua"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Hätänumero"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-fr-rCA/strings.xml b/InCallUI/res/values-fr-rCA/strings.xml
index a20ece4..083d5bb 100644
--- a/InCallUI/res/values-fr-rCA/strings.xml
+++ b/InCallUI/res/values-fr-rCA/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"En attente"</string>
     <string name="unknown" msgid="6878797917991465859">"Inconnu"</string>
     <string name="private_num" msgid="6713286113000232309">"Numéro privé"</string>
-    <string name="payphone" msgid="1931775086311769314">"Cabine téléphonique"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Ligne occupée"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Réseau occupé"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Aucune réponse, délai expiré"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveur injoignable"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numéro injoignable"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nom d\'utilisateur ou mot de passe incorrect."</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Appel effectué hors réseau"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Erreur serveur : réessayez plus tard."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Aucun signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite ACM dépassée"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Signal radio désactivé"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Aucune carte SIM ou erreur de carte SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Réseau cellulaire non disponible"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Les appels sortants sont restreints par la liste de numéros autorisés."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Vous ne pouvez pas effectuer d\'appels sortants tant que l\'interdiction d\'appel est activée."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tous les appels sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Les appels d\'urgence sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Les appels ordinaires sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numéro incorrect"</string>
+    <string name="payphone" msgid="4793877574636445118">"Cabine téléphonique"</string>
     <string name="confCall" msgid="1904840547188336828">"Conférence téléphonique"</string>
-    <string name="call_lost" msgid="317670617901479594">"L\'appel a été perdu."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"L\'appel a été interrompu"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Haut-parleur"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Écouteur du combiné"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Écouteurs filaires"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conférence téléphonique <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Numérotation en cours…"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nouvelle tentative en cours…"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Recomposition en cours..."</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conférence téléphonique"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Appel entrant"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Fin de l\'appel"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Fin d\'appel"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Appel en cours"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mon numéro est le <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Connexion de la vidéo en cours…"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Appel vidéo"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Demande de vidéo en cours"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Impossible de connecter l\'appel vidéo"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Votre numéro de rappel :\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Votre numéro de rappel d\'urgence :\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Numérotation en cours…"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Appel manqué"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Appel en cours"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En attente"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Appel entrant"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Appel vidéo entrant"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Demande de vidéo reçue"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nouveau message vocal"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nouveaux messages vocaux (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Composer <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numéro de messagerie vocale inconnu"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Aucun service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Réponse"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Raccrocher"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vidéo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Vocal"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accepter"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Fermer"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Rappeler"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Veuillez désactiver le mode Avion avant de passer un appel."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non enregistré sur le réseau"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Réseau pour mobile non disponible"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"L\'appel n\'a pas été effectué. Le numéro composé n\'est pas valide."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"L\'appel n\'a pas été effectué."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Réseau cellulaire non disponible."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pour faire un appel, entrez un numéro valide."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Impossible d\'appeler."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Lancement de la séquence IHM..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ce service n\'est pas pris en charge."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impossible de basculer entre les appels."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impossible de dissocier l\'appel."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impossible de transférer l\'appel."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Impossible d\'effectuer des conférences téléphoniques."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impossible de raccrocher le ou les appel(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Numéro de messagerie vocale inconnu."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Appel Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service non pris en charge."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossible de faire des appels."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossible de séparer les appels."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Impossible de transférer."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Impossible de créer la conférence."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Impossible de refuser l\'appel."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Impossible de libérer l\'appel ou les appels."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Appel SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Appel d\'urgence"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activation du signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Hors zone de couverture. Nouvelle tentative..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"L\'appel n\'a pas été effectué. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Appel non effectué. Veuillez composer un numéro d\'urgence!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aucun service. Nouvel essai en cours..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Appel impossible. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Appel impossible. Composez un numéro d\'urgence."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisez le clavier pour composer un numéro."</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Mettre l\'appel en attente"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Reprendre l\'appel"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Ajouter un appel"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Fusionner les appels"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Permuter les appels"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Attente"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminé"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Clavier numérique"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusionner les appels"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Permuter"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gérer les appels"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gérer la conférence"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gérer conf. téléph."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Appel vidéo"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Passer à un appel vocal"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Changer de caméra"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Interrompre la vidéo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Plus d\'options"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuration"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Non défini&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Réponse personnalisée..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuler"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Envoyer"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"une"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"deux"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trois"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatre"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinq"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sept"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"huit"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"neuf"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"étoile"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zéro"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"dièse"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Haut-parleur activé"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Son coupé"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Répondre"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un message texte"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Répondre comme appel vidéo"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Répondre comme appel audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accepter la demande d\'appel vidéo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Refuser la demande d\'appel vidéo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Faites glisser votre doigt vers le haut pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Faites glisser votre doigt vers la gauche pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Faites glisser votre doigt vers la droite pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Faire glisser le doigt vers le bas : <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Son"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Sonnerie du téléphone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mode Vibreur lorsque le tél. sonne"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numérotation sonore"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Saisie semi-auto pour clavier numérique"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Suggestions automatiques pour le pavé numérique"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gérer la conférence téléphonique"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numéro d\'urgence"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index 410b548..1b17782 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"En attente"</string>
     <string name="unknown" msgid="6878797917991465859">"Inconnu"</string>
     <string name="private_num" msgid="6713286113000232309">"Numéro privé"</string>
-    <string name="payphone" msgid="1931775086311769314">"Cabine téléphonique"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Ligne occupée"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Réseau occupé"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Aucune réponse, délai expiré"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveur injoignable"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numéro injoignable"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nom d\'utilisateur ou mot de passe incorrect"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Appel effectué hors réseau"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Erreur serveur : réessayez plus tard."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Aucun signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite ACM dépassée"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Signal radio désactivé"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Aucune carte SIM ou erreur de carte SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Réseau mobile non disponible."</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Les appels sortants sont restreints par la liste de numéros autorisés."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Vous ne pouvez pas effectuer d\'appels sortants tant que l\'interdiction d\'appel est activée."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tous les appels sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Les appels d\'urgence sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Les appels ordinaires sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numéro incorrect"</string>
+    <string name="payphone" msgid="4793877574636445118">"Cabine téléphonique"</string>
     <string name="confCall" msgid="1904840547188336828">"Conférence tél."</string>
-    <string name="call_lost" msgid="317670617901479594">"L\'appel a été perdu."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Appel interrompu."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Haut-parleur"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Écouteur du combiné"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Écouteurs filaires"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conférence téléphonique à <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Appel en cours…"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nouvelle tentative"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Rappel en cours..."</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conférence téléphonique"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Appel entrant"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Fin de l\'appel"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Fin de l\'appel.."</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Appel en cours"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mon numéro est le <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Connexion de la vidéo en cours…"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Appel vidéo"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Demande de vidéo en cours…"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Impossible d\'établir la connexion de l\'appel vidéo."</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Votre numéro de rappel\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Votre numéro de rappel d\'urgence\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Numérotation en cours…"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Appel manqué"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Appel en cours"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En attente"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Appel entrant"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Appel vidéo entrant"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Demande de vidéo reçue"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nouveau message vocal"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nouveaux messages vocaux (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Composer le <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numéro de messagerie vocale inconnu"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Aucun service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Répondre"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Raccrocher"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vidéo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voix"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accepter"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ignorer"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Rappeler"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Veuillez d\'abord désactiver le mode Avion, afin d\'effectuer un appel."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non enregistré sur le réseau."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Réseau mobile non disponible"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"L\'appel n\'a pas été effectué. Le numéro composé n\'est pas valide."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"L\'appel n\'a pas été effectué."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Réseau mobile non disponible."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pour émettre un appel, veuillez saisir un numéro valide."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Impossible d\'émettre l\'appel."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Lancement de la séquence IHM..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ce service n\'est pas pris en charge."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impossible de changer d\'appel."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impossible de dissocier l\'appel"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impossible de transférer l\'appel."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Impossible d\'effectuer des conférences téléphoniques."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impossible de libérer le(s) appel(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Numéro de messagerie vocale inconnu."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Appel Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service non compatible."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossible de changer d\'appel."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossible d\'isoler l\'appel."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Transfert impossible."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Impossible de lancer une conférence téléphonique."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Impossible de refuser l\'appel."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Impossible de lancer les appels."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Appel SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Appel d\'urgence"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activation du signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Hors zone de couverture. Nouvelle tentative..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"L\'appel n\'a pas été effectué. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence !"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Appel non effectué. Veuillez composer un numéro d\'urgence !"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aucun service disponible. Nouvelle tentative en cours…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Impossible d\'émettre l\'appel. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Impossible d\'émettre l\'appel. Veuillez composer un numéro d\'urgence."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisez le clavier pour composer un numéro."</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Mettre l\'appel en attente"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Reprendre l\'appel"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Ajouter un appel"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Fusionner les appels"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Permuter les appels"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"En attente"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Raccrocher"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Clavier"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusionner les appels"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Permuter"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gérer les appels"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gérer la conférence"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gérer conférence tél."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Appel vidéo"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Passer à un appel vocal"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Changer de caméra"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Interrompre la vidéo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Plus d\'options"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuration"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Non défini&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Réponse personnalisée..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuler"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Envoyer"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"deux"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trois"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatre"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinq"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sept"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"huit"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"neuf"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"étoile"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zéro"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"dièse"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Haut-parleur activé"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Son coupé"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Réponse"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Répondre"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Répondre via un appel vidéo"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Répondre via un appel audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accepter la demande d\'appel vidéo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Refuser la demande d\'appel vidéo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Faites glisser votre doigt vers le haut pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Faites glisser votre doigt vers la gauche pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Faites glisser votre doigt vers la droite pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Faire glisser le doigt vers le bas : <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonnerie"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Sonnerie du téléphone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mode Vibreur lorsque le tél. sonne"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numérotation sonore"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Saisie semi-auto clavier num."</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Clavier à saisie semi-automatique"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gérer la conférence téléphonique"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numéro d\'urgence"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-gl-rES/strings.xml b/InCallUI/res/values-gl-rES/strings.xml
index 9196663..80dae5b 100644
--- a/InCallUI/res/values-gl-rES/strings.xml
+++ b/InCallUI/res/values-gl-rES/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="unknown" msgid="6878797917991465859">"Descoñecido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Teléfono público"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Liña ocupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rede ocupada"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Sen resposta; superouse o tempo de espera"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Non se pode acceder ao servidor"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Non se pode contactar co número"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nome de usuario ou contrasinal incorrecto"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chamada desde fóra da rede"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Erro no servidor. Téntao de novo máis tarde."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Sen cobertura"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Límite de ACM superado"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio desactivada"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Non hai SIM ou hai un erro na SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"A rede móbil non está dispoñible"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"As chamadas saíntes están restrinxidas por FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Non podes facer chamadas saíntes coa restrición de chamadas activada."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas as chamadas están restrinxidas polo control de acceso."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"As chamadas de emerxencia están restrinxidas polo control de acceso."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"As chamadas normais están restrinxidas polo control de acceso."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número non válido"</string>
+    <string name="payphone" msgid="4793877574636445118">"Teléfono público"</string>
     <string name="confCall" msgid="1904840547188336828">"Conferencia telefónica"</string>
-    <string name="call_lost" msgid="317670617901479594">"Perdeuse a chamada."</string>
-    <string name="ok" msgid="3811371167865772377">"Aceptar"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Chamada interrompida"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altofalante"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricular do teléfono"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auriculares con cable"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferencia telefónica ás <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número de correo de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Marcación"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Tentando de novo"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Marcando de novo"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conferencia telefónica"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Chamada entrante"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chamada finalizada"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Desconectando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Chamada en curso"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"O meu número é <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Conectando vídeo"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videochamada"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Solicitando vídeo"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Non se pode conectar a videochamada"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Número de devolución de chamada\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Número de devolución de chamada de emerxencia\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Marcación"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada en curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Chamada entrante"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videochamada entrante"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Solicitude de vídeo entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correo de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novo correo de voz (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar o <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número de correo de voz descoñecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sen servizo"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rede seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non dispoñible"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Responder"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vídeo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voz"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Aceptar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Descartar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver chamada"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaxe"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para facer unha chamada, primeiro desactiva o modo avión."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Sen rexistro na rede"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"A rede móbil non está dispoñible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Chamada non enviada; o número introducido non é válido."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Chamada non enviada"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rece móbil non dispoñible."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar unha chamada, introduce un número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Non se pode chamar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando secuencia MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servizo non compatible"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Non se poden cambiar as chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Non se pode separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Non se pode transferir a chamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Non se poden efectuar conferencias."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Non se pode rexeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Non se poden efectuar chamadas."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Número de correo de voz descoñecido."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chamada por Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Servizo non compatible."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Non se poden cambiar as chamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Non se pode separar a chamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Non se pode transferir."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Non se pode establecer a conferencia."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Non se pode rexeitar a chamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Non se poden desconectar as chamadas."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Chamada SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emerxencia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fóra da zona servizo; tentándo de novo..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Chamada non efectuada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de emerxencia."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chamada non enviada. Marca un número de emerxencia."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sen servizo. Tentando de novo…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Non se pode chamar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de emerxencia."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Non se pode chamar. Marcar un número de emerxencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utiliza o teclado para chamar"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Poñer a chamada en espera"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Retomar chamada"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Engadir chamada"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Combinar chamadas"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Alternar chamadas"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Poñer en espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado de marcación"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combinar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Xestionar chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Xestión conferencia"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Xest. conferencia"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochamada"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Cambiar para chamada de voz"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Cambiar cámara"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pausar vídeo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Máis opcións"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servizo"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Sen configurar&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe a túa propia..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dous"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"catro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"oito"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"estrela"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"cero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altofalante activado"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada silenciada"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rexeitar"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videochamada"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como chamada de audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acepta a solicitude de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rexeita a solicitude de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Pasa o dedo cara arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Pasa o dedo cara a esquerda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Pasa o dedo cara a dereita para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Pasa o dedo cara abaixo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Son"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Son predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ton de chamada do teléfono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar ao soar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Soar ao marcar número"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar con teclado"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Completar teclado de marcación"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de chamada e vibración"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Xestionar conferencia telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emerxencia"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 003584f..47ac317 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml
@@ -21,33 +21,13 @@
     <string name="onHold" msgid="9035493194749959955">"होल्ड पर"</string>
     <string name="unknown" msgid="6878797917991465859">"अज्ञात"</string>
     <string name="private_num" msgid="6713286113000232309">"निजी नंबर"</string>
-    <string name="payphone" msgid="1931775086311769314">"सशुल्क फ़ोन"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"लाइन व्यस्त"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"नेटवर्क व्यस्त"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"कोई प्रतिसाद नहीं, समयबाह्य"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"सर्वर पहुंच योग्य नहीं है"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"नंबर पहुंच योग्य नहीं है"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"गलत उपयोगकर्ता नाम या पासवर्ड"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"नेटवर्क के बाहर से कॉल किया गया"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"सर्वर त्रुटि. बाद में पुन: प्रयास करें."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"कोई सिग्नल नहीं"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM सीमा पार हो गई"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"रेडियो बंद"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"कोई सिम नहीं या सिम त्रुटि"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"मोबाइल नेटवर्क उपलब्ध नहीं"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"आउटगोइंग कॉल FDN द्वारा प्रतिबंधित हैं."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"जब कॉल अवरोधन चालू हो, तो आप आउटगोइंग कॉल नहीं कर सकते."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"सभी कॉल पहुंच नियंत्रण द्वारा प्रतिबंधित हैं."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"आपातकालीन कॉल पहुंच नियंत्रण द्वारा प्रतिबंधित किए गए हैं."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"सामान्य कॉल पहुंच नियंत्रण द्वारा प्रतिबंधित हैं."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"अमान्य नंबर"</string>
+    <string name="payphone" msgid="4793877574636445118">"पे-फ़ोन"</string>
     <string name="confCall" msgid="1904840547188336828">"कॉन्फ़्रेंस कॉल"</string>
-    <string name="call_lost" msgid="317670617901479594">"कॉल कट चुकी है."</string>
-    <string name="ok" msgid="3811371167865772377">"ठीक है"</string>
+    <string name="call_lost" msgid="6183862117003999578">"कॉल कट गया"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"स्‍पीकर"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"हैंडसेट ईयरपीस"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"वायर वाला हेडसेट"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ब्लूटूथ"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"निम्न टोन भेजें?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"भेजने वाली टोन\n"</string>
     <string name="send_button" msgid="4106860097497818751">"भेजें"</string>
@@ -57,14 +37,20 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"कॉन्फ़्रेंस कॉल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ध्‍वनिमेल नबंर"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"डायल कर रहा है"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"पुनः प्रयास कर रहा है"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"पुन: डायल हो रहा है"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"कॉन्फ़्रेंस कॉल"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"इनकमिंग कॉल"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"कॉल समाप्त"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"होल्ड पर"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"बंद कर रहा है"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"कॉल समाप्त हो रहा है"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"कॉल में"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"मेरा नंबर <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> है"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"वीडियो कनेक्ट हो रहा है"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"वीडियो कॉल"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"वीडियो का अनुरोध किया जा रहा है"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"वीडियो कॉल कनेक्‍ट नहीं किया जा सकता"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"आपका कॉलबैक नंबर\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"आपका आपातकालीन कॉलबैक नंबर\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"डायल हो रहा है"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"छूटी कॉल"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छूटी कॉल"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"चल रही कॉल"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड पर"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"इनकमिंग कॉल"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"नया ध्वनिमेल"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नई ध्वनिमेल (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"इनकमिंग वीडियो कॉल"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"इनकमिंग वीडियो अनुरोध"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"नया वॉयस मेल"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नई वॉयस मेल (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> डायल करें"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ध्वनिमेल नंबर अज्ञात"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"वॉयस मेल नंबर अज्ञात"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"कोई सेवा नहीं"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"चयनित नेटवर्क (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) अनुपलब्ध"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"उत्तर दें"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"समाप्त करें"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"वीडियो"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"ध्वनि"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"स्वीकार करें"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ख़ारिज करें"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"वापस कॉल करें"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"संदेश"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"कॉल करने के लिए, पहले विमान मोड बंद करें."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्क पर पंजीकृत नहीं."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"मोबाइल नेटवर्क उपलब्ध नहीं."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"कॉल नहीं भेजी गई, कोई मान्य नंबर दर्ज नहीं किया गया."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"कॉल नहीं भेजी गई."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"सेल्युलर नेटवर्क उपलब्ध नहीं."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करने के लिए, मान्‍य नंबर डालें."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"कॉल नहीं किया जा सकता."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI अनुक्रम प्रारंभ हो रहा है…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"असमर्थित सेवा."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"कॉल स्विच करने में असमर्थ."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"कॉल पृथक करने में असमर्थ."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"कॉल स्थानांतरित करने में असमर्थ."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"कॉंन्फ़्रेंस कॉल करने में असमर्थ."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"कॉल अस्वीकृत करने में असमर्थ."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"कॉल छोड़ने में असमर्थ."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"ध्वनिमेल नंबर अज्ञात है."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"इंटरनेट कॉल"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"सेवा समर्थित नहीं है."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कॉल स्‍विच नहीं किए जा सकते."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कॉल अलग नहीं किया जा सकता."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ट्रांसफर नहीं किया जा सकता."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"कॉन्‍फ़्रेंस नहीं की जा सकती."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"कॉल अस्‍वीकार नहीं किया जा सकता."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"कॉल रिलीज़ नहीं किया जा सकता (किए जा सकते)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP कॉल"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आपातकालीन कॉल"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडियो चालू कर रहा है..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"सेवा क्षेत्र के बाहर, पुनः प्रयास कर रहा है..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"कॉल नहीं भेजा गया, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> कोई आपातकालीन नंबर नहीं है!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कॉल नहीं भेजा गया. कोई आपातकालीन नंबर डायल करें!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"कोई सेवा नहीं. पुन: प्रयास किया जा रहा है…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"कॉल नहीं किया जा सकता. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> एक आपातकालीन नंबर नहीं है."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"कॉल नहीं किया जा सकता. आपातकालीन नबर डायल करें."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करने के लिए कीबोर्ड का उपयोग करें"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"कॉल होल्ड करें"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"कॉल फिर से शुरू करें"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"कॉल जोड़ें"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"कॉल मर्ज करें"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"कॉल स्वैप करें"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करें"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"समाप्त"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"डायलपैड"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कॉल मर्ज करें"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"स्वैप करें"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"कॉल प्रबंधित करें"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"कॉन्फ़्रेंस प्रबंधित करें"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ऑडियो"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"वीडियो कॉल"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ध्वनि कॉल में बदलें"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"कैमरा स्विच करें"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"वीडियो रोकें"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"अधिक विकल्प"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"सेवा"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"सेटअप"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;सेट नहीं है&gt;"</string>
@@ -124,49 +125,27 @@
     <string name="goPrivate" msgid="865837794424530980">"निजी हो जाएं"</string>
     <string name="selectContact" msgid="781975788478987237">"संपर्क को चुनें"</string>
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"अपना स्वयं का लिखें..."</string>
-    <string name="custom_message_cancel" msgid="7516406059429609296">"रद्द करें"</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"रहने दें"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"भेजें"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"एक"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"दो"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"तीन"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"चार"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"पांच"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"छ:"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"सात"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"आठ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"नौ"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"तारा"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"शून्‍य"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"पाउंड"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"डायल करें"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"बैकस्पेस"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्‍पीकरफ़ोन सक्षम."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"कॉल म्‍यूट की गई."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS भेजें"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार करें"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"वीडियो कॉल के रूप में उत्तर दें"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ऑडियो कॉल के रूप में उत्तर दें"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"वीडियो अनुरोध स्‍वीकार करें"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"वीडियो अनुरोध अस्‍वीकार करें"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए ऊपर स्‍लाइड करें."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए बाएं स्‍लाइड करें."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए दाएं स्‍लाइड करें."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए नीचे स्‍लाइड करें."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"कंपन करें"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"कंपन करें"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ध्वनि"</string>
     <string name="default_notification_description" msgid="78174796906240970">"डिफ़ॉल्ट ध्वनि (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"फ़ोन रिंगटोन"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"रिंग आने पर कंपन करें"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"कॉल करते समय ध्वनी सुने"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"डायलपैड स्वत: पूर्ण"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"डायलपैड स्‍वत: पूर्ण"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिंगटोन और कंपन"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आपातकालीन नंबर"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index 5191cdf..35d96a2 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Na čekanju"</string>
     <string name="unknown" msgid="6878797917991465859">"Nepoznato"</string>
     <string name="private_num" msgid="6713286113000232309">"Privatni broj"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonska govornica"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linija je zauzeta"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Mreža je zauzeta"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Nema odgovora, privremeno zaustavljeno"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Poslužitelj nedostupan"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Broj je nedostupan"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Netočno korisničko ime ili zaporka"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Poziv izvan mreže"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Pogreška poslužitelja. Pokušajte ponovno kasnije."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nema signala"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Prekoračeno je ACM ograničenje"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio je isključen"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Nema SIM-a ili SIM ima pogrešku"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilna mreža nije dostupna"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odlazne pozive ograničava FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ne možete uspostavljati odlazne pozive ako je uključena zabrana poziva."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Sve je pozive ograničila pristupna kontrola."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Hitne pozive ograničila je pristupna kontrola."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Uobičajene pozive ograničila je pristupna kontrola."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nevažeći broj"</string>
+    <string name="payphone" msgid="4793877574636445118">"Javna telefonska govornica"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferencijski poziv"</string>
-    <string name="call_lost" msgid="317670617901479594">"Poziv je prekinut."</string>
-    <string name="ok" msgid="3811371167865772377">"U redu"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Poziv je prekinut"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Zvučnik"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Slušalice"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Žičane slušalice"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Broj govorne pošte"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Biranje broja"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Ponovni pokušaj"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Ponovno biranje"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferencijski poziv"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Dolazni poziv"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Poziv je završio"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Prekidanje veze"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Poziv u tijeku"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Moj broj je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Povezivanje videopoziva"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videopoziv"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Zahtijevanje videopiziva"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videopoziv nije uspostavljen"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Vaš broj za povratni poziv\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Vaš broj za povratni poziv za hitne službe\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Biranje broja"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Propušteni poziv"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Propušteni pozivi"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Poziv u tijeku"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Dolazni poziv"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Dolazni videopoziv"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Dolazni zahtjev za videopoziv"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova govorna pošta"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nova govorna pošta (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Biraj <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nepoznat je broj govorne pošte"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nema usluge"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Odabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) je onemogućena"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Odgovori"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Prekini vezu"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Videozapis"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Glasovno"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Prihvaćam"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Odbaci"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Povratni poziv"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Poruka"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Da biste uspostavili poziv, prvo isključite način rada u zrakoplovu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nije registrirano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilna mreža nije dostupna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Poziv nije uspostavljen, nije unijet valjani broj."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Poziv nije poslan."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilna mreža nije dostupna."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Unesite važeći broj da biste uspostavili poziv."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Pozivanje nije moguće."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Pokretanje MMI sekvence…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodržana usluga."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nije moguće prebaciti pozive."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nije moguće odvojiti poziv."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nije moguće prenijeti poziv."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nije moguće uspostaviti konferencijske pozive."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nije moguće odbiti poziv."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nije moguće ostvariti pozi(e)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Broj govorne pošte nije poznat."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetski poziv"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Usluga nije podržana."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Prebacivanje poziva nije moguće."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Odvajanje poziva nije moguće."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Prijenos nije moguć."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferencijski poziv nije moguć."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Odbijanje poziva nije moguće."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Prekidanje poziva nije moguće."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP poziv"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hitan poziv"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Uključivanje radija…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Izvan područja usluge, ponovni pokušaj..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Poziv nije upućen. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za hitne pozive!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Poziv nije upućen. Birajte broj hitne službe!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nema usluge. Pokušavamo ponovo…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Pozivanje nije moguće. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj hitne službe."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Pozivanje nije moguće. Nazovite broj hitne službe."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Birajte pomoću tipkovnice"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Stavi poziv na čekanje"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Nastavi poziv"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Dodaj poziv"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Spoji pozive"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Prebaci na drugi poziv"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Na čekanju"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Kraj"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Površina za biranje brojeva"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spoji pozive"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamijeni"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Upravljaj pozivima"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Upravljanje konferencijom"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Upravljaj konferencijskim pozivom"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videopoziv"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Prijeđi na glasovni poziv"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Prebaci se na drugi fotoaparat"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pauziraj video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Više opcija"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Usluga"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Postavljanje"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nije postavljeno&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napišite odgovor..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Odustani"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Pošalji"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jedan"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dva"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tri"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"četiri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pet"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šest"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedam"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osam"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devet"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"zvjezdica"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nula"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"funta"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"biraj"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Zvučnik je omogućen."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvuk poziva isključen."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošalji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odbij"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Prihvati kao videopoziv"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Prihvati kao audiopoziv"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Prihvati zahtjev za videozapis"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odbij zahtjev za videozapis"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Kliznite prema gore za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Kliznite lijevo za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Kliznite desno za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Kliznite prema dolje za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibracija"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibracija"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Zadani zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Melodija zvona telefona"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrira dok zvoni"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonovi biranja"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Samodovršavanje biranja brojeva"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Samodovr. povr. za biranje br."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Melodija zvona i vibracija"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljanje konferencijskim pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Broj hitne službe"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index 50fa226..67be5aa 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Tartásban"</string>
     <string name="unknown" msgid="6878797917991465859">"Ismeretlen"</string>
     <string name="private_num" msgid="6713286113000232309">"Magántelefonszám"</string>
-    <string name="payphone" msgid="1931775086311769314">"Nyilvános telefon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"A vonal foglalt"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"A hálózat túlterhelt"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Nincs válasz, időtúllépés történt"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"A szerver nem érhető el"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"A szám nem érhető el"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Helytelen felhasználónév vagy jelszó"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"A hívó hálózaton kívüli volt"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Szerverhiba. Kérjük, próbálkozzon újra."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nincs vonal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Elérte az ACM-korlátot"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádió kikapcsolva"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Hiányzó vagy hibás SIM kártya"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"A mobilhálózat nem érhető el"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Az FDN korlátozza a kimenő hívásokat."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Nem kezdeményezhet hívásokat, amíg a hívásletiltás be van kapcsolva."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Minden hívást korlátoz a hozzáférésvezérlés."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"A segélyhívásokat korlátozza a hozzáférésvezérlés."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"A normál hívásokat korlátozza a hozzáférésvezérlés."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Érvénytelen szám"</string>
+    <string name="payphone" msgid="4793877574636445118">"Nyilvános telefon"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenciahívás"</string>
-    <string name="call_lost" msgid="317670617901479594">"A hívás megszakadt."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"A hívás megszakadt"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Hangszóró"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Kézibeszélő fülhallgatója"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Vezetékes fülhallgató"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenciahívás: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Hangposta száma"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Tárcsázás"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Újrapróbálkozás"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Újratárcsázás"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenciahívás"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Bejövő hívás"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"A hívás befejeződött"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Megszakítás"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Hívásban"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"A számom: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Videó csatlakoztatása"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videohívás"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Videohívást kér"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"A videohívás létesítése sikertelen"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Visszahívható telefonszáma\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Vészhelyzet esetén visszahívható telefonszáma\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Tárcsázás"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Nem fogadott hívás"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Nem fogadott hívások"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Hívás folyamatban"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Tartásban"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Bejövő hívás"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Bejövő videohívás"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Bejövő videokérés"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Új hangposta"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Új hangpostaüzenet (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> tárcsázása"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"A hangposta száma ismeretlen"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nincs szolgáltatás"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"A kiválasztott hálózat (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nem érhető el"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Válasz"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Hívás befejezése"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Videó"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Hang"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Elfogadás"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Elvetés"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Visszahívás"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Üzenet"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Híváskezdeményezéshez kapcsolja ki a Repülőgép üzemmódot."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nincs regisztrálva a hálózaton."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"A mobilhálózat nem érhető el."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"A hívás indítása érvénytelen szám beírása miatt nem történt meg."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"A hívás nem indítható."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"A mobilhálózat nem érhető el."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Hívásindításhoz adjon meg egy érvényes számot."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"A hívás sikertelen."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-sorozat indítása..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nem támogatott szolgáltatás"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nem lehet váltani a hívások között."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nem lehet elkülöníteni a hívást."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nem lehet továbbítani a hívást."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nem lehet konferenciahívást folytatni."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nem lehet elutasítani a hívást."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nem lehet befejezni a hívás(oka)t."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"A hangpostaszám ismeretlen."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetes hívás"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"A szolgáltatás nem támogatott."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"A hívások közötti váltás sikertelen."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"A híváselkülönítés sikertelen."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Az átirányítás sikertelen."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"A konferenciahívás sikertelen."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"A híváselutasítás sikertelen."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"A tartásban lévő hívás(ok) folytatása sikertelen."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-hívás"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Segélyhívás"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Rádió bekapcsolása..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Szolgáltatási területen kívüli terület, újrapróbálás..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"A hívás nem indítható. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nem segélyhívó szám!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"A hívás nem indítható. Tárcsázzon egy segélyhívó számot!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nincs szolgáltatás. Újrapróbálkozás folyamatban…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"A hívás sikertelen. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> szám nem vészhívószám."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"A hívás sikertelen. Tárcsázzon vészhívószámot."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"A tárcsázáshoz használja a billentyűzetet"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Hívás tartása"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Hívás folytatása"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Hívás hozzáadása"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Hívások egyesítése"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Hívások cseréje"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tartás"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Befejezés"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tárcsázó"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hívások egyesítése"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Csere"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Hívások kezelése"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferencia kezelése"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Konferenciahívás kezelése"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Hang"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohívás"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Váltás hanghívásra"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Kamera váltása"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Videó szüneteltetése"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"További lehetőségek"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Szolgáltatás"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Beállítás"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nincs megadva&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Saját válasz írása..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Mégse"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Küldés"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"egy"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"kettő"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"három"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"négy"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"öt"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"hat"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"hét"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"nyolc"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"kilenc"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"csillag"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nulla"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"kettős kereszt"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"tárcsázás"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kihangosítás engedélyezve."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Hívás némítva."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Fogadás"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS küldése"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Elutasítás"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Fogadás videohívásként"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Fogadás hanghívásként"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Videó kérésének elfogadása"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Videó kérésének elutasítása"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa felfelé."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa balra."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa jobbra."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"A(z) <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> művelethez csúsztassa lefelé."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rezgés"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rezgés"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Hang"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Alapértelmezett hang (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Telefon csengőhangja"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Csengetéskor rezegjen"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tárcsázó érintési hangjai"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Tárcsázó automatikus kiegészítés"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Tárcsázás kiegészítése"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Csengőhang és rezgés"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferenciahívás kezelése"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Segélyhívó szám"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index 76d9e56..301bd1e 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Սպասում"</string>
     <string name="unknown" msgid="6878797917991465859">"Անհայտ"</string>
     <string name="private_num" msgid="6713286113000232309">"Գաղտնի համար"</string>
-    <string name="payphone" msgid="1931775086311769314">"Վճարել հեռախոսի համար"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Գիծը զբաղված է"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Ցանցը զբաղված է"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Պատասխան չկա, ժամանակը սպառվել է"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Սերվերն անհասանելի է"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Համարն անհասանելի է"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Սխալ օգտանուն կամ գաղտնաբառ"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Զանգել է՝ ցանցից դուրս գտնվելով"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Սերվերի սխալ: Փորձեք կրկին ավելի ուշ:"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Կապը բացակայում է"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM սահմանափակումը գերազանցվել է"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Ռադիոն անջատել"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM- բացակայում է կամ SIM-ի սխալ"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Բջջային ցանցն անհասանելի է"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Ելքային զանգերը սահմանափակված են FDN-ի կողմից:"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Դուք չեք կարող կատարել ելքային զանգեր զանգի արգելափակման միացված ժամանակ:"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Բոլոր զանգերը սահմանափակված են մատչման կարգավորումներով:"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Արտակարգ իրավիճակների զանգերը սահմանափակված են մատչման կարգավորումներով:"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Սովորական զանգերը սահմանափակված են մատչման կարգավորումներով:"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Անվավեր համար"</string>
+    <string name="payphone" msgid="4793877574636445118">"Բջջային տերմինալ"</string>
     <string name="confCall" msgid="1904840547188336828">"Կոնֆերանս զանգ"</string>
-    <string name="call_lost" msgid="317670617901479594">"Զանգը խափանված է:"</string>
-    <string name="ok" msgid="3811371167865772377">"Լավ"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Զանգը դադարեցվեց"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Բարձրախոս"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Հեռախոսի ականջակալ"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Լարային ականջակալ"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Կոնֆերանս զանգ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Ձայնային փոստի համարը"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Համարարկվում է"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Կրկին է փորձում"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Վերահամարարկում"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Կոնֆերանս զանգ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Մուտքային զանգ"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Զանգն ավարտվեց"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Կապվում է"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Զանգը միացված է"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Իմ համարը՝ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Տեսակապը միանում է"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Տեսազանգել"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Տեսակապի հայցում"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Հնարավոր չէ կապակցել տեսազանգը"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Ձեր հետադարձ զանգի համարը՝\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Արտակարգ իրավիճակների հետադարձ զանգի համարը՝\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Համարարկում է"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Բաց թողնված զանգ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Բաց թողնված զանգեր"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Ընթացիկ զանգը"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Սպասում"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Մուտքային զանգ"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Մուտքային տեսազանգ"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Մուտքային տեսազանգի հայցում"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Նոր ձայնային հաղորդագրություն"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Նոր ձայնային նամակ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Զանգել <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ձայնային փոստի համարն անհայտ է"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ծառայություններ չկան"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Ընտրված ցանցը (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) անհասանելի է"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Պատասխանել"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Վայր դնել"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Տեսազանգ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Ձայնային"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Ընդունել"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Անտեսել"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Հետ զանգել"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Ուղարկել հաղորդագրություն"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Զանգի կատարման համար նախ անջատեք թռիչքային ռեժիմը:"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ցանցում գրանցված չէ:"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Բջջային ցանցն անհասանելի է:"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Զանգը չի առաքվել, անվավեր համար է մուտքագրված:"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Զանգը չի առաքվել:"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Բջջային ցանցն անհասանելի է:"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Զանգ կատարելու համար մուտքագրեք ճիշտ համար:"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Հնարավոր չէ զանգել:"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Մեկնարկում է MMI հաջորդականությունը..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Չսպասարկվող ծառայություն:"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Հնարավոր չէ փոխարկել զանգերը:"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Հնարավոր չէ առանձնացնել զանգը:"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Հնարավոր չէ փոխանցել հեռախոսազանգը:"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Կոնֆերանս զանգը հնարավոր չէ:"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Հնարավոր չէ մերժել զանգը:"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Հնարավոր չէ իրականացնել զանգ(եր)ը:"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Ձայնային փոստի համարն անհայտ է:"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Ինտերնետային զանզ"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Ծառայությունը չի աջակցվում:"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Հնարավոր չէ փոխանջատել զանգը:"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Հնարավոր չէ առանձնացնել զանգը:"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Հնարավոր չէ փոխանցել:"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Հնարավոր չէ խմբային զանգ կատարել:"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Հնարավոր չէ մերժել զանգը:"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Հնարավոր չէ անջատել զանգ(եր)ը:"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP զանգ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Արտակարգ իրավիճակների զանգ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ռադիոն միացվում է..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Սպասարկման ծածկույթից դուրս է, փորձում է կրկին..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Զանգը չի առաքվել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>-ն արտակարգ իրավիճակների հեռախոսահամար չէ:"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Զանգը չի առաքվել: Համարարկեք արտակարգ իրավիճակների հեռախոսահամար:"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ծառայությունը մատչելի չէ: Նորից փորձեք…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Հնարավոր չէ զանգել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> համարը արտակարգ իրավիճակի համար չէ:"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Հնարավոր չէ զանգել: Հավաքեք արտակարգ իրավիճակի որևէ համար:"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Օգտագործեք ստեղնաշարը՝ համարհավաքման համար"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Պահել զանգը"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Վերսկսել զանգը"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Ավելացնել զանգ"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Միացնել զանգերը"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Փոխանակել զանգերը"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Պահել"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ավարտել"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Թվաշար"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Միավորել զանգերը"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Փոխանակել"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Կառավարել զանգերը"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Կառավարել կոնֆերանսը"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Կառավարել կոնֆերանս զանգը"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ձայնանյութ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Տեսազանգել"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Փոխարկել ձայնային կանչի"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Փոխարկել խցիկը"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Դադարեցնել տեսանյութի դիտումը"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Այլ ընտրանքներ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Ծառայություն"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Կարգավորում"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Նշված չէ&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Գրեք ձեր սեփականը..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Չեղարկել"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Ուղարկել"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"մեկ"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"երկու"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"երեք"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"չորս"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"հինգ"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"վեց"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"յոթ"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ութ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ինը"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"Աստղանշել"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"զրո"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ֆունտ"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"համարհավաքել"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"հետշարժ"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Բարձրախոսը միացված է:"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Զանգը խլացված է:"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Պատասխանել"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Ուղարկել SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Մերժել"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Պատասխանել տեսազանգով"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Պատասխանել ձայնային զանգով"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Ընդունել տեսանյութի հարցումը"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Մերժել տեսանյութի հարցումը"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Սահեցրեք վերև` <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Սահեցրեք ձախ` <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Սահեցրեք աջ` <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Սահեցրեք ցած <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ի համար:"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Թրթռալ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Թրթռալ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ձայն"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Լռելյայն ձայներանգը (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Հեռախոսի զանգերանգ"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Թրթռալ զանգի ժամանակ"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Թվաշարի հպման ձայներանգներ"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Թվաշարի ինքնալրացում"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Թվատախտակի ինքնալրացում"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ձայներանգ &amp; Թրթռոց"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Կառավարեք կոնֆերանս զանգը"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Արտակարգ իրավիճակների հեռախոսահամար"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index 77a3a34..a5819c6 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml
@@ -21,30 +21,10 @@
     <string name="onHold" msgid="9035493194749959955">"Ditangguhkan"</string>
     <string name="unknown" msgid="6878797917991465859">"Tidak diketahui"</string>
     <string name="private_num" msgid="6713286113000232309">"Nomor pribadi"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telepon umum"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Jalur sibuk"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Jaringan sibuk"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Tidak ada jawaban, waktu habis"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server tidak dapat dijangkau"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nomor tidak dapat dijangkau"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nama pengguna atau sandi salah"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Dipanggil dari luar jaringan"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Kesalahan Server: Coba lagi nanti."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Tidak ada sinyal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM melebihi batas"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio mati"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Tidak ada SIM atau kesalahan SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Jaringan seluler tidak tersedia"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Panggilan keluar dibatasi oleh FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Anda tidak dapat melakukan panggilan keluar sewaktu pemblokiran panggilan aktif."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Semua panggilan dibatasi oleh kontrol akses."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Panggilan darurat dibatasi oleh kontrol akses."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Panggilan normal dibatasi oleh kontrol akses."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nomor tidak valid"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telepon Umum"</string>
     <string name="confCall" msgid="1904840547188336828">"Telewicara"</string>
-    <string name="call_lost" msgid="317670617901479594">"Panggilan telah terputus."</string>
-    <string name="ok" msgid="3811371167865772377">"Oke"</string>
-    <string name="audio_mode_speaker" msgid="27649582100085266">"Pelantang"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Panggilan terputus"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Earpiece handset"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Headset berkabel"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Telewicara <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nomor kotak pesan"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Memanggil"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Mencoba ulang"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Memanggil ulang"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telewicara"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Panggilan masuk"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Panggilan diakhiri"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Menutup panggilan"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Sedang dalam panggilan"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Nomor saya <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Menyambungkan video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video call"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Meminta video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Tidak dapat menyambungkan video call"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Nomor panggilan balik Anda\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Nomor panggilan balik darurat Anda\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Memanggil"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Panggilan tak terjawab"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tak terjawab"</string>
@@ -73,47 +59,62 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan yang sedang berlangsung"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ditangguhkan"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Video call masuk"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Permintaan video masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Kotak pesan baru"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Kotak pesan baru (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Panggil <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Telepon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nomor kotak pesan tidak dikenal"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Tidak ada layanan"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Jaringan yang dipilih (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Jawab"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Akhiri"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Suara"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Terima"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Tutup"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Hubungi kembali"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Pesan"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Untuk melakukan panggilan, pertama-tama matikan mode Pesawat."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tidak terdaftar pada jaringan."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Jaringan seluler tidak tersedia."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Panggilan tidak terkirim, tidak ada nomor valid yang dimasukkan."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Panggilan tidak terkirim."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Jaringan seluler tidak tersedia."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Untuk melakukan panggilan telepon, masukkan nomor yang valid."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Tidak dapat menelepon."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Memulai urutan MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Layanan tidak didukung."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Tidak dapat mengalihkan panggilan."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Tidak dapat memisahkan panggilan."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Tidak dapat mentransfer panggilan."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Tidak dapat melakukan telewicara."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Tidak dapat menolak panggilan."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Tidak dapat melepaskan panggilan."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Nomor kotak pesan tidak dikenal."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Panggilan internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Layanan tidak didukung."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat berganti panggilan telepon."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat memisahkan panggilan telepon."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Tidak dapat mentransfer."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Tidak dapat melakukan konferensi."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Tidak dapat menolak panggilan telepon."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Tidak dapat melepas panggilan telepon."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Panggilan SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Panggilan darurat"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Menghidupkan radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Di luar area layanan, mencoba sekali lagi..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Panggilan tidak terkirim. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nomor darurat!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Panggilan tidak terkirim. Panggil nomor darurat!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Tidak ada layanan. Mencoba lagi…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Tidak dapat menelepon. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nomor darurat."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Tidak dapat menelepon. Panggil nomor darurat."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gunakan keyboard untuk memanggil"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Tahan panggilan"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Lanjutkan panggilan"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Tambahkan panggilan"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Gabungkan panggilan"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Tukar panggilan"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tahan"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Akhiri"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dialpad"</string>
-    <string name="onscreenMuteText" msgid="5011369181754261374">"Bungkam"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Bisukan"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Tambahkan panggilan"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabungkan panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Tukar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Kelola panggilan"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Kelola konferensi"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Kelola panggilan konferensi"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Ubah ke panggilan suara"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Beralih kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Jeda video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Opsi lainnya"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Layanan"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Penyiapan"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Tidak disetel&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis respons Anda sendiri…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Batal"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Kirim"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tiga"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"empat"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"lima"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"enam"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"tujuh"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"delapan"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"sembilan"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"bintang"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nol"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"panggil"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Pengeras suara ponsel diaktifkan."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan disenyapkan."</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Menjawab"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Jawab"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Mengirim SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Menolak"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Jawab sebagai video call"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Jawab sebagai panggilan audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Terima permintaan video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tolak permintaan video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Geser ke atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Geser ke kiri untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Geser ke kanan untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Geser ke bawah untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Suara"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Suara default (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Nada dering ponsel"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Bergetar saat berdering"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Nada sentuh dial pad"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Lengkapi otomatis tombol nomor"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Pelengkapan otomatis tombol nomor"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Getar"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Kelola penggilan telewicara"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nomor darurat"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-is-rIS/strings.xml b/InCallUI/res/values-is-rIS/strings.xml
index 616fb2f..ed262ab 100644
--- a/InCallUI/res/values-is-rIS/strings.xml
+++ b/InCallUI/res/values-is-rIS/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Í bið"</string>
     <string name="unknown" msgid="6878797917991465859">"Óþekkt"</string>
     <string name="private_num" msgid="6713286113000232309">"Leyninúmer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Almenningssími"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Línan er upptekin"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Símkerfið er upptekið"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Ekkert svar, rann út á tíma."</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Ekki næst í þjóninn"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Ekki næst í númerið"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Rangt notandanafn eða aðgangsorð"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Hringt utan kerfis"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Þjónsvilla. Reyndu aftur síðar."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Ekkert samband"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-hámarki náð"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Slökkt á loftneti"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ekkert SIM-kort eða villa á SIM-korti"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Farsímakerfi ekki tiltækt"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Fast númeraval lokar á hringd símtöl."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ekki er hægt að hringja þegar kveikt er á útilokun símtala."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Aðgangsstýring lokar á öll símtöl."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Aðgangsstýring lokar á neyðarsímtöl."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Aðgangsstýring lokar á venjuleg símtöl."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ógilt númer"</string>
+    <string name="payphone" msgid="4793877574636445118">"Símasjálfsali"</string>
     <string name="confCall" msgid="1904840547188336828">"Símafundur"</string>
-    <string name="call_lost" msgid="317670617901479594">"Símtalið slitnaði."</string>
-    <string name="ok" msgid="3811371167865772377">"Í lagi"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Símtali slitið"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Hátalari"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Símahátalari"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Höfuðtól með snúru"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Símafundur <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Talhólfsnúmer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Hringir"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Reynir aftur"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Hringir aftur"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Símafundur"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Símtal berst"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Lagt á"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Leggur á"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Í símtali"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Númerið mitt er <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Tengir myndskeið"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Myndsímtal"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Biður um myndskeið"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Ekki tókst að tengja myndsímtal"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Svarhringinúmerið þitt\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Svarhringinúmerið þitt í neyð\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Hringir"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ósvarað símtal"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ósvöruð símtöl"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Samtal í gangi"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Í bið"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Símtal berst"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Myndsímtal berst"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Myndbeiðni berst"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ný skilaboð í talhólfinu"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Ný skilaboð í talhólfinu (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Hringja í <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Talhólfsnúmer ekki þekkt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ekkert símasamband"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valið símkerfi (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ekki tiltækt"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Svara"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Leggja á"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Myndskeið"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Tal"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Samþykkja"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Hunsa"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Hringja til baka"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Skilaboð"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Til að hringja símtal þarftu fyrst að slökkva á flugstillingu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ekki skráð á símkerfi."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Farsímakerfi ekki tiltækt."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Símtalið var ekki sent, gilt símanúmer var ekki slegið inn."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Símtalið var ekki sent."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Farsímakerfi ekki til staðar."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Sláðu inn gilt númer til að hringja símtal."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ekki hægt að hringja."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Ræsir MMI-runu…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Óstudd þjónusta."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ekki hægt að skipta milli símtala."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Ekki hægt að aðskilja símtal."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Ekki hægt að flytja símtal."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Ekki hægt að halda símafund."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Ekki hægt að hafna símtali."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Ekki hægt að hringja."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Talhólfsnúmer óþekkt."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Netsímtal"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Þjónustan er ekki studd."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ekki hægt að skipta milli símtala."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ekki hægt að aðskilja símtal."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ekki hægt að flytja."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Ekki hægt að halda símafund."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Ekki hægt að hafna símtali."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Ekki hægt að leggja á."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-símtal"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Neyðarsímtal"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Kveikir á loftneti…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Utan þjónustusvæðis. Reynir aftur…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Símtalið var ekki sent. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ekki neyðarnúmer."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Símtalið var ekki sent. Sláðu inn neyðarnúmer."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ekkert samband. Reynir aftur…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ekki hægt að hringja. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ekki neyðarnúmer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ekki hægt að hringja. Hringdu í neyðarnúmer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Notaðu lyklaborðið til að hringja"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Setja símtal í bið"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Halda símtali áfram"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Bæta við símtali"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Sameina símtöl"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Skipta á símtölum"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Setja í bið"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ljúka"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Takkaborð"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sameina símtöl"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Skipta milli"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Stjórna símtölum"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Stjórna símafundi"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Stjórna símafundi"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Hljóð"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Myndsímtal"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Breyta í símtal"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Skipta um myndavél"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Gera hlé á myndskeiði"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Fleiri valkostir"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Þjónusta"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Uppsetning"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ekki valið&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skrifaðu eigið svar…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Hætta við"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Senda"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"einn"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"tveir"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"þrír"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fjórir"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fimm"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sex"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sjö"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"átta"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"níu"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"stjarna"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"núll"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"kassi"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"hringja"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"bakklykill"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kveikt á hátalara."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Símtal þaggað."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Senda SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Hafna"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Svara sem myndsímtali"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Svara sem símtali"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Samþykkja beiðni um myndsímtal"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Hafna beiðni um myndsímtal"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Strjúktu upp til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Strjúktu til vinstri til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Strjúktu til hægri til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Strjúktu niður til að <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titringur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titringur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Hljóð"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sjálfgefið hljóð (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Hringitónn síma"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Titra við hringingu"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Snertitónar takkaborðs"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Sjálfvirk útfylling á takkaborði"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Flýtiritun símatakkaborðs"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Hringitónn og titringur"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Stjórna símafundi"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Neyðarnúmer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-it/strings.xml b/InCallUI/res/values-it/strings.xml
index b889580..0cca18e 100644
--- a/InCallUI/res/values-it/strings.xml
+++ b/InCallUI/res/values-it/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"In attesa"</string>
     <string name="unknown" msgid="6878797917991465859">"Sconosciuto"</string>
     <string name="private_num" msgid="6713286113000232309">"Numero privato"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefono a monete"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linea occupata"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rete occupata"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Nessuna risposta, timeout"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server non raggiungibile"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numero non raggiungibile"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Password o nome utente errato"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chiamata da fuori rete"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Errore del server. Riprova più tardi."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nessun segnale"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite ACM superato"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Segnale cellulare disattivato"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Nessuna SIM o errore della SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Rete mobile non disponibile"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Chiamate in uscita limitate da FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Impossibile effettuare chiamate in uscita con il blocco chiamate attivo."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tutte le chiamate sono limitate dal controllo di accesso."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Chiamate di emergenza limitate dal controllo di accesso."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Le normali chiamate sono limitate dal controllo di accesso."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numero non valido"</string>
+    <string name="payphone" msgid="4793877574636445118">"Cabina telefonica"</string>
     <string name="confCall" msgid="1904840547188336828">"Audioconferenza"</string>
-    <string name="call_lost" msgid="317670617901479594">"La chiamata è stata persa."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Chiamata persa"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altoparlante"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricolare telefono"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auricolare con cavo"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Audioconferenza <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero segreteria"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Chiamata in corso"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nuovo tentativo"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Ricomposizione"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Audioconferenza"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Chiamata in arrivo"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chiamata terminata"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"In fase di chiusura"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Chiamata"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Il mio numero è <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Collegamento video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videochiamata"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Richiesta video..."</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Impossibile effettuare una videochiamata"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Il numero da richiamare\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Numero da richiamare in caso di emergenza\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Chiamata in corso"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chiamata senza risposta"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chiamate senza risposta"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Chiamata in corso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"In attesa"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Chiamata ricevuta"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Videochiamata in arrivo"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Richiesta video in arrivo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuovo msg vocale"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nuovo msg vocale (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Componi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numero segreteria sconosciuto"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nessun servizio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rete selezionata (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponibile"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Rispondi"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Riaggancia"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voce"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accetta"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ignora"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Richiama"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Messaggio"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Per fare una telefonata, disattiva la modalità aereo."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non registrato sulla rete."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rete cellulare non disponibile."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Chiamata non inviata. Nessun numero valido inserito."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Chiamata non inviata."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rete cellulare non disponibile."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Per effettuare una chiamata, inserisci un numero valido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Impossibile chiamare."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Inizio sequenza MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servizio non supportato."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impossibile passare all\'altra chiamata."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impossibile separare le chiamate."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impossibile trasferire la chiamata."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Audioconferenze non disponibili"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impossibile rifiutare la chiamata."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impossibile riprendere le chiamate."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Numero segreteria sconosciuto."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chiamata Internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Servizio non supportato."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossibile cambiare chiamata."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossibile separare la chiamata."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Impossibile trasferire."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Impossibile fare una chiamata in conferenza."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Impossibile rifiutare la chiamata."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Impossibile riagganciare."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Chiamata SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chiamata di emergenza"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Attivazione segnale cellulare..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Area non coperta dal servizio. Nuovo tentativo..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Chiamata non inviata. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non è un numero di emergenza."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chiamata non inviata. Componi un numero di emergenza."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nessun servizio. Nuovo tentativo…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Impossibile chiamare. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non è un numero di emergenza."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Impossibile chiamare. Componi un numero di emergenza."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Usa tastiera"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Metti in attesa la chiamata"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Riprendi chiamata"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Aggiungi chiamata"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Unisci chiamate"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Scambia le chiamate"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In attesa"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Chiudi"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastierino"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Unisci"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Scambia"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestisci chiamate"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestisci conferenza"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gestisci audioconferenza"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochiam."</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Imposta chiamata vocale"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Cambia fotocamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Metti in pausa video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Altre opzioni"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servizio"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configurazione"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Non impostato&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Scrivi risposta personale..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annulla"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Invia"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"due"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quattro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinque"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sei"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sette"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"otto"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"asterisco"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"sterlina"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"componi"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Vivavoce attivo."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chiamata disattivata."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Rispondi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Invia SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rifiuta"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Rispondi con videochiamata"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Rispondi con chiamata audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accetta richiesta video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Rifiuta richiesta video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Scorri verso l\'alto per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Scorri verso sinistra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Scorri verso destra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Scorri verso il basso per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrazione"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrazione"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Suono"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Suono predefinito (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Suoneria telefono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrazione quando squilla"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toni tastierino"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Completam. autom. tastierino"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Tastierino con completam. auto"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Suoneria e vibrazione"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestisci audioconferenza"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numero di emergenza"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-iw/strings.xml b/InCallUI/res/values-iw/strings.xml
index 47b8b49..5a6350a 100644
--- a/InCallUI/res/values-iw/strings.xml
+++ b/InCallUI/res/values-iw/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"בהמתנה"</string>
     <string name="unknown" msgid="6878797917991465859">"לא ידוע"</string>
     <string name="private_num" msgid="6713286113000232309">"מספר פרטי"</string>
-    <string name="payphone" msgid="1931775086311769314">"טלפון ציבורי"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"הקו לא פנוי"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"רשת לא פנויה"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"אין תגובה, החיבור הסתיים"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"אין אפשרות להשיג את השרת"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"אין אפשרות להשיג את המספר"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"שם משתמש או סיסמה שגויים"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"שיחה מחוץ לרשת"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"שגיאת שרת. נסה שוב מאוחר יותר."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"אין אות"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"‏חריגה ממגבלת ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"רדיו כבוי"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"‏אין SIM או שגיאת SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"רשת סלולרית אינה זמינה"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"‏שיחות יוצאות מוגבלות על ידי FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"לא ניתן לבצע שיחות יוצאות כאשר חסימת שיחות מופעלת."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"כל השיחות מוגבלות על ידי בקרת גישה."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"שיחות חירום מוגבלות על ידי בקרת גישה."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"שיחות רגילות מוגבלות על ידי בקרת גישה."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"מספר לא חוקי"</string>
+    <string name="payphone" msgid="4793877574636445118">"טלפון ציבורי"</string>
     <string name="confCall" msgid="1904840547188336828">"שיחת ועידה"</string>
-    <string name="call_lost" msgid="317670617901479594">"השיחה אבדה."</string>
-    <string name="ok" msgid="3811371167865772377">"אישור"</string>
+    <string name="call_lost" msgid="6183862117003999578">"השיחה נותקה"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"רמקול"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"אוזניה"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"אוזניות קוויות"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"שיחת ועידה <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"המספר של הדואר הקולי"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"מחייג"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"מנסה שוב"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"מחייג שוב"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"שיחת ועידה"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"שיחה נכנסת"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"השיחה הסתיימה"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"מנתק"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"בשיחה"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"המספר שלי הוא <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"מחבר וידאו"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"שיחת וידאו"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"מבקש וידאו"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"לא ניתן לחבר שיחת וידאו"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"המספר שלך להתקשרות חזרה\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"המספר שלך להתקשרות חזרה במצב חירום\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"מחייג"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"שיחה שלא נענתה"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"שיחות שלא נענו"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"שיחה פעילה"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"בהמתנה"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"שיחה נכנסת"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"שיחת וידאו נכנסת"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"בקשת וידאו נכנסת"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"דואר קולי חדש"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"דואר קולי חדש (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"‏חייג ‎<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>‎"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"המספר של הדואר הקולי אינו ידוע"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"אין שירות"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"הרשת שנבחרה (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) לא זמינה"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"ענה"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"נתק"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"סרטון"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"קול"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"קבל"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"דחה"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"התקשר חזרה"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"שלח הודעה"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"כדי להתקשר, כבה תחילה את מצב טיסה."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"לא רשום ברשת."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"הרשת לנייד אינה זמינה."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"השיחה לא נשלחה, לא הוזן מספר חוקי."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"השיחה לא נשלחה."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"רשת סלולרית אינה זמינה."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"כדי להתקשר, הזן מספר טלפון חוקי."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"לא ניתן להתקשר."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏מתחיל רצף MMI…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"שירות לא נתמך."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"אין אפשרות להחליף שיחות."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"אין אפשרות להפריד את השיחה."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"אין אפשרות להעביר את השיחה."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"אין אפשרות לנהל שיחות ועידה."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"אין אפשרות לדחות את השיחה."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"אין אפשרות להוציא שיחות."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"מספר הדואר הקולי אינו מוכר."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"שיחת אינטרנט"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"שירות לא נתמך."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"לא ניתן לעבור בין שיחות."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"לא ניתן להפריד שיחה."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"לא ניתן להעביר."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"לא ניתן לבצע שיחת ועידה."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"לא ניתן לדחות שיחה."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"לא ניתן לשחרר שיחות."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"‏שיחת SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"שיחת חירום"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"מפעיל את הרדיו…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"מחוץ לאזור שירות, מנסה שוב..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"השיחה לא נשלחה. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"השיחה לא נשלחה. חייג מספר חירום!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"אין שירות. מנסה שוב..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"לא ניתן להתקשר. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"לא ניתן להתקשר. חייג למספר חירום."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"השתמש במקלדת כדי לחייג"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"העבר שיחה להמתנה"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"המשך בשיחה"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"הוסף שיחה"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"מזג שיחות"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"החלף שיחות"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"השהה"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"סיום"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"לוח חיוג"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"מזג שיחות"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"החלף"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"נהל שיחות"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"נהל ועידה"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"נהל שיחת ועידה"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"אודיו"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"שיחת וידאו"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"שנה לשיחה קולית"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"החלף מצלמה"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"השהה סרטון"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"אפשרויות נוספות"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"שירות"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"הגדרות"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;לא הוגדר&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"כתוב אחת משלך..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"בטל"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"שלח"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"אחת"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"שתיים"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"שלוש"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"ארבע"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"חמש"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"שש"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"שבע"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"שמונה"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"תשע"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"כוכבית"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"אפס"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"סולמית"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"חייג"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"רמקול מופעל."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"שיחה מושתקת."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ענה"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏שלח SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"דחה"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ענה כשיחת וידאו"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ענה כשיחת אודיו"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"קבל בקשת וידאו"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"דחה בקשת וידאו"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"הסט למעלה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"הסט שמאלה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"הסט ימינה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"הסט למטה ל<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"רטט"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"רטט"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"צליל"</string>
     <string name="default_notification_description" msgid="78174796906240970">"צליל ברירת מחדל (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"רינגטון של טלפון"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"רטט בעת צלצול"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"צלילי מגע של לוח חיוג"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"השלמה אוטומטית בלוח חיוג"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"השלמה אוטומטית בלוח חיוג"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"רינגטון ורטט"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"נהל שיחת ועידה"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"מספר חירום"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml
index 3e5aa16..2c32df5 100644
--- a/InCallUI/res/values-ja/strings.xml
+++ b/InCallUI/res/values-ja/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"保留中"</string>
     <string name="unknown" msgid="6878797917991465859">"通知不可能"</string>
     <string name="private_num" msgid="6713286113000232309">"非通知"</string>
-    <string name="payphone" msgid="1931775086311769314">"公衆電話発信"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"話し中"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"ネットワークがビジーです"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"応答なし（タイムアウト）"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"サーバーに接続できません"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"番号に接続できません"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ユーザー名またはパスワードが正しくありません"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ネットワーク外からの着信"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"サーバーエラー: しばらくしてからもう一度お試しください。"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"圏外"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACMの制限を超えています"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"無線通信をOFF"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIMがない、またはSIMエラー"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"モバイルネットワークが利用できません"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"発信番号制限により発信が制限されています。"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"通話制限中は発信できません。"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"発信制限が設定されています。"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"緊急通報の発信制限が設定されています。"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"緊急通報以外は発信制限が設定されています。"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"無効な番号"</string>
+    <string name="payphone" msgid="4793877574636445118">"公衆電話"</string>
     <string name="confCall" msgid="1904840547188336828">"グループ通話"</string>
-    <string name="call_lost" msgid="317670617901479594">"通話が切れました。"</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"通話が遮断されました"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"スピーカー"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"携帯端末のイヤホン"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有線ヘッドセット"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"グループ通話 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ボイスメールの番号"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"発信中"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"再試行中"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"リダイヤル中"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"グループ通話"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"着信"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通話終了"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"通話終了"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"着信"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"この電話の番号: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ビデオハングアウトに接続しています"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ビデオハングアウト"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ビデオハングアウトをリクエストしています"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ビデオハングアウトを接続できません"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"コールバック先\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"緊急通報コールバック先\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"発信中"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"不在着信"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"不在着信"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保留中"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"通話着信"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ビデオハングアウト着信"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"ビデオハングアウトリクエスト着信"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新しいボイスメール"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新しいボイスメール（<xliff:g id="COUNT">%d</xliff:g>）"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>にダイヤル"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ボイスメールの番号が不明です"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"通信サービスなし"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"選択したネットワーク（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）が利用できません"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"電話に出る"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"通話終了"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ビデオ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"音声"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"同意する"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"拒否"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"コールバック"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"メッセージ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"機内モードをOFFにしてから発信してください。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ご加入の通信サービスがありません"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"モバイルネットワークが利用できません。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"発信できません。有効な番号が入力されていません。"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"発信できません。"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"モバイルネットワークが利用できません。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"発信するには、有効な番号を入力してください。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"発信できません。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMIシーケンスを開始中..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"対応していないサービスです。"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"通話を切り替えられません。"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"通話を分割できません。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"電話を転送できません。"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"グループ通話を利用できません。"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"着信を拒否できません。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"通話を解放できません。"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"ボイスメールの番号が不明です"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"インターネット通話"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"サービスはサポートされていません。"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"通話を切り替えられません。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"通話を分割できません。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"転送できません。"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"グループ通話できません。"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"着信を拒否できません。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"通話を解放できません。"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP通話"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急通報"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"無線通信をONにしています..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"圏外 - 再試行中..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"発信できません。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>は緊急通報番号ではありません。"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"発信できません。緊急通報番号におかけください。"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"通信サービスはありません。もう一度お試しください…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"発信できません。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>は緊急通報番号ではありません。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"発信できません。緊急通報番号におかけください。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"キーボードで番号を入力してください"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"通話を保留"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"通話を再開"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"通話を追加"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"グループ通話"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"相手の切り替え"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"終了"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ダイヤルキー"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"グループ通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切り替え"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"通話の管理"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"グループ通話の管理"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"グループ通話オプション"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"音声"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ビデオハングアウト"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"音声通話に変更"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"カメラを切り替え"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"動画を一時停止"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"その他のオプション"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"サービス"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"セットアップ"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未設定&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"カスタム返信を作成..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"キャンセル"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"送信"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"3"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"4"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"5"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"6"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"7"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"8"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"9"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"アスタリスク"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"0"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ポンド"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"発信"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"バックスペース"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"スピーカーが有効です。"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通話がミュートされています。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"電話に出る"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMSを送信"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"着信拒否"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ビデオハングアウトで電話に出る"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"音声通話で電話に出る"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ビデオ通話のリクエストを承諾する"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ビデオ通話のリクエストを拒否する"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"上にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"左にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"右にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"下にスライドして<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>を行います。"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"バイブレーション"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"バイブレーション"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"通知音"</string>
     <string name="default_notification_description" msgid="78174796906240970">"デフォルトの通知音（<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>）"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"着信音"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"着信時のバイブレーション"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ダイヤルパッドのタッチ操作音"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ダイヤルのオートコンプリート"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ダイヤルのオートコンプリート"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"着信音とバイブレーション"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"グループ通話オプション"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急通報番号"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 4c1f5f7..5355539 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"შეყოვნების რეჟიმში"</string>
     <string name="unknown" msgid="6878797917991465859">"უცნობი"</string>
     <string name="private_num" msgid="6713286113000232309">"დაფარული ნომერი"</string>
-    <string name="payphone" msgid="1931775086311769314">"საზოგადოებრივი ტელეფონი"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"ხაზი დაკავებულია"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"ქსელი დაკავებულია"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"პასუხი არ არის, ვადა გაუვიდა"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"სერვერი მიუწვდომელია"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ნომერი მიუწვდომელია"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"მომხმარებლის არასწორი სახელი ან პაროლი"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ქსელის მიღმა ზარი"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"სერვერის შეცდომა. სცადეთ მოგვიანებით."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"სიგნალი არ არის"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ლიმიტი გადაჭარბებულია"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"გადამცემი გამორთულია"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM არ არის, ან SIM-ის შეცდომაა"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"მობილური ქსელი მიუწვდომელია"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"გამავალი ზარები შეზღუდულია FDN-ის მიერ."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"გააქტიურებული ზარის შეზღუდვისას გამავალ ზარებს ვერ განახორციელებთ."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ყველა ზარი შეზღუდულია წვდომის კონტროლით."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"გადაუდებელი ზარები შეზღუდულია წვდომის კონტროლით."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ჩვეულებრივი ზარები შეზღუდულია წვდომის კონტროლით."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"არასწორი ნომერი"</string>
+    <string name="payphone" msgid="4793877574636445118">"გადახდის ტელეფონი"</string>
     <string name="confCall" msgid="1904840547188336828">"საკონფერენციო ზარი"</string>
-    <string name="call_lost" msgid="317670617901479594">"ზარი გაწყდა."</string>
-    <string name="ok" msgid="3811371167865772377">"კარგი"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ზარი შეწყვეტილია"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"სპიკერი"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"მოწყობილობის ყურმილი"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"შნურიანი ყურსაცვამი"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"საკონფერენციო ზარი: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ხმოვანი ფოსტის ნომერი"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"აკრეფვა"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"ხელახლა ცდა"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"განმეორება"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"საკონფერენციო ზარი"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"შემომავალი ზარი"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"ზარი გაწყდა"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"გათშვა"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"მიმდინარეობს საუბარი"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"ჩემი ნომერია <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"მიმდინარეობს ვიდეოს დაკავშირება"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ვიდეოზარი"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"მიმდინარეობს ვიდეოს მოთხოვნა"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ვერ ხორციელდება ვიდეო ზარით დაკავშირება"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"თქვენი გადმორეკვის ნომერი \n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"თქვენი საგანგებო გადმორეკვის ნომერი \n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"აკრეფვა"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"გამოტოვებული ზარი"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"გამოტოვებული ზარები"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"მიმდინარე ზარი"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"შეყოვნების რეჟიმში"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"შემომავალი ზარი"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"შემომავალი ვიდეოზარი"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"შემომავალი ვიდეოს მოთხოვნა"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ახალი ხმოვანი ფოსტა"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ახალი ხმოვანი ფოსტა (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>-ზე დარეკვა"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ხმოვანი ფოსტის ნომერი უცნობია"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"სერვისი არ არის"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"ხელმისაწვდომია არჩეული ქსელი (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"პასუხი"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"გათიშვა"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ვიდეო"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"ხმა"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"მიღება"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"დახურვა"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"გადარეკვა"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"შეტყობინების გაგზავნა"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ზარის განსახორციელებლად, ჯერ თვითმფრინავის რეჟიმი უნდა გამორთოთ."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ქსელში რეგისტრირებული არ არის."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"მობილური ქსელი მიუწვდომელია."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ვერ გაიგზავნა, ტელეფონის ნომერი სწორად არ იქნა შეყვანილი."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"ზარი ვერ გაიგზავნა."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"ფიჭური ქსელი მიუწვდომელია"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ზარის განხორციელებისათვის, შეიყვანეთ მოქმედი ნომერი."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"არ ირეკება."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI თანმიმდევრობის დაწყება…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"მოწყობილობა მხარდაჭერილი არ არის."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"ზარების გადართვა ვერ ხერხდება."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"ზარის განცალკევება ვერ ხერხდება."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"ზარის ტრანსფერი ვერ ხერხდება."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"საკონფერენციო ზარები ვერ ხორციელდება."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"ზარის უარყოფა ვერ ხერხდება."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"ზარ(ებ)ის გათავისუფლება ვერ ხერხდება."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"ხმოვანი ფოსტის ნომერი უცნობია."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ინტერნეტ-ზარი"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"მომსახურება არ არის მხარდაჭერილი."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ვერ ხორციელდება ზარების გადართვა."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ვერ ხორციელდება ზარის გამოყოფა."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"გადაცემა ვერ ხორციელდება."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"კონფერენცია ვერ სრულდება."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ზარის უარყოფა ვერ ხორციელდება."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ვერ ხერხდება ზარ(ებ)ის გაშვება."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP ზარი"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"გადაუდებელი ზარი"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"გადამცემის ჩართვა…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"დაფარვის არეს მიღმა. მიმდინარეობს ხელახლა ცდა…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"ზარი ვერ გაიგზავნა. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> გადაუდებელი ზარის ნომერი არ არის!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ზარი ვერ გაიგზავნა. აკრიფეთ გადაუდებელი ზარის ნომერი!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"მომხსახურება არ არის. სცადეთ ხელხლა..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"არ ირეკება. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> არ არის საგანგებო ნომერი."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"დარეკვა ვერ ხორციელდება. აკრიფეთ საგანგებო ნომერი."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"კლავიატურის გამოყენება დასარეკად"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ზარის დაკავება"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ზარის განახლება"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ზარის დამატება"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ზარების გაერთიანება"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ზარების შენაცვლება"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"შეყოვნება"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"დასრულება"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ციფერბლატი"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ზარების გაერთიანება"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"შენაცვლება"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ზარების მართვა"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"კონფერენციის მართვა"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"საკონფერენციო ზარის მართვა"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"აუდიო"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ვიდეოზარი"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"აუდიო ზარზე გადართვა"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"კამერის გადართვა"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ვიდეოს შეჩერება"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"მეტი ვარიანტები"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"სერვისი"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"დაყენება"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;არ არის დაყენებული&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"ჩაწერეთ საკუთარი..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"გაუქმება"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"გაგზავნა"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ერთ"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"ორი"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"სამი"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"ოთხი"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"ხუთი"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ექვსი"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"შვიდი"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"რვა"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ცხრა"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ვარსკვლავი"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"ნული"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"დიეზი"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"დარეკვა"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"უკუშლა"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"სპიკერები ჩართულია."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ზარი დადუმებულია."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"პასუხი"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-ის გაგზავნა"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"უარყოფა"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"პასუხი ვიდეოზარის სახით"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"პასუხი აუდიო ზარის სახით"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ვიდეოს მოთხოვნის მიღება"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ვიდეოს მოთხოვნის უარყოფა"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"გაასრიალეთ ზემოთ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისთვის."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისათვის გაასრიალეთ მარცხნივ."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისათვის გაასრიალეთ მარჯვნივ."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"გაასრიალეთ ქვემოთ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>-ისთვის."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ვიბრაცია"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ვიბრაცია"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ხმა"</string>
     <string name="default_notification_description" msgid="78174796906240970">"ნაგულისხმები ხმა (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ტელეფონის ზარი"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"დარეკვის დროს ვიბრაცია"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ციფერბლატის ტონური რეჟიმი"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ციფერბლატის თვითშევსება"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"აკრეფვის ავტოდასრულება"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ზარის მელოდია &amp; ვიბრაცია"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"საკონფერენციო ზარის მართვა"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"გადაუდებელი დახმარების ნომერი"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-kk-rKZ/strings.xml b/InCallUI/res/values-kk-rKZ/strings.xml
new file mode 100644
index 0000000..72ac632
--- /dev/null
+++ b/InCallUI/res/values-kk-rKZ/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Телефон"</string>
+    <string name="onHold" msgid="9035493194749959955">"Күтуде"</string>
+    <string name="unknown" msgid="6878797917991465859">"Белгісіз"</string>
+    <string name="private_num" msgid="6713286113000232309">"Жеке нөмір"</string>
+    <string name="payphone" msgid="4793877574636445118">"Автомат-телефон"</string>
+    <string name="confCall" msgid="1904840547188336828">"Мәжіліс қоңырауы"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Қоңырау үзілді"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Үндеткіш"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Телефон құлағы"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Сымды телефон"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Келесі әуендер жіберілсін бе?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Жіберу әуендері\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"Жіберу"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"Иә"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"Жоқ"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Ерекше таңбаны келесі таңбамен алмастыру"</string>
+    <string name="caller_manage_header" msgid="3231519674734638786">"<xliff:g id="CONF_CALL_TIME">%s</xliff:g> мәжіліс қоңырауы"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Дауыс хабарының нөмірі"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Теруде"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Қайта терілуде"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"Мәжіліс қоңырауы"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Келген қоңырау"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Қоңырау аяқталды"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"Күтуде"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Телефон құлағын ілуде"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"Қоңырау"</string>
+    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mенің нөмірім <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Бейне қосылуда"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Бейне қоңырау"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Бейне сұралуда"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Бейне қоңырауға қосылу мүмкін емес"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Кері қоңырау шалу нөміріңіз\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Жедел кері қоңырау шалу нөміріңіз\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Теру"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Қабылданбаған қоңырау"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Қабылданбаған қоңыраулар"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> қабылданбаған қоңыраулар"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> қоңырауы қабылданбаған"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Ағымдағы қоңырау"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"Күтуде"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"Келген қоңырау"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Кіріс бейне қоңырау"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Кіріс бейне сұрау"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Жаңа дауыс хабары"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"(<xliff:g id="COUNT">%d</xliff:g>) дауыс хабары"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> нөмірін теру"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Дауыс хабарының нөмірі белгісіз"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"Қызмет көрсетілмейді"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"Таңдалған (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) желісі қол жетімсіз"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Жауап"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Қоңырауды аяқтау"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Бейне"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Дауыс"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Қабылдау"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Бас тарту"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кері қоңырау шалу"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Хабар"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"Қоңырау шалу үшін алдымен Ұшақ режимін өшіріңіз."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Желіде тіркелмеген."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Ұялы желі қол жетімді емес."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Қоңырау шалу үшін жарамды нөмірді енгізіңіз."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Қоңырау шалу мүмкін емес."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI қатарын бастау…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Қызметке қолдау көрсетілмейді."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Қоңырауларды ауыстыру мүмкін емес."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Қоңырауды бөлу мүмкін емес."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Тасымалдау мүмкін емес."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Конференция мүмкін емес."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Қоңырауды қабылдамау мүмкін емес."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Қоңырау(лар)ды босату мүмкін емес."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP қоңырауы"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Төтенше қоңырау"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радионы қосуда…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Қызмет жоқ. Әрекет қайталануда…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Қоңырау шалу мүмкін емес. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> жедел нөмір емес."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Қоңырау шалу мүмкін емес. Жедел нөмірді теріңіз."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Теру үшін пернетақтаны қолдану"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Қоңырауды ұстау"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Қоңырауды жалғастыру"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Қоңырау қосу"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Қоңырауларды біріктіру"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Қоңырауларды ауыстыру"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Күту"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"Аяқтау"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Теру тақтасы"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Үнсіз"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Қоңырау қосу"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Қоңырауларды біріктіру"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Алмастыру"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Қоңырауларды басқару"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Конф-қ қоң. басқару"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Aудио"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео қоңырау"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Дауыстық қоңырауға өзгерту"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Камераны ауыстыру"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Бейнені кідірту"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Басқа опциялар"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Қызмет"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Орнату"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Реттелген жоқt&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Басқа қоңырау параметрлері"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы қоңырау шалу"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы кіріс"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"контакт фотосуреті"</string>
+    <string name="goPrivate" msgid="865837794424530980">"жеке қоңырауға ауысу"</string>
+    <string name="selectContact" msgid="781975788478987237">"контакт таңдау"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Өзіңіздікін жазыңыз..."</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"Тоқтату"</string>
+    <string name="custom_message_send" msgid="5795754217085747742">"Жіберу"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Жауап"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS жіберу"</string>
+    <string name="description_target_decline" msgid="4789834364389731957">"Қабылдамау"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Бейне қоңырауға жауап беру"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Аудио қоңырауға жауап беру"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Бейне сұрауды қабылдау"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Бейне сұрауды қабылдамау"</string>
+    <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үшін жоғары сырғыту."</string>
+    <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үшін сол жаққа сырғыту."</string>
+    <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үшін оң жаққа сырғыту."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үшін төмен сырғыту."</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Тербеліс"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Тербеліс"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Дыбыс"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Бастапқы бойынша дыбыс (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"Телефон рингтоны"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Шырылдағанда тербеу"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Теру тақтасын автотолтыру"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон&amp; Тербеліс"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Мәжіліс қоңырауын басқару"</string>
+    <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Төтенше жағдай нөмірі"</string>
+</resources>
diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml
index 9d851e3..cf371ad 100644
--- a/InCallUI/res/values-km-rKH/strings.xml
+++ b/InCallUI/res/values-km-rKH/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"រង់ចាំ"</string>
     <string name="unknown" msgid="6878797917991465859">"មិន​ស្គាល់"</string>
     <string name="private_num" msgid="6713286113000232309">"លេខ​ឯកជន"</string>
-    <string name="payphone" msgid="1931775086311769314">"ទូរស័ព្ទ​ប្រើ​កាក់"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"បណ្ដាញ​ជាប់​រវល់"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"បណ្ដាញ​ជាប់​រវល់"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"គ្មាន​ចម្លើយ​​តប អស់​ពេល"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"ម៉ាស៊ីន​មេ​មិន​អាច​ទៅ​ដល់"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"​លេខ​ដែល​មិន​អាច​ហៅ​ចូល"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ឈ្មោះ​អ្នក​ប្រើ​ ឬ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"បាន​​ហៅ​ពី​ក្រៅ​បណ្ដាញ"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"កំហុស​ម៉ាស៊ីន​មេ។ ព្យាយាម​ម្ដងទៀត​ពេលក្រោយ។"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"គ្មាន​សញ្ញា"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"បាន​លើស​ដែន​កំណត់ ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"បិទ​វិទ្យុ"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"គ្មាន​ស៊ីមកាត ឬ​កំហុស​ស៊ីមកាត"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"បណ្ដាញ​ចល័ត​មិន​អាច​ប្រើ​បាន"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"បាន​កំណត់​​កម្រិត​ការ​ហៅ​ចេញ​ដោយ FDN ។"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"អ្នក​មិន​អាច​​ហៅ​ចេញ​បាន​ទេ ពេល​បើក​ការរារាំង​ការ​ហៅ។"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"បាន​​កំណត់​កម្រិត​ការ​ហៅ​ទាំងអស់​ដោយ​ការ​ត្រួតពិនិត្យ​ចូល​ដំណើរការ។"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"បាន​កំណត់​កម្រិត​ការ​ហៅ​នៅ​ពេល​មាន​​​អាសន្ន​ដោយ​ការ​ត្រួតពិនិត្យ​ចូល​ដំណើរការ។"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"បាន​​កំណត់​កម្រិត​ការ​ហៅ​ធម្មតា​ដោយ​ការ​ត្រួតពិនិត្យ​ចូល​ដំណើរការ។"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"លេខ​មិន​ត្រឹមត្រូវ"</string>
+    <string name="payphone" msgid="4793877574636445118">"ទូរស័ព្ទសាធារណៈ"</string>
     <string name="confCall" msgid="1904840547188336828">"ការ​ហៅ​ជា​សន្និសីទ"</string>
-    <string name="call_lost" msgid="317670617901479594">"បាត់បង់​ការ​ហៅ។"</string>
-    <string name="ok" msgid="3811371167865772377">"យល់​ព្រម​"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ការហៅទូរស័ព្ទបានដាក់ចុះ"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"អូប៉ាល័រ"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"កាស"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"កាស​មាន​ខ្សែ"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"ការ​ហៅ​ជា​សន្និសីទ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"លេខ​សារ​ជា​សំឡេង"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"កំពុង​ហៅ"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"ព្យាយាម​ម្ដងទៀត"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ការចុចហៅឡើងវិញ"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"ការ​ហៅ​ជា​សន្និសីទ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ការ​ហៅ​ចូល"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"បាន​បញ្ចប់​ការ​ហៅ"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"បញ្ចប់​ការ​សន្ទនា"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"ការ​ហៅ​ចូល"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"លេខ​របស់​ខ្ញុំ​គឺ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ភ្ជាប់​វីដេអូ"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ហៅ​ជា​វីដេអូ"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ស្នើ​វីដេអូ"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"មិនអាចភ្ជាប់ការហៅជាវីដេអូបានទេ"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"លេខទូរស័ព្ទអាសន្នហៅទៅវិញរបស់អ្នក\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"លេខទូរស័ព្ទអាសន្នហៅទៅវិញរបស់អ្នក\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ហៅ"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"ខកខាន​ទទួល"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ខកខាន​ទទួល"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"កំពុង​បន្ត​ការ​ហៅ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"រង់ចាំ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ការ​ហៅ​ចូល"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ការ​ហៅចូលជា​វីដេអូ​"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"សំណើ​ការ​ហៅ​ជា​វីដេអូ​ចូល"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"សារ​ជា​សំឡេង​ថ្មី"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"សារ​ជា​សំឡេង​ថ្មី (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ចុច <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"មិន​ស្គាល់​ចំនួន​សារ​ជា​សំឡេង"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"គ្មាន​សេវា"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"បណ្ដាញ​ដែល​បាន​ជ្រើស ( <xliff:g id="OPERATOR_NAME">%s</xliff:g> ) មិន​អាច​ប្រើ​បាន​ទេ"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"ឆ្លើយតប"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"បញ្ចប់​ការ​សន្ទនា"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"វីដេអូ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"សំឡេង"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ព្រម​ទទួល"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"បដិសេធ"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ហៅ​ទៅ​វិញ"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"សារ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ដើម្បី​កំណត់​ការ​ហៅ ដំបូង​ត្រូវ​បិទ​របៀប​នៅ​ពេល​ជិះ​យន្តហោះ។"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"មិន​បាន​ចុះ​ឈ្មោះ​នៅ​លើ​បណ្ដាញ។"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"បណ្ដាញ​​ឧបករណ៍​​ចល័ត​មិន​អាច​ប្រើ​បាន​។"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"មិន​បាន​ផ្ញើ​ការ​ហៅ លេខ​ដែល​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ។"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"មិន​បាន​ផ្ញើ​ការ​ហៅ។"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"បណ្ដាញ​ចល័ត​មិន​អាច​ប្រើ​បាន។"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ដើម្បីធ្វើការហៅ បញ្ចូលលេខដែលមានសុពលភាព។"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"មិនអាចហៅបានទេ។"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"កំពុង​ចាប់ផ្ដើម​លំដាប់ MMI ..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"សេវាកម្ម​​ដែល​មិន​បាន​គាំទ្រ​។"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"មិន​អាច​ប្ដូរ​ការ​ហៅ។"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"មិន​អាច​បែងចែក​​ការ​ហៅ។"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"មិន​អាច​ផ្ទេរ​ការ​ហៅ​។"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"មិន​អាច​ហៅ​ជា​សន្និសីទ។"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"មិន​អាច​បដិសេធ​ការ​ហៅ​។"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"មិន​អាច​ហៅ​បាន​ទេ។"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"មិន​ស្គាល់​លេខ​សារ​ជា​សំឡេង។"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ហៅ​តាម​អ៊ីនធឺណិត"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"សេវាកម្មមិនត្រូវបានគាំទ្រទេ។"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"មិនអាចឆ្លាស់ការហៅបានទេ។"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"មិនអាចបំបែកការហៅបានទេ។"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"មិនអាចផ្ទេរបានទេ។"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"មិនអាចទំនាក់ទំនងបានទេ។"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"មិនអាចបដិសេធការហៅបានទេ។"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"មិនអាចបញ្ចេញការហៅបានទេ។"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"ការ​ហៅ SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ការ​ហៅ​នៅ​ពេល​មាន​អាសន្ន"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"កំពុង​បើក​វិទ្យុ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"នៅ​ក្រៅ​តំបន់​សេវា​ កំពុង​ព្យាយាម​ម្ដងទៀត…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"មិន​បាន​ផ្ញើ​ការ​ហៅ។ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> គឺ​មិន​មែន​ជា​លេខ​ហៅ​ពេល​មាន​អាសន្ន!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"មិន​បាន​ផ្ញើ​​​ការ​​​ហៅ​។ ហៅ​បាន​តែ​លេខ​ពេល​មាន​​​អាសន្ន!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"គ្មានសេវាទេ។ ព្យាយាមម្តង…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"មិនអាចហៅបានទេ។ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> មិនមានជាលេខអាសន្នទេ។"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"មិនអាចហៅបានទេ។ ចុចហៅលេខអាសន្ន។"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ប្រើ​​ក្ដារចុច​ដើម្បី​ចុច​លេខ"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"រង់ចាំ​ការ​ហៅ"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"បន្ត​ការហៅ"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"បន្ថែម​ការ​ហៅ"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"បញ្ចូល​ការ​ហៅ​ចូល​គ្នា"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ប្ដូរ​ការ​ហៅ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"រង់ចាំ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"បញ្ចប់"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"បន្ទះ​លេខ"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"បញ្ចូល​ការ​ហៅ​រួម​​គ្នា"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ប្ដូរ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"គ្រប់គ្រង​ការ​ហៅ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"គ្រប់គ្រង​សន្និសីទ"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"គ្រប់គ្រងការហៅ​ជាសន្និសីទ​"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"សំឡេង"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ហៅ​ជា​វីដេអូ"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ប្ដូរ​ទៅ​ការ​ហៅ​ជា​សំឡេង"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ប្ដូរ​ម៉ាស៊ីន​ថត"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ផ្អាក​វីដេអូ"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"ជម្រើស​ច្រើន​ទៀត"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"សេវា"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"រៀបចំ"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt; មិន​កំណត់ &gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"សរសេរ​ផ្ទាល់​ខ្លួន​របស់​អ្នក"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"បោះបង់"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"ផ្ញើ"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"មួយ"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"ពីរ"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"បី"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"បួន"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"ប្រាំ"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ប្រាំមួយ"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ប្រាំពីរ"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ប្រាំបី"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ប្រាំបួន"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ដាក់​ផ្កាយ"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"សូន្យ"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ផោន"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ចុច"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"លុប​ថយក្រោយ"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"បាន​បើក​អូប៉ាល័រ​ទូរស័ព្ទ។"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ការ​ហៅ​បិទ​សំឡេង។"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ឆ្លើយតប"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ផ្ញើ​សារ SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"បដិសេធ"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ឆ្លើយតប​ជា​ការ​ហៅ​ជា​​វីដេអូ"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ឆ្លើយតប​ជា​ការ​ហៅ​ជា​សំឡេង"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ទទួលយក​សំណើ​វីដេអូ"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ទទួលយក​សំណើ​វីដេអូ"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"រុញ​ឡើង​លើ​ដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"រុញ​ទៅ​ឆ្វេង​ដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"រុញ​​ទៅ​ស្ដាំ​ដើម្បី <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"រុញ​ចុះក្រោម​សម្រាប់ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ។"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ញ័រ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ញ័រ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"សំឡេង"</string>
     <string name="default_notification_description" msgid="78174796906240970">"សំឡេង​លំនាំដើម (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"សំឡេង​ទូរស័ព្ទ​រោទ៍"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ញ័រ​នៅ​ពេល​រោទ៍"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"សំឡេង​ពេល​ប៉ះ​​បន្ទះ​លេខ"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"បន្ទះ​លេខ​បំពេញ​ស្វ័យប្រវត្តិ"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ផ្ទាំងចុចលេខបំពេញដោយស្វ័យប្រវត្តិ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"សំឡេង​រោទ៍ &amp; ញ័រ"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"គ្រប់គ្រង​ការ​ហៅ​​ជា​សន្និសីទ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"លេខ​ពេល​អាសន្ន"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml
index 90f6005..27d3aea 100644
--- a/InCallUI/res/values-kn-rIN/strings.xml
+++ b/InCallUI/res/values-kn-rIN/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="unknown" msgid="6878797917991465859">"ಅಜ್ಞಾತ"</string>
     <string name="private_num" msgid="6713286113000232309">"ಖಾಸಗಿ ಸಂಖ್ಯೆ"</string>
-    <string name="payphone" msgid="1931775086311769314">"ಪಾವತಿಯ ಫೋನ್‌"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"ಲೈನ್‌ ಕಾರ್ಯನಿರತವಾಗಿದೆ"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"ನೆಟ್‌ವರ್ಕ್‌ ಕಾರ್ಯನಿರತವಾಗಿದೆ"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ಪ್ರತಿಕ್ರಿಯೆ ಇಲ್ಲ, ಸಮಯ ಮೀರಿದೆ"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"ಸರ್ವರ್ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ಸಂಖ್ಯೆಯನ್ನು ತಲುಪಲಾಗಲಿಲ್ಲ"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ತಪ್ಪಾದ ಬಳಕೆದಾರ ಹೆಸರು ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ನೆಟ್‌ವರ್ಕ್‌ನ ಹೊರಗಿನಿಂದ ಕರೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"ಸರ್ವರ್‌ ದೋಷ. ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"ಸಿಗ್ನಲ್ ಇಲ್ಲ"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ಮಿತಿ ಮೀರಿದೆ"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"ರೇಡಿಯೋ ಆಫ್"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"ಯಾವುದೇ SIM ಇಲ್ಲ ಅಥವಾ SIM ದೋಷ"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN ನಿಂದ ಹೊರಹೋಗುವ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿದೆ."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"ಕರೆ ಬಾರಿಂಗ್ ಆನ್‌ ಆಗಿರುವಾಗ ನಿಮಗೆ ಹೊರಹೋಗುವ ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ಪ್ರವೇಶ ನಿಯಂತ್ರಣದಿಂದ ಎಲ್ಲ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"ಪ್ರವೇಶ ನಿಯಂತ್ರಣದಿಂದ ತುರ್ತು ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ಸಾಮಾನ್ಯ ಕರೆಗಳನ್ನು ಎಲ್ಲ ಪ್ರವೇಶ ನಿಯಂತ್ರಣವು ನಿರ್ಬಂಧಿಸಿದೆ."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"ಅಮಾನ್ಯವಾದ ಸಂಖ್ಯೆ"</string>
+    <string name="payphone" msgid="4793877574636445118">"ಪೇಫೋನ್"</string>
     <string name="confCall" msgid="1904840547188336828">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
-    <string name="call_lost" msgid="317670617901479594">"ಕರೆಯ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ."</string>
-    <string name="ok" msgid="3811371167865772377">"ಸರಿ"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ಕರೆಯನ್ನು ಬಿಡಲಾಗಿದೆ"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"ಸ್ಪೀಕರ್‌"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ಹ್ಯಾಂಡ್‌ಸೆಟ್ ಇಯರ್‌ಪೀಸ್"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ವೈರ್ಡ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆ"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"ಮರು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ಮರು ಡಯಲ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ಒಳಬರುವ ಕರೆ"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"ಕರೆ ಅಂತ್ಯಗೊಂಡಿದೆ"</string>
@@ -65,44 +45,61 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"ಹ್ಯಾಂಗ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"ಕರೆಯಲ್ಲಿ"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"ನನ್ನ ಸಂಖ್ಯೆ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ವೀಡಿಯೊ ಸಂಪರ್ಕಪಡಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ವೀಡಿಯೊ ಕರೆ"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ವೀಡಿಯೊ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ವೀಡಿಯೊ ಕರೆಯನ್ನು ಸಂಪರ್ಕಪಡಿಸಲಾಗುವುದಿಲ್ಲ"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"ನಿಮ್ಮ ಕರೆಯ ಸಂಖ್ಯೆ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"ನಿಮ್ಮ ತುರ್ತು ಕರೆಯ ಸಂಖ್ಯೆ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ತಪ್ಪಿ ಹೋದ ಕರೆ"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ತಪ್ಪಿದ ಕರೆಗಳು"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ತಪ್ಪಿದ ಕರೆಗಳು"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ಅವರಿಂದ ತಪ್ಪಿದ ಕರೆ"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ಅವರಿಂದ ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
     <string name="notification_ongoing_call" msgid="7068688957273482989">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ಒಳಬರುವ ಕರೆ"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆ"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"ಒಳಬರುವ ವೀಡಿಯೊ ವಿನಂತಿ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌‌ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ಗೆ ಡಯಲ್‌‌ ಮಾಡು"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ಅಪರಿಚಿತ ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆ"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"ಯಾವುದೇ ಸೇವೆಯಿಲ್ಲ"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"ಆಯ್ಕೆಮಾಡಿದ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"ಉತ್ತರ"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"ಹ್ಯಾಂಗ್ ಅಪ್ ಮಾಡಿ"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ವೀಡಿಯೊ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"ಧ್ವನಿ"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ಸಮ್ಮತಿಸು"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ವಜಾಗೊಳಿಸು"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ಮರಳಿ ಕರೆ ಮಾಡಿ"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"ಸಂದೇಶ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಇನ್ನೂ ನೋಂದಣಿಯಾಗಿಲ್ಲ."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ಕರೆ ಮಾಡಲಾಗಿಲ್ಲ, ಯಾವುದೇ ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿಲ್ಲ."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"ಕರೆ ಮಾಡಲಾಗಲಿಲ್ಲ."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ಕರೆಯನ್ನು ಮಾಡಲು, ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI ಅನುಕ್ರಮ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"ಬೆಂಬಲವಿರದ ಸೇವೆ."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"ಪ್ರತ್ಯೇಕ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"ಕರೆಯನ್ನು ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"ಕರೆ(ಗಳನ್ನು) ಬಿಡುಗಡೆಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"ಅಪರಿಚಿತ ಧ್ವನಿಮೇಲ್ ಸಂಖ್ಯೆ."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ಇಂಟರ್ನೆಟ್‌ ಕರೆ"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"ಸೇವೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ಕರೆಯನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"ಕಾನ್ಫರೆನ್ಸ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ಕರೆ(ಗಳು) ಬಿಡುಗಡೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP ಕರೆ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ತುರ್ತು ಕರೆಗಳು"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ರೇಡಿಯೋ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"ಸೇವಾ ಪ್ರದೇಶದ ಹೊರಗಿದೆ, ಮರುಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"ಕರೆ ಮಾಡಲಾಗಿಲ್ಲ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ತುರ್ತು ಸಂಖ್ಯೆಯಲ್ಲ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ಕರೆ ಮಾಡಲಾಗಿಲ್ಲ. ತುರ್ತು ಸಂಖ್ಯೆಗೆ ಡಯಲ್‌ ಮಾಡಿ!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ಯಾವುದೇ ಸೇವೆ ಇಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ಇದು ತುರ್ತು ಸಂಖ್ಯೆಯಲ್ಲ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ತುರ್ತು ಸಂಖ್ಯೆಯನ್ನು ಡಯಲ್ ಮಾಡಿ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ಡಯಲ್‌ ಮಾಡಲು ಕೀಬೋರ್ಡ್‌ ಬಳಸಿ"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ಕರೆಯನ್ನು ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ಕರೆಯನ್ನು ಮುಂದುವರಿಸು"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ಕರೆಯನ್ನು ಸೇರಿಸು"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ಕರೆಗಳನ್ನು ವಿಲೀನಗೊಳಿಸು"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ಮುಕ್ತಾಯ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ಡಯಲ್‌ಪ್ಯಾಡ್‌"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ಕರೆಗಳನ್ನು ವಿಲೀನಗೊಳಿಸು"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ಸ್ವ್ಯಾಪ್‌ ಮಾಡು"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ಕರೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ಕಾನ್ಫರೆನ್ಸ್ ನಿರ್ವಹಿಸಿ"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ಆಡಿಯೊ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ವೀಡಿಯೊ ಕರೆ"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ಧ್ವನಿ ಕರೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ಕ್ಯಾಮರಾ ಬದಲಿಸಿ"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ವೀಡಿಯೊ ವಿರಾಮಗೊಳಿಸು"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"ಸೇವೆ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"ಸೆಟಪ್"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;ಹೊಂದಿಸಿಲ್ಲ&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"ರದ್ದುಮಾಡು"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"ಕಳುಹಿಸು"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ಒಂದು"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"ಎರಡು"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ಮೂರು"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"ನಾಲ್ಕು"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"ಐದು"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ಆರು"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ಏಳು"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ಎಂಟು"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ಒಂಬತ್ತು"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ನಕ್ಷತ್ರ"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"ಶೂನ್ಯ"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ಪೌಂಡ್"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ಡಯಲ್"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ಸ್ಪೀಕರ್‌ಫೋನ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ಕರೆಯನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ಉತ್ತರ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS ಕಳುಹಿಸು"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ನಿರಾಕರಿಸು"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ವೀಡಿಯೊ ಕರೆ ರೂಪದಲ್ಲಿ ಉತ್ತರಿಸಿ"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ವೀಡಿಯೊ ವಿನಂತಿ ಒಪ್ಪಿಕೊಳ್ಳು"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ವೀಡಿಯೊ ವಿನಂತಿ ತಿರಸ್ಕರಿಸು"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಮೇಲಕ್ಕೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಎಡಕ್ಕೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಬಲಗಡೆಗೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ಗಾಗಿ ಕೆಳಕ್ಕೆ ಸ್ಲೈಡ್ ಮಾಡಿ."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ವೈಬ್ರೇಟ್‌"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ವೈಬ್ರೇಟ್‌"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ಧ್ವನಿ"</string>
     <string name="default_notification_description" msgid="78174796906240970">"ಡೀಫಾಲ್ಟ್‌ ಧ್ವನಿ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ರಿಂಗ್ ಆಗುವಾಗ ಕಂಪಿಸು"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ಡಯಲ್ ಪ್ಯಾಡ್ ಸ್ಪರ್ಶಿಸುವ ಟೋನ್‌ಗಳು"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ಡಯಲ್‌‌ ಪ್ಯಾಡ್ ಸ್ವಯಂಪೂರ್ಣತೆ"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ಸ್ವಯಂಪರಿಪೂರ್ಣತೆ ಡಯಲ್ ಪ್ಯಾಡ್"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ರಿಂಗ್‌ಟೋನ್‌‌ &amp; ವೈಬ್ರೇಟ್‌"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"ತುರ್ತು ಸಂಖ್ಯೆ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ko/strings.xml b/InCallUI/res/values-ko/strings.xml
index eef4c87..9e0b18f 100644
--- a/InCallUI/res/values-ko/strings.xml
+++ b/InCallUI/res/values-ko/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"대기 중"</string>
     <string name="unknown" msgid="6878797917991465859">"알 수 없음"</string>
     <string name="private_num" msgid="6713286113000232309">"비공개 번호"</string>
-    <string name="payphone" msgid="1931775086311769314">"공중전화"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"통화 중입니다."</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"네트워크 사용량이 많습니다."</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"응답 없음, 시간 초과"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"서버에 연결할 수 없음"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"연결할 수 없는 전화 번호"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"사용자 이름 또는 비밀번호가 잘못되었습니다"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"네트워크 외부에서 온 전화입니다."</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"서버 오류입니다. 잠시 후에 다시 시도해 보세요."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"신호 없음"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM 제한 초과"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"무선 연결 끊김"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM이 없거나 SIM에 오류가 있습니다."</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"모바일 네트워크를 사용할 수 없음"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"발신전화가 FDN으로 제한됩니다."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"착발신 제한이 설정되어 있는 동안에는 전화를 걸 수 없습니다."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"모든 전화가 액세스 제어에 의해 제한되어 있습니다."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"긴급 전화가 액세스 제어에 의해 제한되어 있습니다."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"일반 전화가 액세스 제어에 의해 제한되어 있습니다."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"잘못된 번호입니다."</string>
+    <string name="payphone" msgid="4793877574636445118">"공중전화"</string>
     <string name="confCall" msgid="1904840547188336828">"다자간 통화"</string>
-    <string name="call_lost" msgid="317670617901479594">"통화가 끊겼습니다."</string>
-    <string name="ok" msgid="3811371167865772377">"확인"</string>
+    <string name="call_lost" msgid="6183862117003999578">"연락되지 않음"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"스피커"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"휴대전화"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"유선 헤드셋"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"다자간 통화 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"음성사서함 번호"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"전화 거는 중"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"다시 시도 중"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"재다이얼 중"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"다자간 통화"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"수신전화"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"통화 종료됨"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"전화 끊는 중"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"통화 상태"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"내 전화번호는 <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>입니다."</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"동영상 연결 중"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"화상 통화"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"동영상 요청 중"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"화상 통화를 연결할 수 없습니다."</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"콜백 번호\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"긴급 콜백 번호\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"전화 거는 중"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"부재중 전화"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"부재중 통화"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"현재 통화"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"대기 중"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"수신 전화"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"수신 화상 통화"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"수신 동영상 요청"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"새 음성사서함"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"새 음성사서함(<xliff:g id="COUNT">%d</xliff:g>개)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>(으)로 전화걸기"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"알 수 없는 음성사서함 번호"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"서비스 불가"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"선택한 네트워크(<xliff:g id="OPERATOR_NAME">%s</xliff:g>)를 사용할 수 없음"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"전화 받기"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"전화 끊기"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"동영상"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"음성"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"수락"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"거부"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"통화하기"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"문자 메시지"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"전화를 걸려면 먼저 비행기 모드를 해제하세요."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"네트워크에서 등록되지 않았습니다."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"모바일 네트워크를 사용할 수 없습니다."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"잘못된 번호를 입력했으므로 전화를 걸지 못했습니다."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"전화를 걸지 못했습니다."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"사용 가능한 이동통신망이 없습니다."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"전화를 걸려면 올바른 번호를 입력하세요."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"전화를 걸 수 없습니다."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI 시퀀스 시작 중..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"지원되지 않는 서비스입니다."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"통화를 전환할 수 없습니다."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"통화를 분리할 수 없습니다."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"통화를 전달할 수 없습니다."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"다자간 통화를 할 수 없습니다."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"통화를 거부할 수 없습니다."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"통화를 끊을 수 없습니다."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"음성사서함 번호를 알 수 없음"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"인터넷 전화"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"서비스가 지원되지 않습니다."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"통화를 전환할 수 없습니다."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"통화를 분리할 수 없습니다."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"통화를 전환할 수 없습니다."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"컨퍼런스 콜을 이용할 수 없습니다."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"통화를 거절할 수 없습니다."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"통화를 끊을 수 없습니다."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP 통화"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"긴급 전화"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"무선을 켜는 중..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"서비스 지역을 벗어났습니다. 다시 시도하는 중..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 긴급 번호가 아니므로 전화를 걸지 못했습니다."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"전화를 걸지 못했습니다. 비상 전화번호로 전화를 걸어 보세요."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"서비스를 사용할 수 없습니다. 다시 시도 중..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"전화를 걸 수 없습니다. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 긴급 번호가 아닙니다."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"전화를 걸 수 없습니다. 긴급 번호를 사용하세요."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"키보드를 사용하여 전화걸기"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"통화 대기"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"통화 재개"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"통화 추가"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"통화 병합"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"통화 교환"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"대기"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"종료"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"다이얼패드"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"통화 병합"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"전환"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"통화 관리"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"다자간 통화 관리"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"다자간 통화 관리"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"오디오"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"화상 통화"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"음성 통화로 변경"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"카메라 전환"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"동영상 일지중지"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"옵션 더보기"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"서비스"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"설정"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;설정 안됨&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"나만의 응답 작성…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"취소"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"보내기"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"3"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"4"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"5"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"6"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"7"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"8"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"9"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"별"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"0"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"파운드"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"전화걸기"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"백스페이스"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"스피커폰이 사용 설정되었습니다."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"통화가 음소거되었습니다."</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"답변"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"통화"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS 보내기"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"거부"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"화상 통화로 받기"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"음성 전화로 받기"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"동영상 요청 수락"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"동영상 요청 거절"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 위로 슬라이드합니다."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 왼쪽으로 슬라이드합니다."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 오른쪽으로 슬라이드합니다."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 아래로 슬라이드합니다."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"진동"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"진동"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"알림음"</string>
     <string name="default_notification_description" msgid="78174796906240970">"기본 알림음(<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"전화 벨소리"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"전화 수신 시 진동"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"다이얼패드 터치음"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"다이얼패드 자동완성"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"다이얼패드 자동완성"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"벨소리 및 진동"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"다자간 통화 관리"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"비상 전화번호"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ky-rKG/strings.xml b/InCallUI/res/values-ky-rKG/strings.xml
new file mode 100644
index 0000000..1a6fdd1
--- /dev/null
+++ b/InCallUI/res/values-ky-rKG/strings.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for phoneAppLabel (906161039445636857) -->
+    <skip />
+    <!-- no translation found for onHold (9035493194749959955) -->
+    <skip />
+    <!-- no translation found for unknown (6878797917991465859) -->
+    <skip />
+    <!-- no translation found for private_num (6713286113000232309) -->
+    <skip />
+    <string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
+    <!-- no translation found for confCall (1904840547188336828) -->
+    <skip />
+    <string name="call_lost" msgid="6183862117003999578">"Чалуу үзүлдү"</string>
+    <!-- no translation found for audio_mode_speaker (27649582100085266) -->
+    <skip />
+    <!-- no translation found for audio_mode_earpiece (4156527186373869107) -->
+    <skip />
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Зымдуу кулакчын"</string>
+    <!-- no translation found for audio_mode_bluetooth (3047641300848211128) -->
+    <skip />
+    <!-- no translation found for wait_prompt_str (7601815427707856238) -->
+    <skip />
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Тоналдык жөнөтүү болууда \n"</string>
+    <!-- no translation found for send_button (4106860097497818751) -->
+    <skip />
+    <!-- no translation found for pause_prompt_yes (3564467212025151797) -->
+    <skip />
+    <!-- no translation found for pause_prompt_no (6686238803236884877) -->
+    <skip />
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Атайын белгини муну менен алмаштыр"</string>
+    <!-- no translation found for caller_manage_header (3231519674734638786) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_number_label (8524164258691887790) -->
+    <skip />
+    <!-- no translation found for card_title_dialing (5769417478498348054) -->
+    <skip />
+    <string name="card_title_redialing" msgid="8253487008234167266">"Кайра терүү"</string>
+    <!-- no translation found for card_title_conf_call (1162980346189744501) -->
+    <skip />
+    <!-- no translation found for card_title_incoming_call (7364539451234646909) -->
+    <skip />
+    <!-- no translation found for card_title_call_ended (5544730338889702298) -->
+    <skip />
+    <!-- no translation found for card_title_on_hold (821463117892339942) -->
+    <skip />
+    <!-- no translation found for card_title_hanging_up (3999101620995182450) -->
+    <skip />
+    <!-- no translation found for card_title_in_call (6346543933068225205) -->
+    <skip />
+    <!-- no translation found for card_title_my_phone_number (112428362494434191) -->
+    <skip />
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Видео туташтырылууда"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Видео чалуу"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Видео"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Видео чалууга туташуу мүмкүн болбой жатат"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Төмөнкү номерге кайра чалуу\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Төмөнкү номерге шашылыш кайра чалуу\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Терилүүдө"</string>
+    <!-- no translation found for notification_missedCallTitle (7554385905572364535) -->
+    <skip />
+    <!-- no translation found for notification_missedCallsTitle (1361677948941502522) -->
+    <skip />
+    <!-- no translation found for notification_missedCallsMsg (4575787816055205600) -->
+    <skip />
+    <!-- no translation found for notification_missedCallTicker (504686252427747209) -->
+    <skip />
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Учурдагы чалуу"</string>
+    <!-- no translation found for notification_on_hold (3480694969511790465) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call (2820429205043529642) -->
+    <skip />
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Келип жаткан видео чалуу"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Келип жаткан видео сурамы"</string>
+    <!-- no translation found for notification_voicemail_title (8933468752045550523) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_title_count (4366360747660929916) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_text_format (4447323569453981685) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_no_vm_number (760963466895609716) -->
+    <skip />
+    <!-- no translation found for notification_network_selection_title (4224455487793492772) -->
+    <skip />
+    <!-- no translation found for notification_network_selection_text (2607085729661923269) -->
+    <skip />
+    <string name="notification_action_answer" msgid="6700362365135365143">"Жооп берүү"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Телефонду коюу"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Үн"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Кабыл алуу"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Этибарга албоо"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кайра чалуу"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Билдирүү"</string>
+    <!-- no translation found for incall_error_power_off (6550191216405193368) -->
+    <skip />
+    <!-- no translation found for incall_error_emergency_only (4678640422710818317) -->
+    <skip />
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Уюктук тармак жеткиликтүү эмес."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Чалынбай жатат."</string>
+    <!-- no translation found for incall_status_dialed_mmi (3672498861336189563) -->
+    <skip />
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Кызмат колдоого алынбайт."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Чалуулар которуштурулбай жатат."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Чалуу бөлүнбөй жатат."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Өткөрүлбөй жатат."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Конференц-байланышы түзүлбөй жатат."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Чалуу четке кагылбай жатат."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Чалуу(лар) бошотулбай жатат."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP чалуу"</string>
+    <!-- no translation found for emergency_enable_radio_dialog_title (4627849966634578257) -->
+    <skip />
+    <!-- no translation found for emergency_enable_radio_dialog_message (207613549344420291) -->
+    <skip />
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Кызмат жок. Кайра аракет кылууда…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Чалынбай жатат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> өзгөчө кырдаал номери эмес."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Чалынбай жатат. Өзгөчө кырдаал номерин териңиз."</string>
+    <!-- no translation found for dialerKeyboardHintText (9192914825413747792) -->
+    <skip />
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Чалууну кармоо"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Чалууну улантуу"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Чалуу кошуу"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Чалууларды бириктирүү"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Чалууларды которуштуруу"</string>
+    <!-- no translation found for onscreenHoldText (2285258239691145872) -->
+    <skip />
+    <!-- no translation found for onscreenEndCallText (4403855834875398585) -->
+    <skip />
+    <!-- no translation found for onscreenShowDialpadText (8561805492659639893) -->
+    <skip />
+    <!-- no translation found for onscreenMuteText (5011369181754261374) -->
+    <skip />
+    <!-- no translation found for onscreenAddCallText (5140385634712287403) -->
+    <skip />
+    <!-- no translation found for onscreenMergeCallsText (6640195098064538950) -->
+    <skip />
+    <!-- no translation found for onscreenSwapCallsText (1602990689244030047) -->
+    <skip />
+    <!-- no translation found for onscreenManageCallsText (5473231160123254154) -->
+    <skip />
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Конференц-чалууну башкаруу"</string>
+    <!-- no translation found for onscreenAudioText (1710087112800041743) -->
+    <skip />
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео чалуу"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Үн чалууга өзгөртүү"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Камерага которулуу"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Видеону бир азга токтото туруу"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Көбүрөөк параметрлер"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Кызмат"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Орнотуу"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Орнотулган эмес&gt;"</string>
+    <!-- no translation found for other_settings (3672912580359716394) -->
+    <skip />
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалуу"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу келүүдө"</string>
+    <!-- no translation found for contactPhoto (4713193418046639466) -->
+    <skip />
+    <!-- no translation found for goPrivate (865837794424530980) -->
+    <skip />
+    <!-- no translation found for selectContact (781975788478987237) -->
+    <skip />
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Каалганыңызды жазыңыз..."</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"Жокко чыгаруу"</string>
+    <string name="custom_message_send" msgid="5795754217085747742">"Жөнөтүү"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Жооп берүү"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS жөнөтүү"</string>
+    <string name="description_target_decline" msgid="4789834364389731957">"Четке кагуу"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Видео чалуу түрүндө жооп берүү"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Аудио чалуу жооп берүү"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Видео сурамын кабыл алуу"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Видео сурамын четке кагуу"</string>
+    <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үчүн жогору жылмыштырыңыз."</string>
+    <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үчүн солго жылмыштырыңыз."</string>
+    <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үчүн оңго жылмыштырыңыз."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> үчүн төмөн сылап коюңуз."</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Титиретүү"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Титиретүү"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Үнү"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Абалкы үнү (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"Телефондун рингтону"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Шыңгырап жатканда титиретүү"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Тергичти автотолтуруу"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон жана Титирөө"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Конференц-чалууну башкаруу"</string>
+    <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Куткаруучулардын номуру"</string>
+</resources>
diff --git a/InCallUI/res/values-lo-rLA/strings.xml b/InCallUI/res/values-lo-rLA/strings.xml
index b8959ad..b316bef 100644
--- a/InCallUI/res/values-lo-rLA/strings.xml
+++ b/InCallUI/res/values-lo-rLA/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="unknown" msgid="6878797917991465859">"ບໍ່ຮູ້ຈັກ"</string>
     <string name="private_num" msgid="6713286113000232309">"ເບີສ່ວນໂຕ"</string>
-    <string name="payphone" msgid="1931775086311769314">"ໂທລະສັບສາທາລະນະ"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"ສາຍບໍ່ຫວ່າງ"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"ເຄືອຂ່າຍບໍ່ຫວ່າງ"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ບໍ່ມີການຕອບສະໜອງ, ໝົດເວລາ"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"ບໍ່ສາມາດຕິດຕໍ່ເຊີບເວີ"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ບໍ່ສາມາດຕິດຕໍ່ໝາຍເລກນີ້ໄດ້"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ຊື່ຜູ່ໃຊ້ ຫຼືລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ໂທຈາກນອກເຄືອຂ່າຍ"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"ເຊີບເວີຜິດພາດ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"ບໍ່​ມີ​ສັນ​ຍານ"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ເກີນກຳນົດທີ່ຈຳກັດໄວ້ແລ້ວ"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"ວິທະຍຸຖືກປິດ"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"ບໍ່ມີ​ SIM ຫຼື SIM ຜິດພາດ"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ຜ່ານ​ມື​ຖື"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"ການໂທອອກຖືກຈຳກັດໂດຍ FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"ທ່ານບໍ່ສາມາດໂທອອກໄດ້ ເມື່ອເປີດໃຊ້ການລະງັບການໂທ."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ການໂທທັງໝົດ ຖືກຈຳກັດດ້ວຍການຄວບຄຸມການເຂົ້າເຖິງ."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"ການໂທສຸກເສີນ ຖືກຈຳກັດດ້ວຍການຄວບຄຸມການເຂົ້າເຖິງ."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ການໂທປົກກະຕິ ຖືກຈຳກັດດ້ວຍການຄວບຄຸມການເຂົ້າເຖິງ."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"ເບີໂທບໍ່ຖືກຕ້ອງ"</string>
+    <string name="payphone" msgid="4793877574636445118">"ຕູ້​ໂທ​ລະ​ສັບ​ສາ​ທາ​ລະ​ນະ"</string>
     <string name="confCall" msgid="1904840547188336828">"ປະຊຸມສາຍ"</string>
-    <string name="call_lost" msgid="317670617901479594">"ສາຍຫຼຸດ."</string>
-    <string name="ok" msgid="3811371167865772377">"ຕົກລົງ"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ສາຍ​ຫຼຸດ​ແລ້ວ"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"ລຳໂພງ"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ຊຸດຫູຟັງ"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ຊຸດຫູຟັງແບບມີສາຍ"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"ປະຊຸມສາຍ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ເບີຂໍ້ຄວາມສຽງ"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ກຳລັງໂທ"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"ກຳລັງລອງໃໝ່"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ກຳ​ລັງ​ໂທ​ຄືນ"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"ປະຊຸມສາຍ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ສາຍໂທເຂົ້າ"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"ວາງສາຍແລ້ວ"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"ກຳລັງວາງສາຍ"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"ກຳລັງໃຊ້ສາຍ"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"ເບີໂທຂອງຂ້ອຍແມ່ນ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"​ກຳ​ລັງ​ເຊື່ອມ​ຕໍ່​ວິ​ດີ​ໂອ"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ໂທ​ແບບ​ເຫັນ​ໜ້າ"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"​ກຳ​ລັງ​ຮ້ອງ​ຂໍ​ວິ​ດີ​ໂອ"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ບໍ່​ສາ​ມາດ​ເຊື່ອມ​ຕໍ່​ການ​ໂທເຫັນພາບ​ໄດ້"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"ເບີ​ໂທ​ກັບ​ຂອງ​ທ່ານ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"ເບີ​ໂທ​ກັບ​ສຸກ​ເສີນ​ຂອງ​ທ່ານ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ກຳລັງໂທ"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"ສາຍທີ່ກຳລັງໂທອອກ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ສາຍໂທເຂົ້າ"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ສາຍ​ວິດີໂອ​ເຂົ້າ"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"​ຄຳ​ຮ້ອງ​ຂໍ​ວິ​ດີ​ໂອ​ເຂົ້າ​ມາ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ຂໍ້ຄວາມສຽງໃໝ່"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ຂໍ້ຄວາມສຽງໃໝ່ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ໂທຫາ <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ບໍ່ຮູ້ຈັກເບີຂໍ້ຄວາມສຽງ"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"ບໍ່ມີບໍລິການ"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"ບໍ່ສາມາດໃຊ້ເຄືອຂ່າຍທີ່ເລືອກ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ໄດ້"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"ຮັບສາຍ"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"ວາງສາຍ"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ວິດີໂອ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"ສຽງ"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ຍອມຮັບ"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ປິດໄວ້"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ໂທກັບ"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"ຂໍ້ຄວາມ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ເພື່ອໂທລະສັບ, ໃຫ້ປິດໂໝດຢູ່ເທິງຍົນກ່ອນ."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ບໍ່ໄດ້ລົງທະບຽນໃນເຄືອຂ່າຍ."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"ເຄືອຂ່າຍມືຖືບໍ່ສາມາດໃຊ້ໄດ້."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ບໍ່ໄດ້ໂທເທື່ອ, ເບີໂທທີ່ລະບຸບໍ່ຖືກຕ້ອງ."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"ບໍ່ໄດ້ໂທເທື່ອ."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"ບໍ່​ມີ​ເຄືອ​ຂ່າຍ​ມື​ຖື​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ເພື່ອ​ທີ່​ຈະ​ໂທ, ປ້ອນ​ເບີ​ໂທ​ທີ່​ໃຊ້​ໄດ້​ເຂົ້າ​ໄປ."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"ກຳລັງເລີ່ມຕົ້ນລຳດັບ MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"ບໍລິການທີ່ບໍ່ຮອງຮັບ."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"ບໍ່ສາມາດສະລັບສາຍໄດ້."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"ບໍ່ສາມາດແຍກສາຍໄດ້."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"ບໍ່ສາມາດໂອນສາຍໄດ້."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"ບໍ່ສາມາດປະຊຸມສາຍໄດ້."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"ບໍ່ສາມາດປະຕິເສດສາຍໄດ້."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"ບໍ່ສາມາດປ່ອຍສາຍໄດ້."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"​ເບີ​ຂໍ້​ຄວາມ​ສຽງ​ທີ່ບໍ່​ຮູ້​ຈັກ."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ໂທຜ່ານອິນເຕີເນັດ"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"ການ​ບໍ​ລິ​ການ​ບໍ່​ຮອງ​ຮັບ."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ບໍ່​ສາ​ມາດ​ສະ​ຫຼັບ​ສາ​ຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ບໍ່​ສາ​ມາດ​ແຍກ​ສາຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ບໍ່​ສາ​ມາດ​ໂອນ​ໄດ້."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"ບໍ່​ສາ​ມາດ​ປະ​ຊຸມ​ໄດ້."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ບໍ່​ສາ​ມາດ​ປະ​ຕິ​ເສດ​ສາຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ບໍ່​ສາ​ມາດ​ປ່ອຍ​ສາຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"ການໂທ SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ໂທສຸກເສີນ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ກຳລັງເປີດໃຊ້ວິທະຍຸ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"ຢູ່ນອກເຂດບໍລິການ, ກຳລັງລອງໃໝ່..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"ບໍ່ໄດ້ໂທອອກເທື່ອ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ບໍ່ແມ່ນໝາຍເລກສຸກເສີນ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ບໍ່ໄດ້ໂທອອກ. ກົດຫາໝາຍເລກສຸກເສີນ!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ບໍ່​ມີ​ການ​ບໍ​ລິ​ການ. ກຳ​ລັງ​ລອງ​ໃໝ່​ອີກ…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ບໍ່​ແມ່ນ​ເບີ​ໂທ​ສຸກ​ເສີນ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້. ກົດ​ເບີ​ໂທ​ສຸກ​ເສີນ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ໃຊ້ແປ້ນພິມເພື່ອກົດໂທ"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"​ພັກ​ສາຍ"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"​ສືບ​ຕໍ່​ສາຍ"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ເພີ່ມການໂທ"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ຮວມສາຍ"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ສະລັບສາຍ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ວາງສາຍ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ແປ້ນໂທ"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ຮວມສາຍ"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ສະລັບ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ຈັດການການໂທ"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"ຈັດການການປະຊຸມສາຍ"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"ຈັດ​ການ​ການ​ປະ​ຊຸມ​ສາຍ"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ສຽງ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ໂທແບບເຫັນໜ້າ"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ປ່ຽນ​ເປັນ​ການ​ໂທ​ດ້ວຍ​ສຽງ"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ສະລັບກ້ອງ"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ຢຸດວິດີໂອຊົ່ວຄາວ"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"ໂຕ​ເລືອກ​ເພີ່ມ​ເຕີມ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"ບໍລິການ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"ຕັ້ງຄ່າ"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;ຍັງບໍ່ໄດ້ຕັ້ງ&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"ຍົກເລີກ"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"ສົ່ງ"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ນຶ່ງ"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"ສອງ"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ສາມ"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"ສີ່"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"ຫ້າ"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ຫົກ"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ເຈັດ"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ແປດ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ເກົ້າ"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ດາວ"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"ສູນ"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ພາວ"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ປຸ່ມໂທ"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"ປຸ່ມ backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ເປີດລຳໂພງແລ້ວ."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ປິດສຽງການໂທແລ້ວ."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ຄໍາ​ຕອບ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ສົ່ງ SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ປະຕິເສດ"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"​ຕອບ​ເປັນ​ສາຍ​ວິ​ດີ​ໂອ"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"​ຕອບ​ເປັນ​ສາຍ​ສຽງ"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Accept video request"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Decline video request"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"ເລື່ອນຂຶ້ນເພື່ອ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"ເລື່ອນໄປທາງຊ້າຍເພື່ອ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"ເລື່ອນໄປທາງຂວາເພື່ອ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"ເລື່ອນລົງເພື່ອ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ສັ່ນເຕືອນ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ສັ່ນເຕືອນ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ສຽງ"</string>
     <string name="default_notification_description" msgid="78174796906240970">"ສຽງເລີ່ມຕົ້ນ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ຣິງໂທນໂທລະສັບ"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ສັ່ນເຕືອນເມື່ອມີສາຍໂທເຂົ້າ"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ໂທນສຽງປຸ່ມໂທລະສັບ"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Dial pad autocomplete"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ຕື່ມ​ໃສ່​ແປ້ນ​ກົດ​ໂທ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ຣິງໂທນ &amp; ການສັ່ນເຕືອນ"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"ຈັດການການປະຊຸມສາຍ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"ເບີໂທສຸກເສີນ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index 6a53ea1..1e25960 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Sulaikyta"</string>
     <string name="unknown" msgid="6878797917991465859">"Nežinomas"</string>
     <string name="private_num" msgid="6713286113000232309">"Privatus numeris"</string>
-    <string name="payphone" msgid="1931775086311769314">"Mokamas telefonas"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linija užimta"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Tinklas užimtas"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Nėra atsako, baigėsi laikas"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveris nepasiekiamas"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numeris nepasiekiamas"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Neteisingas naudotojo vardas arba slaptažodis"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Skambinta ne iš šio tinklo"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Serverio klaida. Vėliau bandykite dar kartą."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nėra signalo"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Pasiekta ACM riba"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radijas išjungtas"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Nėra SIM kortelės arba įvyko SIM kortelės klaida"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobiliojo ryšio tinklas nepasiekiamas"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Išeinančius skambučius apriboja FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Negalite skambinti, kai įjungtas skambučių draudimas."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Visi skambučiai apriboti prieigos valdymu."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Pagalbos skambučius apriboja prieigos valdymas."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Įprastus skambučius riboja prieigos valdymas."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neteisingas numeris"</string>
+    <string name="payphone" msgid="4793877574636445118">"Taksofonas"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferencinis skambutis"</string>
-    <string name="call_lost" msgid="317670617901479594">"Skambutis prarastas."</string>
-    <string name="ok" msgid="3811371167865772377">"Gerai"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Skambutis atmestas"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Garsiakalbis"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Telefono ausinė"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Laidinės ausinės"</string>
@@ -57,14 +37,20 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferencinis skambutis <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balso pašto numeris"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Renkamas numeris"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Bandoma dar kartą"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Numeris renkamas pakartotinai"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferencinis skambutis"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Gaunamas skambutis"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Gaunamasis skambutis"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Skambutis baigtas"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Sulaikyta"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Baigiamas pokalbis"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Skambinant"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mano numeris: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Prisijungiama prie vaizdo skambučio"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Vaizdo skambutis"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Pateikiama vaizdo skambučio užklausa"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Nepavyko prijungti vaizdo įrašo skambučio"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Atskambinimo numeris\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Atskambinimo numeris, kuriuos skambina pagalbos tarnyba\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Renkamas numeris"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Praleistas skambutis"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Praleisti skambučiai"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Vykstantis pokalbis"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Sulaikyta"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Skambina"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Gaunamas vaizdo skambutis"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Gaunama vaizdo skambučio užklausa"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Naujas balso pašto pranešimas"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Naujas balso pašto pranešimas (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Rinkti <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nežinomas balso pašto numeris"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nėra paslaugos"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Pasirinktas tinklas (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) negalimas"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Atsiliepti"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Padėti ragelį"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vaizdo skambutis"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Balsas"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Atsiliepti"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Atsisakyti"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Perskambinti"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Pranešimas"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Jei norite skambinti, išjunkite lėktuvo režimą."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Neregistruota tinkle."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilusis tinklas negalimas."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Skambutis neišsiųstas; neįvestas teisingas numeris."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Skambutis neišsiųstas."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Korinis tinklas nepasiekiamas"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Kad galėtumėte paskambinti, įveskite tinkamą numerį."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nepavyko paskambinti."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Paleidžiama MMI seka..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepalaikoma paslauga."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Neįmanoma perjungti skambučių."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Neįmanoma atskirti skambučio."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Neįmanoma perkelti skambučio."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Neįmanoma atlikti konferencinių skambučių."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Neįmanoma atmesti skambučio."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Neleisti atšaukti skambučių."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Nežinomas balso pašto numeris."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Skambutis internetu"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Paslauga nepalaikoma."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nepavyko perjungti skambučių."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nepavyko atskirti skambučio."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nepavyko peradresuoti."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Nepavyko sukurti konferencijos."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nepavyko atmesti skambučio."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nepavyko atjungti skamb."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP skambutis"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Skambutis pagalbos numeriu"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Įjungiamas radijas…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Sritis, kurioje paslauga neteikiama, bandoma iš naujo..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Nepaskambinta. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nėra pagalbos numeris!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Nepaskambinta. Surinkite pagalbos numerį!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nėra ryšio. Bandoma dar kartą…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nepavyko paskambinti. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nėra pagalbos numeris."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nepavyko paskambinti. Surinkite pagalbos numerį."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Naudokite klaviatūrą ir rinkite numerius"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Sulaikyti skambutį"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Tęsti skambutį"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Pridėti skambutį"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Sujungti skambučius"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Sukeisti skambučius"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Sulaikyti"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Pabaiga"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Numerio rinkimo klaviatūra"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sujungti skambučius"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Apkeisti"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Valdyti skambučius"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Valdyti konferenciją"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Tvark. konf. skamb."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Garso įr."</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Vaizdo sk."</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Pakeisti į balso skambutį"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Perjungti fotoaparatą"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pristabdyti vaizdo įrašą"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Daugiau parinkčių"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Paslauga"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Sąranka"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nenustatyta&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Sukurkite patys..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Atšaukti"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Siųsti"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"vienas"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"du"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trys"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"keturi"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"penki"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šeši"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"septyni"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"aštuoni"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devyni"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"žvaigždutė"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nulis"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"svaras"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"rinkti numerį"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"naikinimo klavišas"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Garsiakalbis įgalintas."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Skambutis nutildytas."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atsakyti"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Siųsti SMS pranešimą"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Atmesti"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Atsiliepti kaip į vaizdo skambutį"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Atsiliepti kaip į garso skambutį"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Priimti vaizdo įrašo užklausą"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Atmesti vaizdo įrašo užklausą"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slyskite aukštyn link parinkties „<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>“."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slyskite į kairę link parinkties „<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>“."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slyskite į dešinę link parinkties „<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>“."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Slyskite žemyn link <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibruoti"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibruoti"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Garsas"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Numatytasis garsas (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Telefono skambėjimo tonas"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibruoti, kai skambina"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numerio rinkimo lietimo tonas"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Skambinimo skydelio automatinis užbaig."</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autom. skamb. skyd. užbaig."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Skambėjimo tonas ir vibracija"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Valdyti konferencinį skambutį"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Pagalbos numeris"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index c947811..0171924 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Aizturēts"</string>
     <string name="unknown" msgid="6878797917991465859">"Nezināms"</string>
     <string name="private_num" msgid="6713286113000232309">"Privāts numurs"</string>
-    <string name="payphone" msgid="1931775086311769314">"Taksofons"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Līnija ir aizņemta"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Tīkls ir aizņemts"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Nav atbildes; noildze"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveris nav sasniedzams"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numurs nav sasniedzams"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nepareizs lietotājvārds vai parole"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Zvans tika veikts ārpus tīkla."</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Servera kļūda. Vēlāk mēģiniet vēlreiz."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nav signāla"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ierobežojums ir pārsniegts."</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio ir izslēgts."</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Nav SIM, vai SIM kļūda"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilais tīkls nav pieejams."</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FNSN ierobežo izejošos zvanus."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Izejošos zvanus nevar veikt, ja ir ieslēgts zvanu aizliegums."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Piekļuves vadība ierobežo visus zvanus."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Piekļuves vadība ierobežo ārkārtas zvanus."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Piekļuves vadība ierobežo parastos zvanus."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numurs nav derīgs."</string>
+    <string name="payphone" msgid="4793877574636445118">"Maksas tālrunis"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferences zvans"</string>
-    <string name="call_lost" msgid="317670617901479594">"Zvans ir zaudēts."</string>
-    <string name="ok" msgid="3811371167865772377">"Labi"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Zvans tika pārtraukts."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Skaļrunis"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Austiņas"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Austiņas ar vadu"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferences zvans <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balss pasta numurs"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Notiek numura sastādīšana"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Notiek atkārtota mēģināšana"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Notiek atkārtota zvanīšana"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferences zvans"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Ienākošais zvans"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Zvans ir pabeigts"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Notiek klausules nolikšana"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Notiek saruna"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mans tālruņa numurs: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Notiek video savienojuma izveide"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videozvans"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Notiek video pieprasīšana"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Nevar veikt videozvanu"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Jūsu atzvana numurs\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Jūsu ārkārtas atzvana numurs\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Notiek numura sastādīšana"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Neatbildēts zvans"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neatbildētie zvani"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Pašreizējā saruna"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Aizturēts"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ienākošs zvans"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Ienākošs videozvans"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Ienākošs video pieprasījums"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Jauns balss pasts"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Jauns balss pasts (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Sastādiet šādu numuru: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Balss pasta numurs nav zināms."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nav pakalpojuma"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Atlasītais tīkls (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nav pieejams"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Atbildēt"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Pārtraukt"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Balss"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Pieņemt"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Nerādīt"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Atzvanīt"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Ziņojums"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Lai veiktu zvanu, vispirms izslēdziet lidojuma režīmu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tīklā nav reģistrēts."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilais tīkls nav pieejams."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Zvans nav nosūtīts; derīgs numurs nav ievadīts."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Zvans nav nosūtīts."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilais tīkls nav pieejams."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Lai veiktu zvanu, ievadiet derīgu numuru."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nevar veikt zvanu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Notiek MMI secības startēšana…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Neatbalstīts pakalpojums."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nevar pārslēgt zvanus."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nevar atdalīt zvanu."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nevar pārsūtīt zvanu."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nevar veikt konferences zvanus."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nevar noraidīt zvanu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nevar atvienot zvanu(-us)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Balss pasta numurs nav zināms."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Interneta zvans"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Pakalpojums netiek atbalstīts."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nevar pārslēgt zvanus."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nevar nošķirt zvanu."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nevar pāradresēt."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Nevar veikt konferences zvanu."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nevar noraidīt zvanu."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nevar pārtraukt zvanu(-us)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP zvans"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ārkārtas zvans"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Notiek radio ieslēgšana..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Ārpus apkalpošanas apgabala, tiek mēģināts vēlreiz..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Zvans netika nosūtīts. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nav ārkārtas izsaukuma numurs."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Zvans nav nosūtīts. Ievadiet ārkārtas izsaukuma numuru."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nav pakalpojuma. Notiek atkārtots mēģinājums…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nevar veikt zvanu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nav ārkārtas numurs."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nevar veikt zvanu. Zvaniet ārkārtas numuram."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Izmantojiet tastatūru, lai sastādītu numuru."</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Aizturēt zvanu"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Atsākt zvanu"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Pievienot zvanu"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Apvienot zvanus"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Mainīt zvanus"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Aizturēt"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Beigt"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Numuru sastādīšanas tastatūra"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sapludināt zvanus"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Mainīt"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Pārvaldīt zvanus"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Pārvaldīt konferenci"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Pārvaldīt zvanu"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videozvans"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mainīt uz balss zvanu"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Pārslēgt kameru"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pārtraukt videoklipa atskaņošanu"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Citas opcijas"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Pakalpojums"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Iestatīšana"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nav iestatīts&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Rakstīt savu…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Atcelt"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Sūtīt"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"viens"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"divi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trīs"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"četri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pieci"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seši"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"septiņi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"astoņi"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"deviņi"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"zvaigznīte"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nulle"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"cipara simbols"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"sastādīt numuru"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"atpakaļatkāpe"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Skaļrunis ir iespējots."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvana skaņa ir izslēgta."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atbildēt"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Sūtīt īsziņu"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Noraidīt"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Atbildēt videozvanā"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Atbildēt audiozvanā"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Pieņemt video pieprasījumu"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Noraidīt video pieprasījumu"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Velciet uz augšu, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Velciet pa kreisi, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Velciet pa labi, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Velciet uz leju, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrozvans"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrozvans"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Signāls"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Noklusējuma signāls (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Tālruņa zvana signāls"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrēt zvanot"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Num. sast. tastatūras piesk. signāli"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Numuru sast. tast. autom. pabeigšana"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Numura automātiska pabeigšana"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvana signāls un vibrācija"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Pārvaldīt konferences zvanu"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Ārkārtas numurs"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-mk-rMK/strings.xml b/InCallUI/res/values-mk-rMK/strings.xml
new file mode 100644
index 0000000..6081ac9
--- /dev/null
+++ b/InCallUI/res/values-mk-rMK/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Телефон"</string>
+    <string name="onHold" msgid="9035493194749959955">"На чекање"</string>
+    <string name="unknown" msgid="6878797917991465859">"Непознато"</string>
+    <string name="private_num" msgid="6713286113000232309">"Приватен број"</string>
+    <string name="payphone" msgid="4793877574636445118">"Говорница"</string>
+    <string name="confCall" msgid="1904840547188336828">"Конференциски повик"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Повикот е испуштен"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Звучник"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Слушалка"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Жични слушалки"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Испрати ги следниве тонови?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Испраќање тонови\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"Испрати"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"Да"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"Не"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Замени резервен знак со"</string>
+    <string name="caller_manage_header" msgid="3231519674734638786">"Конференциски повик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број на говорна пошта"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Бирање"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Повторно бирање"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"Конференциски повик"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Дојдовен повик"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Повикот заврши"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"На чекање"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Прекинување повик"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"Повик во тек"</string>
+    <string name="card_title_my_phone_number" msgid="112428362494434191">"Мојот број е <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Се поврзува видео"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Видеоповик"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Се побарува видео"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Не може да поврзе видеоповик"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Вашиот број за повратен повик\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Вашиот број за итен повик\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Бирање"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуштен повик"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени повици"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> пропуштени повици"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуштен повик од <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Тековен повик"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"На чекање"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"Дојдовен повик"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Дојдовен видеоповик"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Дојдовно побарување за видео"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова говорна пошта"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова говорна пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Бирај <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Бројот на говорна пошта е непознат"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"Нема услуга"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"Одбраната мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) е недостапна"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Одговори"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Спушти"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Гласовен"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Прифати"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Отфрли"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Повикува назад"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Порака"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"За да воспоставите повик, прво исклучете режим на работа во авион."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не е регистриран на мрежа."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Не е достапна мобилна мрежа."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да повикате, внесете важечки број."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не може да повика."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Започнува MMI низа..."</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Услугата не е поддржана."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не може да префрли повици."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не може да оддели повик."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не може да пренесе."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Не може да влезе во конференција."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Не може да отфрли повик."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Не може да реализира повик(ци)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Повик преку СИП"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Повик за итни случаи"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Вклучување радио..."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нема услуга. Се обидува повторно…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Не може да повика. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е број за итни повици."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не може да повика. Бирајте го бројот за итни повици."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Користи тастатурата за бирање"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Задржи повик"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Продолжи повик"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Додај повик"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Спои повици"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Замени повици"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Почекај"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"Заврши"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Тастатура за бирање"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Исклучи звук"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Додај повик"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Спој повици"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Замени"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управувај со повици"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Управувај со повикот"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео повик"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Промени во гласовен повик"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Префрли фотоапарат"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Паузирај видео"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Повеќе опции"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Услуга"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Подесување"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не е подесен&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Други подесувања на повик"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Повикување преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"Дојдовни повици преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"фотографија за контакт"</string>
+    <string name="goPrivate" msgid="865837794424530980">"префли на приватно"</string>
+    <string name="selectContact" msgid="781975788478987237">"избери контакт"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напиши сопствена..."</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"Откажи"</string>
+    <string name="custom_message_send" msgid="5795754217085747742">"Испрати"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Одговори"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"Испрати СМС"</string>
+    <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Одговори со видеоповик"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Одговори со аудиоповик"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Прифати барање за видео"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Одбиј барање за видео"</string>
+    <string name="description_direction_up" msgid="4441409581444516690">"Лизгај нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_left" msgid="7129873384376533287">"Лизгај налево за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_right" msgid="2122584234531957308">"Лизгај надесно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Лизгај надолу за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибрирање"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибрирање"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Стандарден звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"Мелодија на телефон"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибрирај кога ѕвони"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Авт. доврши подлога за бирање"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија и вибрации"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Управувај со конференциски повик"</string>
+    <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Број за итни случаи"</string>
+</resources>
diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml
index 72ed1d0..18ab1f4 100644
--- a/InCallUI/res/values-ml-rIN/strings.xml
+++ b/InCallUI/res/values-ml-rIN/strings.xml
@@ -21,33 +21,13 @@
     <string name="onHold" msgid="9035493194749959955">"ഹോള്‍ഡിലാണ്"</string>
     <string name="unknown" msgid="6878797917991465859">"അജ്ഞാതം"</string>
     <string name="private_num" msgid="6713286113000232309">"സ്വകാര്യ നമ്പർ"</string>
-    <string name="payphone" msgid="1931775086311769314">"പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"ലൈൻ തിരക്കിലാണ്"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"നെറ്റ്‌വർക്ക് തിരക്കിലാണ്"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"പ്രതികരണമില്ല, കാലഹരണപ്പെട്ടു"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"സെർവറിൽ പരിധിയ്‌ക്ക് പുറത്താണ്"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"നമ്പർ പരിധിയ്‌ക്ക് പുറത്താണ്"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ഉപയോക്തൃനാമമോ പാസ്‌വേഡോ തെറ്റാണ്"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"നെറ്റ്‌വർക്കില്ലാത്ത സ്ഥലത്തുനിന്നും കോൾ ചെയ്‌തു"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"സെർവർ പിശക്. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"സിഗ്‌നൽ ഇല്ല"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM പരിധി കഴിഞ്ഞു"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"റേഡിയോ ഓഫാക്കുക"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM ഇല്ല അല്ലെങ്കിൽ SIM പിശക്"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"മൊബൈൽ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN, ഔട്ട്ഗോയിംഗ് കോളുകൾ നിയന്ത്രിച്ചിരിക്കുന്നു."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"കോൾ ബാറിംഗ് ഓണായിരിക്കുമ്പോൾ നിങ്ങൾ ഔട്ട്‌ഗോയിംഗ് കോളുകൾ വിളിക്കാനാകില്ല."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ആക്‌സസ്സ് നിയന്ത്രണം, എല്ലാ കോളുകളും നിയന്ത്രിച്ചിരിക്കുന്നു."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"ആക്‌സസ്സ് നിയന്ത്രണം, അടിയന്തര കോളുകൾ നിയന്ത്രിച്ചിരിക്കുന്നു."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ആക്‌സസ്സ് നിയന്ത്രണം, സാധാരണ കോളുകൾ നിയന്ത്രിച്ചിരിക്കുന്നു."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"സാധുതയില്ലാത്ത ന‍മ്പര്‍"</string>
+    <string name="payphone" msgid="4793877574636445118">"പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ"</string>
     <string name="confCall" msgid="1904840547188336828">"കോൺഫറൻസ് കോൾ"</string>
-    <string name="call_lost" msgid="317670617901479594">"കോൾ നഷ്‌ടപ്പെട്ടു."</string>
-    <string name="ok" msgid="3811371167865772377">"ശരി"</string>
+    <string name="call_lost" msgid="6183862117003999578">"കോൾ വിട്ടു"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"സ്പീക്കർ"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ഹാൻഡ്‌സെറ്റ് ഇയർപീസ്"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ്"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ബ്ലൂടൂത്ത്"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"ഇനിപ്പറയുന്ന ടോണുകൾ അയയ്‌ക്കണോ?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"ടോണുകൾ അയയ്‌ക്കുന്നു\n"</string>
     <string name="send_button" msgid="4106860097497818751">"അയയ്‌ക്കുക"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"കോൺഫറൻസ് കോൾ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"വോയ്‌സ്‌മെയിൽ നമ്പർ"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ഡയൽ ചെയ്യുന്നു"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"വീണ്ടും ശ്രമിക്കുന്നു"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"വീണ്ടും ഡയൽചെയ്യുന്നു"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"കോൺഫറൻസ് കോൾ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ഇന്‍കമിംഗ് കോള്‍"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"കോൾ അവസാനിച്ചു"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"ഹാംഗിംഗ് അപ്പ്"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"കോളിലാണ്"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"എന്റെ നമ്പർ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> ആണ്"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"വീഡിയോ കണക്‌റ്റുചെയ്യുന്നു"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"വീഡിയോ കോള്‍"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"വീഡിയോ അഭ്യർത്ഥിക്കുന്നു"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"വീഡിയോ കോളുമായി കണക്‌റ്റുചെയ്യാനാവില്ല"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"നിങ്ങൾ തിരിച്ചുവിളിക്കേണ്ട നമ്പർ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"അടിയന്തിരമായി നിങ്ങൾ തിരിച്ചുവിളിക്കേണ്ട നമ്പർ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ഡയൽ ചെയ്യുന്നു"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"മിസ്‌ഡ് കോൾ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"മിസ്‌ഡ് കോളുകൾ"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"കോൾ സജീവമാണ്"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ഹോള്‍ഡിലാണ്"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ഇന്‍കമിംഗ് കോള്‍"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ഇൻകമിംഗ് വീഡിയോ കോൾ"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"ഇൻകമിംഗ് വീഡിയോ അഭ്യർത്ഥന"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"പുതിയ വോയ്‌സ്‌മെയിൽ"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"പുതിയ വോയ്‌സ്‌മെയിൽ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ഡയൽ ചെയ്യുക"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"വോയ്‌സ്‌മെയിൽ നമ്പർ അജ്ഞാതമാണ്"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"സേവനമില്ല"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ലഭ്യമല്ല"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"മറുപടി നൽകുക"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"ഹാംഗ് അപ്പ് ചെയ്യുക"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"വീഡിയോ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"വോയ്‌സ്"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"അംഗീകരിക്കുക"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"നിരസിക്കുക"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"കോൾബാക്ക്"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"സന്ദേശം"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"ഒരു കോൾ വിളിക്കാൻ, ആദ്യം വിമാന മോഡ് ഓഫുചെയ്യുക."</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"ഒരു കോൾ വിളിക്കാൻ, ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫുചെയ്യുക."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"നെറ്റ്‌വർക്കിൽ രജിസ്റ്റർ ചെയ്‌തിട്ടില്ല."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"മൊബൈൽ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"കോൽ ചെയ്യാനായില്ല. സാധുവായ നമ്പറൊന്നും നൽകിയില്ല."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"കോൾ ചെയ്യാനായില്ല."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ഒരു കോൾ ചെയ്യുന്നതിന്, സാധുതയുള്ള നമ്പർ നൽകുക."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"കോൾ ചെയ്യാനായില്ല."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI സീക്വൻസ് ആരംഭിക്കുന്നു…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"പിന്തുണയ്‌ക്കാത്ത ഉപകരണം."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"കോളുകൾ മാറാനായില്ല."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"കോൾ വിഭജിക്കാനായില്ല."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"കോൾ കൈമാറാനായില്ല."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"കോൺഫറൻസ് കോളുകൾ ചെയ്യാനായില്ല."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"കോൾ നിരസിക്കാനായില്ല."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"കോൾ (കോളുകൾ) റിലീസുചെയ്യാനായില്ല."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"വോയ്‌സ് മെയിൽ നമ്പർ അജ്ഞാതമാണ്."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ഇന്റർനെറ്റ് കോൾ"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"സേവനം പിന്തുണയ്‌ക്കുന്നില്ല."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"കോളുകൾ മാറാനാവില്ല."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"കോൾ വേർതിരിക്കാനാവില്ല."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"കൈമാറ്റം ചെയ്യാനാവില്ല."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"കോൺഫറൻസ് കോൾ ചെയ്യാനാവില്ല."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"കോൾ നിരസിക്കാനാവില്ല."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"കോൾ (കോളുകൾ) വിളിക്കാനാവില്ല."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP കോൾ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"അടിയന്തര കോൾ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"റേഡിയോ ഓൺ ചെയ്യുന്നു…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"സേവനമില്ലാത്ത മേഖല, വീണ്ടും ശ്രമിക്കുന്നു…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"കോൾ ചെയ്യാനായില്ല. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ഒരു അടിയന്തര നമ്പർ അല്ല!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"കോൾ ചെയ്യാനായില്ല. ഒരു അടിയന്തര നമ്പർ ഡയൽ ചെയ്യുക!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"സേവനമൊന്നുമില്ല. വീണ്ടും ശ്രമിക്കുന്നു…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"കോൾ ചെയ്യാനാവില്ല. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> എന്നത് ഒരു അടിയന്തിര നമ്പരല്ല."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"കോൾ ചെയ്യാനാവില്ല. ഒരു അടിയന്തിര കോൾ നമ്പർ ഡയൽചെയ്യുക."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ഡയൽ ചെയ്യാൻ കീബോർഡ് ഉപയോഗിക്കുക"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"കോൾ ഹോൾഡുചെയ്യുക"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"കോൾ പുനരാരംഭിക്കുക"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"കോൾ ചേർക്കുക"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"കോളുകൾ ലയിപ്പിക്കുക"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"കോളുകൾ സ്വാപ്പുചെയ്യുക"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ഹോള്‍ഡുചെയ്യുക"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"അവസാനിപ്പിക്കുക"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ഡയല്‍‌പാഡ്"</string>
@@ -111,11 +108,15 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"കോളുകൾ ലയിപ്പിക്കുക"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"സ്വാപ്പുചെയ്യുക"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"കോളുകൾ നിയന്ത്രിക്കുക"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"കോൺഫറൻസ് നിയന്ത്രിക്കുക"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"കോൺഫറൻസ് കോൾ നിയന്ത്രിക്കുക"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ഓഡിയോ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"വീഡിയോ കോൾ"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"വോയ്‌സ്‌ കോളിലേക്ക് മാറ്റുക"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"വീഡിയോ താൽക്കലികമായി നിർത്തുക"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"കൂടുതൽ ഓപ്‌ഷനുകൾ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"സേവനം"</string>
-    <string name="voicemail_settings" msgid="72448049107749316">"സജ്ജീകരിക്കുക"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"സജ്ജമാക്കുക"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;സജ്ജീകരിച്ചിട്ടില്ല&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"മറ്റ് കോൾ ക്രമീകരണങ്ങൾ"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേന വിളിക്കുന്നു"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"നിങ്ങളുടെ സ്വന്തം സന്ദേശമെഴുതുക..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"റദ്ദാക്കുക"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"അയയ്‌ക്കുക"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ഒന്ന്"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"രണ്ട്"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"മൂന്ന്"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"നാല്"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"അഞ്ച്"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ആറ്"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ഏഴ്"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"എട്ട്"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ഒമ്പത്"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"നക്ഷത്രചിഹ്നം"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"പൂജ്യം"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"പൗണ്ട്"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ഡയൽ ചെയ്യുക"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"സ്‌പീക്കർഫോൺ പ്രവർത്തനക്ഷമമാക്കി."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"കോൾ നിശബ്‌ദമാക്കി."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"മറുപടി നൽകുക"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS അയയ്ക്കുക"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"നിരസിക്കുക"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"വീഡിയോ കോളായി മറുപടി നൽകുക"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ഓഡിയോ കോളായി മറുപടി നൽകുക"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"വീഡിയോ അഭ്യർത്ഥന അംഗീകരിക്കുക"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"വീഡിയോ അഭ്യർത്ഥന നിരസിക്കുക"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി മുകളിലേയ്‌ക്ക് സ്ലൈഡുചെയ്യുക."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി ഇടത്തേയ്‌ക്ക് സ്ലൈഡുചെയ്യുക."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി വലത്തേയ്‌ക്ക് സ്ലൈഡുചെയ്യുക."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി താഴേക്ക് സ്ലൈഡുചെയ്യുക."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ശബ്‌ദം"</string>
     <string name="default_notification_description" msgid="78174796906240970">"സ്ഥിര ശബ്‌ദം (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ഫോൺ റിംഗ്ടോൺ"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"റിംഗുചെയ്യുമ്പോൾ വൈബ്രേറ്റുചെയ്യുക"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ഡയൽ പാഡ് ടച്ച് ടോണുകൾ"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ഡയൽ പാഡ് യാന്ത്രികപൂർത്തീകരണം"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ഡയൽപാഡ് സ്വയംപൂർത്തിയാക്കൽ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"റിംഗ്ടോണും വൈബ്രേറ്റുചെയ്യലും"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"കോൺഫറൻസ് കോൾ നിയന്ത്രിക്കുക"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"അടിയന്തര നമ്പർ"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-mn-rMN/strings.xml b/InCallUI/res/values-mn-rMN/strings.xml
index e2c0b15..c4646d0 100644
--- a/InCallUI/res/values-mn-rMN/strings.xml
+++ b/InCallUI/res/values-mn-rMN/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Хүлээлгэнд"</string>
     <string name="unknown" msgid="6878797917991465859">"Тодорхойгүй"</string>
     <string name="private_num" msgid="6713286113000232309">"Нууцлагдсан дугаар"</string>
-    <string name="payphone" msgid="1931775086311769314">"Төлбөртэй утас"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Шугам чөлөөгүй"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Сүлжээ завгүй"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Хариу байхгүй, хугацаа хэтэрсэн"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Серверт холбогдох боломжгүй"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Дугаарт холбогдох боломжгүй"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Хэрэглэгчийн нэр буюу нууц үг буруу"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Сүлжээний гаднаас залгасан"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Серверийн алдаа. Дараа дахин оролдоно уу."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Дохио байхгүй"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM хязгаар хэтэрсэн"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Радио идэвхгүй"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM байхгүй эсхүл SIM алдаатай"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Мобайль сүлжээ байхгүй"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Гарах дуудлагуудыг FDN-р хязгаарласан."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Дуудлага хаахыг идэвхжүүлсэн үед та гадагш дуудлага хийх боломжгүй."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Хандалтын хяналтаар бүх дуудлагыг хязгаарласан."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Хандалтын хяналтаар Ослын дуудлагуудыг хязгаарласан."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Хандалтын хяналтаар энгийн дуудлагуудыг хязгаарласан."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Алдаатай дугаар"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="confCall" msgid="1904840547188336828">"Утсан хурал"</string>
-    <string name="call_lost" msgid="317670617901479594">"Дуудлага алдагдсан."</string>
-    <string name="ok" msgid="3811371167865772377">"Тийм"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Дуудлага таслагдсан"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Чанга яригч"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Утасны чихэвч"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Утастай чихэвч"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Утсан хурал <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Дуут шуудангийн дугаар"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Залгаж байна"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Дахин оролдож байна"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Дахин залгаж байна"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Утсан хурал"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Ирж буй дуудлага"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Дуудлага дууссан"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Тасалж байна"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Дуудлагатай"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Миний дугаар <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Видеог холбож байна"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Видео хурал"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Видео хүсэлт гаргасан"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Видео дуудлага амжилтгүй боллоо"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Таны залгасан дугаар\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Таны залгасан түргэн тусламжийн дугаар \n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Залгаж байна"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Аваагүй дуудлага"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Аваагүй дуудлагууд"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Хийгдэж буй дуудлага"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Хүлээлгэнд"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ирж буй дуудлага"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Ирж буй видео дуудлага"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Ирж буй видео хүсэлт"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Шинэ дуут шуудан"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Шинэ дуут шуудан (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> руу залгах"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Дуут шуудангийн дугаар тодорхойгүй"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Үйлчилгээ байхгүй"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Сонгосон сүлжээ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ашиглах боломжгүй"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Хариулт"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Таслах"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Хоолой"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Зөвшөөрөх"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Алгасах"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Буцааж залгах"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Зурвас"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Дуудлага хийхийн тулд юуны өмнө Нислэгийн төлвийг идэвхгүйжүүлнэ үү."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Сүлжээнд бүртгэгдээгүй."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобайль сүлжээ байхгүй."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Дуудлага илгээгдсэнгүй, зөв дугаар оруулаагүй байна."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Дуудлага илгээгдсэнгүй."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Үүрэн сүлжээ байхгүй."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Дуудлага хийхийн тулд хүчин төгөлдөр дугаар оруулна уу."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Дуудлага хийх боломжгүй байна."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI дарааллыг эхлүүлж байна…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Дэмжигдээгүй үйлчилгээ."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Дуудлагыг шилжүүлэх боломжгүй."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Дуудлагыг тусгаарлах боломжгүй."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Дуудлагыг дамжуулах боломжгүй."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Утсан хурал хийх боломжгүй."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Дуудлагыг таслах боломжгүй."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Дуудлагыг нээх боломжгүй."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Дуут шуудангийн дугаар тодорхойгүй."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Интернет дуудлага"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Дэмжигдээгүй үйлчилгээ байна."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Дуудлагыг солих боломжгүй байна."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Дуудлагыг салгаж чадахгүй байна."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Шилжүүлэх боломжгүй байна."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Конференц дуудлага хийх боломжгүй байна."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Дуудлага татгалзах боломжгүй байна."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Дуудлага чөлөөлөх боломжгүй байна."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP дуудлага"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ослын дуудлага"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радиог асааж байна…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Үйлчилгээний хүрээнээс гарлаа, дахин оролдож байна ..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Дуудлага илгээгдсэнгүй. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> нь ослын дугаар биш!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Дуудлага илгээгдсэнгүй. Ослын дугаар руу залгана уу!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ажиллагаагүй байна. Дахин оролдоно уу..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Дуудлага хийх боломжгүй. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> нь түргэн тусламжийн дугаар биш байна."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Дуудлага хийх боломжгүй. Түргэн тусламжийн дугаар луу залга."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Залгахдаа гар ашиглах"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Дуудлагыг хүлээлгэх"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Дуудлагыг үргэлжлүүлэх"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Дуудлага нэмэх"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Дуудлагуудыг нэгтгэх"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Дуудлага солих"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Саатуулах"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Дуусгах"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Диалпад"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Дуудлагуудыг нэгтгэх"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Солих"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Дуудлагуудыг удирдах"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Утсан хурлыг удирдах"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Утсан хурлыг удирдах"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео хурал"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Дуут дуудлага руу өөрчлөх"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Камер солих"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Видеог түр зогсоох"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Нэмэлт сонголтууд"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Үйлчилгээ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Суулгах"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Тохируулаагүй&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Өөрийн гэснийг бичээрэй..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Цуцлах"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Илгээх"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"нэг"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"хоёр"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"гурав"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"дөрөв"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"тав"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"зургаа"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"долоо"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"найм"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ес"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"од"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"нойль"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"фунт"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"залгах"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"ухраах"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Чанга яригчийг идэвхжүүлсэн."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Дууг хаасан."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Хариулах"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS илгээх"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Татгалзах"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Видео дуудлагаар хариулах"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Аудио дуудлагаар хариулах"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Видео хүсэлтийг зөвшөөрөх"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Видео хүсэлтээс татгалзах"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> хийх бол дээш гулсуулна уу."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> хийх бол зүүн талруу гулсуулна уу."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> хийх бол баруун талруу гулсуулна уу."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> хийх бол доош гулсуулах."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Чичиргээ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Чичиргээ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Дуу"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Үндсэн дуу (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Утасны хонхны ая"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Хонх дуугарах үед чичрэх"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Хүрэлтээр дуугардаг дуудлага цуглуулах самбар"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Дугаар цуглуулагчийг автоматаар бөглөх"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Дугаарыг автоматиар гүйцээх"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Хонхны ая &amp; Чичиргээ"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Утсан хурлыг удирдах"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Яаралтай дугаар"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index 9cd061f..b4dbeef 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml
@@ -21,33 +21,13 @@
     <string name="onHold" msgid="9035493194749959955">"होल्ड वर"</string>
     <string name="unknown" msgid="6878797917991465859">"अज्ञात"</string>
     <string name="private_num" msgid="6713286113000232309">"खाजगी नंबर"</string>
-    <string name="payphone" msgid="1931775086311769314">"देय फोन"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"लाइन व्यस्त"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"नेटवर्क व्यस्त"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"कोणताही प्रतिसाद नाही, कालबाह्य झाले"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"सर्व्हर पोहचण्‍यायोग्‍य नाही"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"नंबर पोहचण्‍यायोग्‍य नाही"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"चुकीचे वापरकर्तानाव किंवा संकेतशब्द"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"नेटवर्क-बाहेरून कॉल केला"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"सर्व्हर त्रुटी. कृपया नंतर पुन्हा प्रयत्न करा."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"सिग्नल नाही"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM मर्यादा ओलांडली"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"रेडिओ बंद"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM नाही किंवा SIM त्रुटी"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"मोबाइल नेटवर्क उपलब्ध नाही"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"केले जाणारे कॉल FDN द्वारे प्रतिबंधित केले जातात."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"कॉल वगळणे चालू असताना आपण कॉल करू शकत नाही."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"सर्व कॉल प्रवेश नियंत्रणाद्वारे प्रतिबंधित केले जातात."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"आणीबाणीचे कॉल प्रवेश नियंत्रणाद्वारे प्रतिबंधित केले जातात."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"सामान्‍य कॉल प्रवेश नियंत्रणाद्वारे प्रतिबंधित केले जातात."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"अवैध नंबर"</string>
+    <string name="payphone" msgid="4793877574636445118">"सार्वजनिक फोन"</string>
     <string name="confCall" msgid="1904840547188336828">"परिषद कॉल"</string>
-    <string name="call_lost" msgid="317670617901479594">"कॉल गमावला गेला आहे."</string>
-    <string name="ok" msgid="3811371167865772377">"ठीक"</string>
+    <string name="call_lost" msgid="6183862117003999578">"कॉल सोडला"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"स्पीकर"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"हँडसेट इअरपीस"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"वायर्ड हेडसेट"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ब"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"खालील टोन पाठवायचे?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"टोन पाठवित आहे\n"</string>
     <string name="send_button" msgid="4106860097497818751">"पाठवा"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"परिषद कॉल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"व्हॉइसमेल नंबर"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"डायल करीत आहे"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"पुन्हा प्रयत्न करत आहे"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"रीडायल करत आहे"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"परिषद कॉल"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"येणारे कॉल"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"कॉल संपला"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"हँग अप करणेे"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"कॉल मधील"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"माझा नंबर <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> आहे"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"व्हिडिओ कनेक्ट करत आहे"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"व्हिडिओ कॉल"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"व्हिडिओ विनंती करत आहे"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"व्हिडिओ कॉल कनेक्ट करू शकत नाही"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"आपला कॉलबॅक नंबर\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"आपला आणीबाणी कॉलबॅक नंबर\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"डायल करीत आहे"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"सुटलेला कॉल"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"सुटलेले कॉल"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"सुरू असलेला कॉल"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड वर"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"येणारा कॉल"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"येणारा व्हिडिओ कॉल"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"येणारी व्हिडिओ विनंती"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"नवीन व्हॉइसमेल"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नवीन व्हॉइसमेल (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> डायल करा"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"व्हॉइसमेल नंबर अज्ञात"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"सेवा नाही"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"निवडलेले नेटवर्क (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) अनुपलब्‍ध"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"उत्तर"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"हँग अप"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"व्हिडिओ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"व्हॉइस"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"स्वीकारा"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"डिसमिस करा"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"पुन्हा कॉल करा"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"संदेश"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"कॉल करण्यासाठी, प्रथम विमान मोड बंद करा."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्कवर नोंदणीकृत नाही."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"मोबाइल नेटवर्क उपलब्ध नाही."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"कॉल पाठविला नाही, वैध नंबर प्रविेष्‍ट केला नाही."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"कॉल पाठविला नाही."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"सेल्युलर नेटवर्क उपलब्ध नाही."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करण्यासाठी, एक वैध नंबर प्रविष्ट करा."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"कॉल करू शकत नाही."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI क्रम प्रारंभ करीत आहे..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"असमर्थित सेवा."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"कॉल स्विच करण्यात अक्षम."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"कॉल वेगळे करण्‍यात अक्षम."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"कॉल स्‍थानांतरित करण्यात अक्षम."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"परिषद कॉल करण्‍यात अक्षम."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"कॉलला नकार देण्‍यात अक्षम."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"कॉल रीलिज करण्‍यात अक्षम."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"व्हॉइसमेल क्रमांक अज्ञात."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"इंटरनेट कॉल"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"सेवा समर्थित नाही."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कॉल स्विच करू शकत नाही."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कॉल विभक्त करू शकत नाही."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"हस्तांतर करू शकत नाही."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"कॉन्फरन्स घेऊ शकत नाही."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"कॉल नाकारू शकत नाही."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"कॉल रिलीझ करू शकत नाही."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP कॉल"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आणीबाणीचा कॉल"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडिओ चालू करीत आहे..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"सेवा क्षेत्राच्या बाहेर, पुन्हा प्रयत्न करत आहे..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"कॉल पाठविला नाही. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> हा आणीबाणीचा नंबर नाही!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कॉल पाठविला नाही. आणीबाणीचा नंबर डायल करा!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"सेवा नाही. पुन्हा प्रयत्न करत आहे…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"कॉल करू शकत नाही. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> हा आणीबाणी नंबर नाहीये."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"कॉल करू शकत नाही. आणीबाणी नंबर डायल करा."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करण्‍यासाठी कीबोर्डचा वापर करा"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"कॉल होल्‍ड करा"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"कॉल सुरु करा"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"कॉल जोडा"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"कॉल विलीन करा"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"कॉल स्‍वॅप करा"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करा"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"शेवट"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"डायलपॅड"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कॉल विलीन करा"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"अदलाबदल करा"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"कॉल व्यवस्थापित करा"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"परिषद व्यवस्थापित करा"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"परिषद कॉल व्यवस्थापित करा"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ऑडिओ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"व्हिडिओ कॉल"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"व्हॉइस कॉल वर बदला"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"कॅमेरा स्विच करा"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"व्हिडिओला विराम द्या"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"अधिक पर्याय"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"सेवा"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"सेटअप"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;सेट नाही&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"आपण स्वतः लिहा…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"रद्द करा"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"पाठवा"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"एक"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"दोन"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"तीन"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"चार"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"पाच"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"सहा"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"सात"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"आठ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"नऊ"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"तारा"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"शून्य"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"पाऊंड"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"डायल करा"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्‍पीकरफोन सक्षम केला."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"कॉल नि.शब्‍द केला."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS पाठवा"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"नकार द्या"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"व्हिडिओ कॉल म्हणून उत्तर द्या"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ऑडिओ कॉल म्हणून उत्तर द्या"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"व्हिडिओ विनंती स्वीकारा"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"व्हिडिओ विनंतीस नकार द्या"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी वर स्लाइड करा."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी डावीकडे स्लाइड करा."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी उजवीकडे स्लाइड करा."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> साठी खाली स्लाइड करा."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"कंपन होणे"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"कंपन होणे"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ध्वनी"</string>
     <string name="default_notification_description" msgid="78174796906240970">"डीफॉल्ट आवाज (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"फोन रिंगटोन"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"रिंग करताना कंपन करा"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"डायल पॅड स्पर्श टोन"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"डायल पॅड स्‍वयंपूर्ण"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"डायलपॅड स्वयंपूर्ण"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिंगटोन आणि कंपन"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"परिषद कॉल व्यवस्थापित करा"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आणीबाणीचा नंबर"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index 0b4c43e..3bbc836 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Ditunda"</string>
     <string name="unknown" msgid="6878797917991465859">"Tidak diketahui"</string>
     <string name="private_num" msgid="6713286113000232309">"Nombor peribadi"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefon awam"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Talian sibuk"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rangkaian sibuk"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Tiada respons, tamat masa"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Pelayan tidak boleh dicapai"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nombor tidak dapat dihubungi"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nama pengguna atau kata laluan tidak betul"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Dipanggil dari luar rangkaian"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Ralat pelayan. Cuba lagi kemudian"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Tiada isyarat"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Melebihi had ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio dimatikan"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Tiada SIM atau ralat SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Rangkaian mudah alih tidak tersedia"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Panggilan keluar dihadkan oleh FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Anda tidak boleh membuat panggilan keluar semasa sekatan panggilan dihidupkan."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Semua panggilan dihadkan oleh kawalan akses."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Panggilan kecemasan dihadkan oleh kawalan akses."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Panggilan biasa dihadkan oleh kawalan akses."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nombor tidak sah"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefon Awam"</string>
     <string name="confCall" msgid="1904840547188336828">"Panggilan sidang"</string>
-    <string name="call_lost" msgid="317670617901479594">"Panggilan telah terputus."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Panggilan diputuskan"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Pembesar suara"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Alat dengar telefon mudah alih"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Set kepala berwayar"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Panggilan sidang <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nombor mel suara"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Mendail"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Mencuba semula"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Mendail semula"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Panggilan sidang"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Panggilan masuk"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Panggilan tamat"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Menamatkan panggilan"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Dalam panggilan"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Nombor saya ialah <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Menyambungkan video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Pgln video"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Meminta video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Tidak dapat menyambungkan panggilan video"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Nombor panggil balik anda\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Nombor panggil balik kecemasan anda\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Mendail"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Panggilan tidak dijawab"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tidak dijawab"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan sedang berjalan"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ditunda"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Panggilan video masuk"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Permintaan video masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mel suara baru"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Mel suara baru (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dail <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nombor mel suara tidak dikenali"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Tiada perkhidmatan"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rangkaian pilihan (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Jawab"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Letakkan gagang"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video dalam strim"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Suara"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Terima"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ketepikan"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Panggil balik"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesej"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Untuk membuat panggilan, matikan mod Pesawat terlebih dahulu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tidak didaftarkan pada rangkaian."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rangkaian mudah alih tidak tersedia."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Panggilan tidak dihantar, tiada nombor yang sah dimasukkan."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Panggilan tidak dihantar."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rangkaian selular tidak tersedia."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Untuk membuat panggilan, masukkan nombor yang sah."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Tidak dapat memanggil."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Memulakan jujukan MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Perkhidmatan tidak disokong."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Tidak boleh bertukar panggilan."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Tidak boleh memisahkan panggilan."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Tidak boleh memindahkan panggilan."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Tidak boleh membuat panggilan sidang."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Tidak dapat menolak panggilan."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Tidak dapat melepaskan panggilan."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Nombor mel suara tidak diketahui."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Panggilan internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Perkhidmatan tidak disokong."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat menukar panggilan."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat mengasingkan panggilan."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Tidak dapat memindahkan panggilan."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Tidak dapat membuat panggilan persidangan."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Tidak dapat menolak panggilan."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Tidak dapat melepaskan panggilan."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Panggilan SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Panggilan kecemasan"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Menghidupkan radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Di luar kawasan perkhidmatan, mencuba lagi..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Panggilan tidak dihantar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nombor kecemasan!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Panggilan tidak dihantar. Dail nombor kecemasan!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Tiada perkhidmatan. Mencuba lagi..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Tidak dapat memanggil. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nombor kecemasan."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Tidak dapat memanggil. Dail nombor kecemasan."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gunakan papan kekunci untuk mendail"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Tahan panggilan"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Sambung semula panggilan"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Tambah panggilan"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Gabung panggilan"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Silih panggilan"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tunda"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Tamat"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Pad dail"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabung panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Silih"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Urus panggilan"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Urus persidangan"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Urus panggilan sidang"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Pgln video"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Tukar ke panggilan suara"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Tukar kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Jeda video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Lagi pilihan"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Perkhidmatan"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Persediaan"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Tidak ditetapkan&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis sendiri…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Batal"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Hantar"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tiga"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"empat"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"lima"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"enam"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"tujuh"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"lapan"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"sembilan"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"bintang"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"sifar"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"paun"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"dail"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Telefon pembesar suara didayakan."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan diredam."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jawapan"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Hantar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tolak"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Jawab sebagai panggilan video"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Jawab sebagai panggilan audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Terima permintaan video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tolak permintaan video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Luncurkan ke atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Luncurkan ke kiri untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Luncurkan ke kanan untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Luncurkan ke bawah untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Bunyi"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Bunyi lalai (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Nada dering telefon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Bergetar apabila berdering"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Nada sentuh pad dail"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autolengkap pad pendail"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autolengkap pad dail"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Bergetar"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Urus panggilan sidang"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nombor kecemasan"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-my-rMM/strings.xml b/InCallUI/res/values-my-rMM/strings.xml
new file mode 100644
index 0000000..a9cde2e
--- /dev/null
+++ b/InCallUI/res/values-my-rMM/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"ဖုန်း"</string>
+    <string name="onHold" msgid="9035493194749959955">"ခဏ ကိုင်ထားစဉ်"</string>
+    <string name="unknown" msgid="6878797917991465859">"အကြောင်းအရာ မသိရှိ"</string>
+    <string name="private_num" msgid="6713286113000232309">"လျို့ဝှက် နံပါတ်"</string>
+    <string name="payphone" msgid="4793877574636445118">"ငွေပေးရသည့်ဖုန်း"</string>
+    <string name="confCall" msgid="1904840547188336828">"ကွန်းဖရင့်ခေါ်ဆိုမှု"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ဖုန်းလိုင်းကျသွား၏"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"စပီကာ"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"လက်ကိုင်တယ်လီဖုန်းနားခွက်"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ကြိုးတပ် မိုက်ခွက်ပါနားကြပ်"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ဘလူးတုသ်"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"အောက်ပါ တီးလုံးများကို ပို့မလား?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"အသံ ပို့နေစဉ်\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"ပို့ခြင်း"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"ဟုတ်ကဲ့"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"မဟုတ်ပါ"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"wildစာလုံးကို အစားထိုးရန်မှာ"</string>
+    <string name="caller_manage_header" msgid="3231519674734638786">"ကွန်းဖရင့် ခေါ်ဆိုမှု <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"အသံစာပို့စနစ်နံပါတ်"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"ဖုန်းခေါ်နေစဉ်"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ပြန်ခေါ်ရန်"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"ကွန်းဖရင့်ခေါ်ဆိုမှု"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"ဖုန်းခေါ်ဆိုမှု ပြီးဆုံးပါပြီ"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"ခဏ ကိုင်ထားစဉ်"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"ဖုန်းချနေပါသည်"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"ဖုန်းပြောနေစဉ်"</string>
+    <string name="card_title_my_phone_number" msgid="112428362494434191">"ကျွန်ုပ်၏ နံပါတ်မှာ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> ဖြစ်ပါသည်"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ဗီဒီယို ချိတ်ဆက်နေ"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ဗွီဒီယိုကို တောင်းဆိုနေ"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ဗွီဒီယို ခေါ်ဆိုမှု မပြုနိုင်။"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"သင့်အား ပြန်ခေါ်ရန် နံပါတ်\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"သင့် အရေးပေါ် ပြန်ခေါ်ရန် နံပါတ်\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"ဖုန်းခေါ်နေစဉ်"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"လွဲသွားသော ဖုန်းခေါ်မှုများ"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> လွဲသွားသော ဖုန်းခေါ်မှုများ"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> က ဖုန်းခေါ်မှုကို မကိုင်မိပါ"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"ခဏ ကိုင်ထားစဉ်"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"အသံမေးလ်အသစ်"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"အသံစာ အသစ် (<xliff:g id="COUNT">%d</xliff:g>) စောင်"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ကိုခေါ်ပါ"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"အသံဖုန်းခေါ်မှုနံပါတ် မသိပါ"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"ဝန်ဆောင်မှု မရှိပါ"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"ရွေးချယ်ထားသော ကွန်ရက် (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) မရရှိနိုင်ပါ"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"ဖြေကြားရန်"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"ဖုန်းချလိုက်ပါပြီ"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ဗီဒီယို"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"အသံ"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"လက်ခံရန်"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ပယ်ရန်"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ပြန်ခေါ်ပါ"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"စာတို"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"ဖုန်းခေါ်ဆိုမှုပြုရန်, လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်ကို ပိတ်ပါ"</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"ကွန်ယက်ပေါ်မှာ မှတ်ပုံတင်မှု မပြုလုပ်ထားပါ"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"ဆယ်လူလာ ကွန်ရက် မရှိပါ။"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"မခေါ်ဆိုနိုင်ပါ။"</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI အမှတ်စဉ်ကို စတင်နေပါသည်…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ဖုန်းခေါ်ခြင်းများကြား မကူးပ​ြောင်းနိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ဖုန်းခေါ်ခြင်းအား မခွဲထုတ်နိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"မလွှဲပြောင်းနိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"ကွန်းဖရန့်စ် မလုပ်နိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ဖုန်းခေါ်ခြင်းအား မငြင်းဆိုနိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ဖုန်းခေါ်ခြင်း(များ)အား လွှတ်မပေးနိုင်ပါ။"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP ခေါ်ဆိုမှုများ"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"အရေးပေါ်ခေါ်ဆိုမှု"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ရေဒီယို ဖွင့်နေစဉ်…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ဝန်ဆောင်မှု မရှိပါ။ ထပ်မံကြိုးစားပါ…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"မခေါ်ဆိုနိုင်ပါ။ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> က အရေးပေါ်နံပါတ် မဟုတ်ပါ။"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"မခေါ်ဆိုနိုင်ပါ။ အရေးပေါ်နံပါတ်အား ခေါ်ဆိုပါ။"</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ကီးဘုတ်သုံး၍ခလုတ်နှိပ်ပါ"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ခေါ်ဆိုမှု ခဏရပ်ပါ"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ခေါ်ဆိုမှု ဆက်လုပ်ရန်"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ခေါ်ဆိုမှု ထည့်ရန်"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ခေါ်ဆိုမှုများကို ပေါင်းစည်းရန်"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ခေါ်ဆိုမှုများကို ဖလှယ်ရန်"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"ကိုင်ထားသည်"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"ပြီးပါပြီ"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"နံပါတ်ကွက်"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"အသံတိတ်"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ဖုန်းခေါ်မှုများကို ပူးပေါင်းသည်"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"လဲပြောင်းသည်"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"ဖုန်းခေါ်မှုကို ကြီးကြပ်သည်"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"ညီလာခံ ခေါ်ဆိုရန်"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"အသံ"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"အသံဖြင့် ခေါ်ဆိုမှုသို့ ပြောင်းရန်"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ကင်မရာကို ဖွင့်ရန်"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ဗီဒီယို ဆိုင်းငံ့ရန်"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"နောက်ထပ် ရွေးစရာများ"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"ဝန်ဆောင်မှု"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"ပြင်ဆင်သည်"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"မသတ်မှတ်ထားပါ"</string>
+    <string name="other_settings" msgid="3672912580359716394">"တခြားခေါ်ဆိုမှုဆိုင်ရာ ဆက်တင်"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှ ခေါ်ဆိုခြင်း"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>မှ တစ်ဆင့် ခေါ်ဆိုမှု"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"အဆက်အသွယ်များ၏ ဓာတ်ပုံ"</string>
+    <string name="goPrivate" msgid="865837794424530980">"ပရိုက်ဗိတ်သို့ သွားပါ"</string>
+    <string name="selectContact" msgid="781975788478987237">"လိပ်စာရွေးပါ"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"သင့်ကိုယ်ပိုင် စာသား ရေးပါ..."</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"ထားတော့"</string>
+    <string name="custom_message_send" msgid="5795754217085747742">"ပို့ခြင်း"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"အဖြေ"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"စာတို ပေးပို့သည်"</string>
+    <string name="description_target_decline" msgid="4789834364389731957">"လက်မခံပါ"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ဗွီဒီယို ခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"အသံ ခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ဗီဒီယို တောင်းဆိုမှုကို လက်ခံရန်"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ဗီဒီယို တောင်းဆိုမှုကို ငြင်းပယ်ရန်"</string>
+    <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် အပေါ်ကို ပွတ်ဆွဲပါ"</string>
+    <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် ဖယ်ဘက်ကို ပွတ်ဆွဲပါ"</string>
+    <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် ညာဖက်ကို ပွတ်ဆွဲပါ"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> အတွက် အောက်ကို ပွတ်ဆွဲပါ"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"တုန်ခါခြင်း"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"တုန်ခါခြင်း"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"အသံ"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"ပုံသေ အသံ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"ဖုန်းမြည်သံ"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ဖုန်းမြည်စဉ်တုန်ခါရန်"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"နံပါတ်ကွက် အလိုအလျောက်ဖြည့်ရန်"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"ဖုန်းမြည်သံ &amp; တုန်ခါသံ"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"ကွန်းဖရင့် ခေါ်ဆိုမှုကို ထိန်းချုပ်သည်"</string>
+    <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"အရေးပေါ်နံပါတ်"</string>
+</resources>
diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 21ae152..6604a53 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Parkert"</string>
     <string name="unknown" msgid="6878797917991465859">"Ukjent"</string>
     <string name="private_num" msgid="6713286113000232309">"Hemmelig nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonkiosk"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Opptatt"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Nettverket er opptatt"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Ingen respons, tidsavbrudd"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Tjeneren kan ikke nås"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummeret kan ikke nås"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Feil brukernavn eller passord"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Anrop utenfor nettverk"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Tjenerfeil. Prøv igjen senere."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Mangler signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-grense nådd"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radioen er av"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ikke noe SIM-kort eller SIM-kortfeil"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilnettverket er ikke tilgjengelig"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Utgående samtaler er begrenset til faste nummer."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan ikke foreta utgående anrop når samtalesperre er på."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle samtaler er begrenset av tilgangskontroll."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nødsamtaler er begrenset av tilgangskontroll."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Vanlige samtaler er begrenset av tilgangskontroll."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ugyldig tall"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonkiosk"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonmøte"</string>
-    <string name="call_lost" msgid="317670617901479594">"Samtalen er mistet."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Samtale droppet"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Høyttaler"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Telefonens øreplugg"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Hodetelefon med kabel"</string>
@@ -57,14 +37,20 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøte <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer til telefonsvarer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Prøver på nytt"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Slår nummer på nytt"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonmøte"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Innkommende anrop"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Samtale avsluttet"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Samtalen er avsluttet"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Parkert"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Legger på"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Samtale pågår"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Nummeret mitt er <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Kobler til videoanrop"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videoanrop"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Ber om video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Kan ikke koble til videosamtale"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Ditt tilbakeringingsnummer\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Ditt tilbakeringingsnummer for nødsamtaler\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Slår nummeret"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Tapt anrop"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Tapte anrop"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtale"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Parkert"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Innkommende samtale"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Innkommende videoanrop"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Innkommende videoforespørsel"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nye beskjeder på telefonsvarer"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nye beskjeder på telefonsvarer (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mangler nummer til telefonsvarer"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen tjeneste"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valgt nettverk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgjengelig"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Svar"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Legg på"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Google Voice"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Godta"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Avvis"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring tilbake"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Melding"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"For å ringe, slå av flymodus først."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ikke registrert på nettverket."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilnettverket er ikke tilgjengelig."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Samtalen ble ikke opprettet, mangler eller ugyldig nummer."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Samtalen ble ikke opprettet."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilnettverket er ikke tilgjengelig."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan ikke ringe."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Begynner MMI-sekvens…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ustøttet tjeneste."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kan ikke bytte samtale."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kan ikke skille samtale."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Kan ikke overføre samtale."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Kan ikke opprette telefonmøte."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kan ikke avvise anrop."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kan ikke legge på."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Nummeret til talepostkassen mangler."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internett-anrop"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Tjenesten håndteres ikke."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan ikke bytte samtaler."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan ikke splitte opp samtale."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan ikke overføre."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Kan ikke opprette konferanse."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan ikke avvise anropet."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan ikke frigjøre samtale(r)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-anrop"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødanrop"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Slår på radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Utenfor dekningsområde, prøver igjen…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Anrop ikke utført. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Anrop ikke foretatt. Ring et nødnummer!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjeneste. Prøver på nytt …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan ikke ringe. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan ikke ringe. Ring et nødnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Bruk tastaturet for å ringe"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Sett samtalen på vent"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Gjenoppta samtale"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Legg til samtale"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Slå sammen samtaler"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Bytt samtaler"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Avslutt"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Talltastatur"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Slå sammen samtaler"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Bytt"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrer samtaler"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Administ. konferanse"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Administrer konferansesamtale"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Lyd"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videosamtale"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Bytt til taleanrop"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Bytt kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Sett videoen på pause"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Flere alternativer"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Tjeneste"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfigurering"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ikke angitt&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv ditt eget"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Avbryt"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"en"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"to"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fire"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fem"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seks"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"syv"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"åtte"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ni"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"stjerne"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"null"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"firkant"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ring"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"tilbaketast"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Høyttaler er aktivert."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Samtalelyd er kuttet."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send tekstmelding"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Avslå"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Svar med video"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Svar uten video"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Godta videoforespørselen"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Avslå videoforespørselen"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Dra opp for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Dra til venstre for å <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Dra til høyre for å <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Dra ned for å <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrering"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrering"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Telefonringetone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrering når det ringer"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tastetoner for tastatur"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autofullf. for talltast."</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Tastaturets autofullføring"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibrering"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer konferansesamtale"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nødnummer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ne-rNP/strings.xml b/InCallUI/res/values-ne-rNP/strings.xml
index 8ad96cf..5acaad9 100644
--- a/InCallUI/res/values-ne-rNP/strings.xml
+++ b/InCallUI/res/values-ne-rNP/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"होल्डमा"</string>
     <string name="unknown" msgid="6878797917991465859">"अज्ञात"</string>
     <string name="private_num" msgid="6713286113000232309">"निजी नम्बर"</string>
-    <string name="payphone" msgid="1931775086311769314">"फोन तिर्नुहोस्"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"लाइन व्यस्त"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"नेटवर्क व्यस्त"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"कुनै पनि जवाफ छैन, समय सकियो।"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"सर्भर पहुँचयोग्य"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"सङ्ख्या पहुँचयोग्य छैन"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"गलत प्रयोगकर्ता नाम वा पासवर्ड"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"नेटवर्कको बाहिरबाट कल भयो"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"सर्भर त्रुटि। पछि पुनःप्रयास गर्नुहोस्।"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"सङ्केत छैन"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM सीमा पार भयो"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"रेडियो बन्द"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM छैन वा SIM त्रुटि"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"मोबाइल सञ्जाल उपलब्ध छैन"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN द्वारा बहिर्गमन कल निषेधित गरिएको छ।"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"कल ब्यारिङ हुँदा तपाईं बहिर्गमन कलहरू गर्न सक्नु हुन्न।"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"पहुँच नियन्त्रणद्वारा सबै कलहरू प्रतिबन्धित छन्।"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"पहुँच नियन्त्रणद्वारा आपतकालीन कलहरू प्रतिबन्धित छन्।"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"पहुँच नियन्त्रणद्वारा सामान्य कलहरू प्रतिबन्धित छन्।"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"अमान्य सङ्ख्या"</string>
+    <string name="payphone" msgid="4793877574636445118">"पेफोन"</string>
     <string name="confCall" msgid="1904840547188336828">"सम्मेलन कल"</string>
-    <string name="call_lost" msgid="317670617901479594">"कल हराएको छ।"</string>
-    <string name="ok" msgid="3811371167865772377">"ठिक छ"</string>
+    <string name="call_lost" msgid="6183862117003999578">"कल ड्रप गरियो"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"स्पिकर"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ह्यान्डसेट इयरपिस"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"तारसहितको हेडसेट"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"सम्मेलन कल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"भ्वाइसमेल नम्बर"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"डायल गर्दै"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"पुनः प्रयास गर्दै"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"पुन: डायल गर्दै"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"सम्मेलन कल"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"आगमन कल"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"कल अन्त्य भयो"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"फोन काट्दै"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"कलमा"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"मेरो नम्बर <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> हो"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"भिडियो जडान गरिँदै"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"भिडियो कल"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"भिडियो अनुरोध"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"भिडियो कल जडान गर्न सक्दैन"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"तपाईंको कलब्याक नम्बर \n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"तपाईंको आपतकालिन कलब्याक नम्बर \n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"डायल गर्ने"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"छुटेका कल"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छुटेका कल"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"चलिरहेको कल"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"होल्डमा"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"आगमन कल"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"आगमन भिडियो कल"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"आगमन भिडियो अनुरोध"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"नयाँ भ्वाइस मेल"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नयाँ भ्वाइसमेल ( <xliff:g id="COUNT">%d</xliff:g> )"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>मा डायल गर्नुहोस्"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"अज्ञात भवाइसमेल नम्बर"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"सेवा छैन"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"चयन गरिएको नेटवर्क ( <xliff:g id="OPERATOR_NAME">%s</xliff:g> ) अनुपलब्ध"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"उत्तर दिनुहोस्"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"छुटाउनुहोस्"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"भिडियो"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"आवाज"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"स्वीकार्नुहोस्"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"खारेज गर्नुहोस्"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"फेरि कल गर्नुहोस्"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"सन्देश"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"कल राख्नका लागि, पहिले हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्कमा दर्ता भएको छैन।"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"मोबाइल नेटवर्क उपलब्ध छैन।"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"कल पठाइएन, सही नम्बर प्रविष्टि गरिएको छैन।"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"कल पठाइएन"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"सेलुलर सञ्जाल उपलब्ध छैन।"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्ट गर्नुहोस्।"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"कल गर्न सक्दैन।"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI अनुक्रम सुरु गर्दै..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"असमर्थित सेवा।"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"कलहरू स्विच गर्न असमर्थ ।"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"कल अलग गर्न असमर्थ ।"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"कल हस्तान्तरण गर्न असमर्थ"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"सम्मेलन कलहरू गर्न असमर्थ।"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"कल अस्वीकार गर्न असमर्थ।"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"कल(हरू) छुटाउन असमर्थ।"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"भ्वाइसमेल नम्बर अज्ञात छ।"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"इन्टरनेट कल"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"सेवा समर्थित छैन।"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कल स्विच गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कल अलग गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"हस्तान्तरण गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"सम्मेलन गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"कल अस्वीकार गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"कल (हरू) जारी गर्न सकिँदैन ।"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP कल"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आपतकालीन कल"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडियो खोल्दै..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"सेवा क्षेत्रभन्दा बाहिर, पुनः प्रयास गर्दै..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"कल पठाएको छैन। <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> आपतकालीन नम्बर हैन!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कल पठाएको छैन। एउटा आपतकालीन नम्बर डायल गर्नुहोस्!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"कुनै सेवा छैन। फेरि प्रयास गर्दै ..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"कल गर्न सकिँदैन। <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> आपतकालीन नम्बर होइन।"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"कल गर्न सकिँदैन। आपतकालीन नम्बर डायल गर्नुहोस्।"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल गर्न किबोर्ड प्रयोग गर्नुहोस्"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"कल होल्ड गर्नुहोस्"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"कललाई पुन: निरन्तरता दिनुहोस्"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"कल थप्नुहोस्"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"कलहरू जोड्नुहोस्"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"कलहरू स्वाप गर्नुहोस्"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड गर्नुहोस्"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"अन्त्य​ गर्नुहोस्"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"डायलप्याड"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कलहरू समायोजन  गर्नुहोस्"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"स्वाप"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"कलहरू प्रबन्ध गर्नुहोस्"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"सम्मेलन प्रबन्ध गर्नुहोस्"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"सम्मेलन कल प्रबन्ध गर्नुहोस्"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"अडियो"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"भिडियो कल"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"आवाज कल गर्न परिवर्तन"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"क्यामेरा फेर्नुहोस्"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"भिडियो स्थगित गर्नुहोस्"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"थप विकल्पहरू"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"सेवा"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"सेटअप"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"सेट गरेको छैन"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"आफ्नै लेख्नुहोस्..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"रद्द गर्नुहोस्"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"पठाउनुहोस्"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"एक"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"दुई"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"तिन"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"चार"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"पाँच"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"छ"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"सात"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"आठ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"नौ"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"तारा चिन्ह"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"शून्य"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"पाउन्ड"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"डायल"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"ब्याकस्पेस"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्पिकरफोन सक्षम भयो।"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"कल म्युट भयो।"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS पठाउनुहोस्"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार गर्नुहोस्"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"भिडियो कल रूपमा जवाफ दिनुहोस्"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"अडियो कलको रूपमा जवाफ दिनुहोस्"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"भिडियो अनुरोध स्वीकार गर्नुहोस्"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"भिडियो अनुरोध अस्वीकार गर्नुहोस्"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> को लागि माथि सार्नुहोस्।"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>को लागि बायाँ सार्नुहोस्।"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>को लागि दायाँ सार्नुहोस्।"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> को लागि तल सार्नुहोस्।"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"भाइब्रेट"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"भाइब्रेट"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"आवाज:"</string>
     <string name="default_notification_description" msgid="78174796906240970">"पूर्वनिर्धारित ध्वनि ( <xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g> )"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"फोन रिङटोन"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"घन्टी बज्दा भाइब्रेट"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"प्याड स्पर्श टोनहरू डायल गर्नुहोस्"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"डायल प्याड स्वतःपूर्ण"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"डायलप्याड स्वतःपूर्णता"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिङ्गटोन र भाइब्रेट"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"सम्मेलन कल प्रबन्ध गर्नुहोस्"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"आपतकालीन नम्बर"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"०"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"१"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"२"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"३"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"४"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"५"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"६"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"७"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"८"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"९"</string>
 </resources>
diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index 9e3bccd..9b32a03 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"In de wacht"</string>
     <string name="unknown" msgid="6878797917991465859">"Onbekend"</string>
     <string name="private_num" msgid="6713286113000232309">"Privénummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Betaaltelefoon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Lijn is bezet"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Netwerk bezet"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Geen reactie, time-out"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server niet bereikbaar"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummer niet bereikbaar"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Ongeldige gebruikersnaam of wachtwoord"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Gebeld van buiten het netwerk"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Fout met server. Probeer het later opnieuw."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Geen kiestoon"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-limiet overschreden"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio uit"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Geen simkaart of fout met simkaart"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobiel netwerk niet beschikbaar"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Uitgaande oproepen worden beperkt door FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Uitgaande oproepen zijn niet mogelijk als de functie voor oproepen blokkeren is ingeschakeld."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle oproepen worden beperkt door toegangsbeheer."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Noodoproepen worden beperkt door toegangsbeheer."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normale oproepen worden beperkt door toegangsbeheer."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ongeldig getal"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefooncel"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonische vergadering"</string>
-    <string name="call_lost" msgid="317670617901479594">"De verbinding is verbroken."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Oproep beëindigd"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Luidspreker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Oortelefoon van handset"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Bedrade headset"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonische vergadering <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Kiezen"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Opnieuw proberen"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Opnieuw bellen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonische vergadering"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Inkomende oproep"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Oproep beëindigd"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ophangen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Actieve oproep"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mijn nummer is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Verbinding maken met video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videogesprek"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Video aanvragen"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Kan geen videogesprek starten"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Uw terugbelnummer\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Uw terugbelnummer bij alarm\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Kiezen"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepen"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Actieve oproep"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"In de wacht"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Binnenkomend videogesprek"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Binnenkomend videoverzoek"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nieuwe voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nieuwe voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> bellen"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemailnummer onbekend"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Geen service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Geselecteerd netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) niet beschikbaar"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Beantwoorden"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Ophangen"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"InStream-video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Spraak"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Accepteren"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Sluiten"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Terugbellen"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Bericht"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Als u wilt bellen, moet u eerst de Vliegmodus uitschakelen."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Niet geregistreerd op netwerk."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiel netwerk niet beschikbaar."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Oproep niet verzonden, geen geldig nummer ingevoerd."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Oproep niet verzonden."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobiel netwerk niet beschikbaar."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Als u wilt bellen, moet u een geldig nummer invoeren."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan niet bellen."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-reeks starten..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Niet-ondersteunde service."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kan niet overschakelen tussen oproepen."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kan oproep niet scheiden."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Kan oproep niet doorschakelen."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Telefonische vergaderingen niet mogelijk."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kan oproep niet weigeren."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kan oproepen niet vrijgeven."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Voicemailnummer onbekend"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetoproep"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service wordt niet ondersteund."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan niet overschakelen tussen oproepen."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan oproep niet scheiden."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan niet doorschakelen."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Telefonische vergadering niet mogelijk."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan oproep niet weigeren."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan oproep(en) niet vrijgeven."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-oproep"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio aanzetten..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Buiten servicegebied, nieuwe poging..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Oproep niet verzonden. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is geen alarmnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Oproep niet verzonden. Kies een alarmnummer!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen bereik. Opnieuw proberen…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan niet bellen. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is geen alarmnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan niet bellen. Bel een alarmnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Toetsen gebruiken om te bellen"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Gesprek in de wacht zetten"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Gesprek hervatten"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Oproep toevoegen"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Oproepen samenvoegen"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Oproepen wisselen"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In de wacht"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Beëindigen"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Toetsenblok"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Oproepen samenvoegen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wisselen"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gesprekken beheren"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Conferentie beheren"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Telefonische vergadering beheren"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videogesp."</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Wijzigen in spraakoproep"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Camera wijzigen"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Video onderbreken"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Meer opties"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Instelling"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Niet ingesteld&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Eigen reactie opstellen..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuleren"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Verzenden"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"één"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"twee"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"drie"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"vier"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"vijf"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"zes"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"zeven"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"acht"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"negen"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ster"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nul"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"hekje"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"bellen"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Telefoonluidspreker is ingeschakeld."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep gedempt."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Sms verzenden"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Weigeren"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Beantwoorden als videogesprek"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Beantwoorden als audiogesprek"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Videoverzoek accepteren"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Videoverzoek weigeren"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Veeg omhoog voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Veeg naar links voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Veeg naar rechts voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Veeg omlaag voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Trillen"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Trillen"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Geluid"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Standaardgeluid (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Beltoon telefoon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Trillen bij bellen"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"DTMF-tonen kiestoetsen"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autom. aanvul. voor toetsenblok"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Toetsenblok automatisch aanvullen"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Beltoon en trillen"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonische vergadering beheren"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Alarmnummer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index 2477509..8f0835b 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Oczekujące"</string>
     <string name="unknown" msgid="6878797917991465859">"Nieznany"</string>
     <string name="private_num" msgid="6713286113000232309">"Numer prywatny"</string>
-    <string name="payphone" msgid="1931775086311769314">"Płatny telefon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linia jest zajęta"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Sieć zajęta"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Brak odpowiedzi, przekroczono limit czasu"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serwer nieosiągalny"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numer nieosiągalny"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nieprawidłowa nazwa użytkownika lub hasło"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Połączenie spoza sieci"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Błąd serwera. Spróbuj ponownie później."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Brak sygnału"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Przekroczono limit ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Sieci bezprzewodowe są wyłączone"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Brak lub błąd karty SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Sieć komórkowa niedostępna"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Połączenia są ograniczone do listy ustalonych numerów."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Nie można wykonywać połączeń wychodzących, gdy włączona jest blokada dzwonienia."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Wszystkie połączenia są zablokowane przez funkcję kontroli dostępu."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Połączenia alarmowe są zablokowane przez funkcję kontroli dostępu."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Zwykłe połączenia są zablokowane przez funkcję kontroli dostępu."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nieprawidłowy numer"</string>
+    <string name="payphone" msgid="4793877574636445118">"Automat telefoniczny"</string>
     <string name="confCall" msgid="1904840547188336828">"Poł. konferencyjne"</string>
-    <string name="call_lost" msgid="317670617901479594">"Połączenie zostało zerwane."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Połączenie przerwane"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Głośnik"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Słuchawka telefonu"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Przewodowy zestaw słuch."</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Poł. konferencyjne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numer poczty głosowej"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Wybieranie"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Ponawianie próby"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Ponowne wybieranie numeru"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Poł. konferencyjne"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Połączenie"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Połączenie zakończone"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Trwa rozłączanie"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Trwa połączenie"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mój numer to <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Rozpoczynanie rozmowy wideo"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Rozmowa wideo"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Wysyłanie żądania wideo"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Nie można nawiązać połączenia wideo"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Twój numer oddzwaniania\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Twój numer oddzwaniania dla połączeń alarmowych\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Trwa wybieranie numeru"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Nieodebrane połączenie"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Połączenia nieodebrane"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Trwa połączenie"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Oczekujące"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Połączenie przychodzące"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Przychodząca rozmowa wideo"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Przychodzące żądanie wideo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nowa poczta głosowa"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nowa poczta głosowa (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Zadzwoń do <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nieznany numer poczty głosowej"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Brak usługi"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Wybrana sieć (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) jest niedostępna"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Odbierz"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Rozłącz"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Rozmowa wideo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Głos"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Zaakceptuj"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Odrzuć"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Oddzwoń"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Wiadomość"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Aby rozpocząć połączenie, wyłącz najpierw tryb samolotowy"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nie zarejestrowano w sieci"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Sieć komórkowa jest niedostępna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Połączenie niezrealizowane, nie wprowadzono poprawnego numeru."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Połączenie nie zostało zrealizowane."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Sieć komórkowa jest niedostępna."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Aby zadzwonić, wybierz prawidłowy numer."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nie można dzwonić."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Rozpoczynanie sekwencji MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nieobsługiwana usługa."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nie można przełączyć rozmów."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nie można rozdzielić połączenia."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nie można przekazać połączenia."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nie można prowadzić rozmów konferencyjnych."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nie można odrzucić połączenia."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nie można zakończyć połączenia (połączeń)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Nieznany numer poczty głosowej."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Połączenie przez internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Usługa nie jest obsługiwana."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nie można przełączyć połączeń."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nie można rozdzielić połączenia."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nie można przekazać."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Nie można nawiązać połączenia konferencyjnego."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nie można odrzucić połączenia."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nie można zwolnić połączeń."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Połączenie SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Połączenie alarmowe"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Trwa włączanie sieci bezprzewodowych..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Obszar nieobsługiwany, ponowna próba..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Połączenie niezrealizowane. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie jest numerem alarmowym!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Połączenie niezrealizowane. Wybierz numer alarmowy!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Brak sieci. Próbuję ponownie…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nie można dzwonić. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie jest numerem alarmowym."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nie można dzwonić. Wybierz numer alarmowy."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Aby zadzwonić, użyj klawiatury."</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Wstrzymaj połączenie"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Wznów połączenie"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Dodaj połączenie"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Scal połączenia"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Przełącz"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Wstrzymaj"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Zakończ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Klawiatura"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Scal połączenia"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Przełącz"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Zarządzaj połączeniami"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Zarządzaj konferencją"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Zarządzaj poł. konf."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Dźwięk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Rozmowa wideo"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Zmień na połączenie głosowe"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Przełącz aparat"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Wstrzymaj film"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Więcej opcji"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Usługa"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfiguracja"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nie ustawiono&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napisz własną..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Anuluj"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Wyślij"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jeden"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dwa"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trzy"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"cztery"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pięć"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sześć"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"siedem"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osiem"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"dziewięć"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"gwiazdka"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"znak funta"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"wybierz numer"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"cofnij"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Głośnik włączony."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Połączenie wyciszone."</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Odpowiedz"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Odbierz"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Wyślij SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odrzuć"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Odbierz jako rozmowę wideo"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Odbierz jako rozmowę audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Przyjmij połączenie wideo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odrzuć połączenie wideo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Przesuń w górę: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Przesuń w lewo: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Przesuń w prawo: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Przesuń w dół: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Wibracje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Wibracje"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Dźwięk"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Domyślny dźwięk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Dzwonek telefonu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Wibracje i dzwonek"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dźwięki wybierania numeru"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autouzupełnianie klawiatury"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autouzupełnianie na klawiaturze"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Dzwonek i wibracje"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Zarządzaj połączeniem konferencyjnym"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Numer alarmowy"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index d6a9558..7821436 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Em espera"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconhecido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número particular"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefone público"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linha ocupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rede ocupada"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Sem resposta, tempo limite excedido"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servidor inacessível"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Número incontactável"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nome de utilizador ou palavra-passe incorretos"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chamada efetuada de fora da rede"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Erro do servidor. Tente novamente mais tarde."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Sem sinal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite de ACM excedido"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio desativado"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Sem cartão SIM ou erro do cartão"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Rede móvel não disponível"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"As chamadas efectuadas são restringidas por FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Não é possível efetuar chamadas com o barramento de chamadas ativado."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas as chamadas são restringidas por controlo de acesso."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"As chamadas de emergência são restringidas por controlo de acesso."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"As chamadas normais são restringidas por controlo de acesso."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número inválido"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefone público"</string>
     <string name="confCall" msgid="1904840547188336828">"Chamada de conferência"</string>
-    <string name="call_lost" msgid="317670617901479594">"A chamada perdeu-se."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"A chamada caiu"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altifalante"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricular do aparelho"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auscultadores com fios"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Chamada de conferência <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número do correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"A marcar"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Tentar novamente"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"A marcar novamente"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Chamada de conferência"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Chamada recebida"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chamada terminada"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"A desligar"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"A chamar"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"O meu número é <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"A ligar vídeo"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videochamada"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"A solicitar vídeo"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Não é possível ligar a videochamada"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"O seu número de retorno de chamada\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"O seu número de retorno de chamadas de emergência\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"A marcar"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada não atendida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas não atendidas"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada em curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Em espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Chamada recebida"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"A receber videochamada"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Pedido de vídeo recebido"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correio de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novo correio de voz (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número do correio de voz desconhecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nenhum serviço"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) indisponível"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Atender"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Desligar"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vídeo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voz"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Aceitar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ignorar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ligar de volta"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensagem"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para efectuar uma chamada, desactive primeiro o modo para Avião."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Sem registo na rede."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rede móvel não disponível."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"A chamada não foi efetuada. Não foi introduzido um número válido."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Chamada não efetuada."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rede móvel não disponível."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para telefonar, introduza um número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Não é possível telefonar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"A iniciar sequência de MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Serviço não suportado"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Não é possível alternar entre chamadas"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Não foi possível separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Não é possível transferir a chamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Não é possível efectuar chamadas de conferência."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Não é possível efectuar chamada(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Número do correio de voz desconhecido."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chamada por internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Serviço não suportado."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Não é possível alternar chamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Não é possível separar a chamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Não é possível transferir."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Não é possível efetuar uma conferência."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Não é possível rejeitar a chamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Não é possível libertar a(s) chamada(s)."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Chamada SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emergência"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"A ligar o rádio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fora da área do serviço, a tentar novamente..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"A chamada não foi efetuada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chamada não efetuada. Marque um número de emergência!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sem serviço. A tentar novamente…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Não é possível telefonar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Não é possível telefonar. Marque um número de emergência."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar o teclado para marcar"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Colocar a chamada em espera"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Retomar a chamada"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Adicionar chamada"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Intercalar chamadas"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Alternar entre chamadas"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Suspender"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado de marcação"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Intercalar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gerir chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gerir conferência"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gerir chamada de conferência"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Áudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochamada"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mudar para chamada de voz"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Mudar de câmara"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Interromper vídeo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Mais opções"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Serviço"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuração"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Não definido&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escrever a sua própria..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"um"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dois"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"três"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"oito"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"estrela"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"cardinal"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retrocesso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Alta voz ativada."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem som."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atender"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Responder como videochamada"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Responder como chamada de áudio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceitar o pedido de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Recusar o pedido de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Deslize lentamente para cima para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Deslize lentamente para a esquerda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Deslize lentamente para a direita para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Deslize lentamente para baixo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Som"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Som predefinido (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Toque do telemóvel"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar ao tocar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sons dos toques no teclado"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Preenchimento automático do teclado"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Preenchimento aut. do teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tocar e Vibrar"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gerir chamada de conferência"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergência"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml
index 83d5610..df32188 100644
--- a/InCallUI/res/values-pt/strings.xml
+++ b/InCallUI/res/values-pt/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Em espera"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconhecido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Orelhão"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linha ocupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rede ocupada"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Nenhuma resposta, tempo limite expirou"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servidor não acessível"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Número não acessível"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nome de usuário ou senha incorretos"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chamou de fora da rede"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Erro no servidor. Tente mais tarde."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Sem sinal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite de ACM excedido"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio desativado"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Sem SIM ou erro de SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Rede móvel não disponível"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"As chamadas enviadas são restringidas pelo FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Você não pode fazer chamadas enquanto o bloqueio de chamadas estiver ativado."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas as chamada são restringidas pelo controle de acesso."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"As chamadas de emergência são restringidas pelo controle de acesso."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"As chamadas normais são restringidas pelo controle de acesso."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número inválido"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefone público"</string>
     <string name="confCall" msgid="1904840547188336828">"Conferência telefônica"</string>
-    <string name="call_lost" msgid="317670617901479594">"A chamada foi perdida."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"A chamada caiu."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Alto-falante"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Minifone do aparelho"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Fone de ouvido com fio"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferência telefônica <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Discando"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Tentando novamente"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Rediscando"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conferência telefônica"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Recebendo chamada"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chamada encerrada"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Desligando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Em chamada"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Meu número é <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Conectando vídeo"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Vídeo chamada"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Solicitando vídeo"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Não é possível conectar a vídeo chamada"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Seu número de retorno de chamada\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Seu número de retorno de chamada de emergência\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Discando"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada em andamento"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Em espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Recebendo chamada"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Recebendo vídeo chamada"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Recebendo solicitação de vídeo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correio de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novo correio de voz (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Discar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número correio de voz desconhecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sem serviço"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"A rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) não está disponível"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Responder"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Desligar"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Vídeo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voz"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Aceitar"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Dispensar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Retornar chamada"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensagem"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para fazer uma chamada, primeiro desative o modo avião."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Não registrado na rede."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rede móvel não disponível."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Chamada não completada, o número inserido é inválido."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Chamada não completada."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rede celular não disponível."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar uma chamada, digite um número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Não é possível realizar chamadas."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando sequência MMI…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Serviço não suportado."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Não é possível alternar chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Não é possível separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Não é possível transferir a chamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Não é possível realizar conferências telefônicas."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Não é possível liberar a(s) chamada(s)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Número de correio de voz desconhecido."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chamada pela internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Serviço não suportado."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Não é possível alternar as chamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Não é possível separar a chamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Não é possível transferir a chamada."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Não é possível fazer uma conferência."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Não é possível rejeitar a chamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Não é possível liberar chamadas."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Chamada SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emergência"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ativando o rádio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fora de serviço, tentando novamente..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Chamada não enviada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chamada não enviada. Disque um número de emergência!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sem serviço. Tentando novamente..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Não é possível realizar chamadas. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Não é possível realizar chamadas. Disque um número de emergência."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use o teclado para discar"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Colocar chamada em espera"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Retomar chamada"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Adicionar chamada"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Mesclar chamadas"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Trocar chamadas"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Em espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Mesclar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gerenciar chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gerenciar conferência"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gerenciar teleconferência"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Áudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Vídeo ch."</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Alterar para chamada de voz"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Alternar câmera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pausar vídeo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Mais opções"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Serviço"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuração"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Não definido&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escreva sua resposta..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"um"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dois"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"três"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"oito"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"marcar com uma estrela"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"discar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Viva-voz ativado."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem áudio."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Atender como vídeo chamada"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Atender como chamada de áudio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Aceitar solicitação de vídeo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Recusar solicitação de vídeo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para cima."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para a esquerda."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para a direita."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>, deslize para baixo."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Som"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Som padrão (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Toque do telefone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar quando estiver tocando"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tons de toque teclado numérico"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autopreenchimento do teclado"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Preench. automático do teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gerenciar conferência telefônica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Número de emergência"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index 9d13e02..2051626 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"În aşteptare"</string>
     <string name="unknown" msgid="6878797917991465859">"Necunoscut"</string>
     <string name="private_num" msgid="6713286113000232309">"Număr privat"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefon public"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linie ocupată"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Reţea ocupată"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Fără răspuns, durata a expirat"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server neaccesibil"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numărul nu poate fi contactat"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nume de utilizator sau parolă incorecte"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Apelat din afara reţelei"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Eroare de server. Încercaţi din nou mai târziu."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Niciun semnal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limită ACM depăşită"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio oprit"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Nu există SIM sau eroare de SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Rețeaua mobilă nu este disponibilă"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Apelurile trimise sunt restricţionate de FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Nu puteţi efectua apeluri de ieşire în timp ce blocarea apelurilor este activă."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Toate apelurile sunt restricţionate de controlul de acces."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Apelurile de urgenţă sunt restricţionate de controlul de acces."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Apelurile normale sunt restricţionate de controlul de acces."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Număr nevalid"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefon public"</string>
     <string name="confCall" msgid="1904840547188336828">"Teleconferinţă"</string>
-    <string name="call_lost" msgid="317670617901479594">"Apelul s-a pierdut."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Apelul s-a încheiat"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Difuzor"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Casca dispozitivului"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Cască cu fir"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Teleconferinţă <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Număr mesagerie vocală"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Apelează"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Se încearcă din nou"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Se reapelează"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Teleconferinţă"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Apel de intrare"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Apel încheiat"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Se închide telefonul"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"În timpul apelului"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Numărul meu este <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Se conectează video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Apel video"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Se solicită video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Nu se poate conecta apelul video"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Numărul de apelare inversă\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Numărul de apelare inversă de urgență\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Apelează"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Apel nepreluat"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Apeluri nepreluate"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Apel în desfăşurare"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"În aşteptare"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Apel de intrare"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Apel video primit"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Solicitare de trecere la apel video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mesaj vocal nou"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Mesaj vocal nou (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Apelaţi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Apelați <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Număr mesagerie vocală necunoscut"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Fără serviciu"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Reţeaua selectată (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nu este disponibilă"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Răspundeți"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Încheiaţi apelul"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Videoclip"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Voce"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Acceptați"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Renunțați"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Sunaţi înapoi"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Pentru a efectua un apel, mai întâi dezactivaţi modul Avion."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Neînregistrat în reţea."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Reţeaua mobilă nu este disponibilă."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Apelul nu s-a trimis; niciun număr valid introdus."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Apelul nu a fost trimis."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rețeaua mobilă nu este disponibilă"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pentru a apela, introduceți un număr valid."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nu se poate apela."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Se porneşte secvenţa MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Serviciu neacceptat."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Apelurile nu pot fi comutate."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Apelul nu poate fi separat."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Apelul nu poate fi transferat."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Teleconferinţa nu se poate efectua."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Apelul nu poate fi respins."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Apelul (apelurile) nu poate (pot) fi eliberat (eliberate)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Număr de mesagerie vocală necunoscut."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Apel prin internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Serviciul nu este acceptat."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Apelurile nu pot fi comutate."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Apelul nu poate fi separat."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nu se poate transfera."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Conferința telefonică nu poate fi inițiată."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Apelul nu poate fi respins."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Apelurile nu pot fi eliberate."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"apel SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Apel de urgenţă"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Se activează semnalul radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"În afara ariei de serviciu. Se încearcă din nou..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Apelul nu s-a trimis. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nu este un număr de urgenţă!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Apelul nu s-a trimis. Apelaţi un număr de urgenţă!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Fără semnal. Se încearcă din nou..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nu se poate apela. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nu este un număr de urgență."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nu se poate apela. Formați un număr de urgență."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizaţi tastatura pentru a forma"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Puneți apelul în așteptare"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Reluați apelul"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Adăugaţi un apel"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Îmbinaţi apelurile"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Schimbaţi apelurile"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Reţineţi"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminat"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastatură numerică"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Îmbinaţi apelurile"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Schimbaţi"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestionaţi apelurile"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestion. conferinţa"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gestionați teleconferința"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Apel video"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Treceți la apel vocal"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Comutați camera foto"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Întrerupeți videoclipul"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Mai multe opțiuni"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servicii"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configurare"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nesetat&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Scrieți propriul răspuns…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Anulați"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Trimiteți"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"unu"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"doi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trei"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"patru"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinci"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"şase"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"şapte"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"opt"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nouă"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"stea"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"diez"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"apelare"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Difuzor activat."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Apel cu sunet dezactivat."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Răspundeţi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteţi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Răspundeți ca apel video"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Răspundeți ca apel audio"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acceptați solicitarea de a trece la apel video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Refuzați solicitarea de a trece la apel video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Glisați în sus pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Glisați spre stânga pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Glisați spre dreapta pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Glisați în jos pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibraţii"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sunet"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sunet prestabilit (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ton de sonerie telefon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrează când sună"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonuri la atingerea pt. apelare"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Completare automată tastatură numerică"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Complet. autom. tastatură num."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de sonerie și vibrare"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestionaţi teleconferinţa"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Număr de urgență"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index 02420a5..e0e0724 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Ждет ответа"</string>
     <string name="unknown" msgid="6878797917991465859">"Неизвестный абонент"</string>
     <string name="private_num" msgid="6713286113000232309">"Скрытый номер"</string>
-    <string name="payphone" msgid="1931775086311769314">"Телефон-автомат"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Линия занята"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Сеть занята"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Нет ответа, время ожидания истекло"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер недоступен"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Номер недоступен"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неверное имя пользователя или пароль"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Вызов из другой сети"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Ошибка сервера. Повторите попытку позже."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Нет сигнала"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Превышен лимит ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Радио выключено"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ошибка SIM-карты или SIM-карта не установлена"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Мобильная сеть недоступна"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Вы можете позвонить только на телефоны из списка разрешенных номеров."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Исходящие звонки невозможны, если включен запрет вызовов."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Все вызовы запрещены настройками доступа."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Экстренные вызовы запрещены настройками доступа."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Обычные вызовы запрещены настройками доступа."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Неверный номер"</string>
+    <string name="payphone" msgid="4793877574636445118">"Телефон-автомат"</string>
     <string name="confCall" msgid="1904840547188336828">"Конференц-вызов"</string>
-    <string name="call_lost" msgid="317670617901479594">"Вызов был утрачен."</string>
-    <string name="ok" msgid="3811371167865772377">"ОК"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Звонок сброшен"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Динамик"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Динамик гарнитуры"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Проводная гарнитура"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-вызов: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голосовой почты"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набор номера"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Повторная попытка"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Повторный набор"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конференц-вызов"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Входящий вызов"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Вызов завершен"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Завершение разговора"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Поступающий вызов"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Мой номер: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Подключение видео"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Видеовстреча"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Запрос видео"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Не удалось совершить видеовызов"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Номер обратного вызова:\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Номер обратного вызова для экстренных служб:\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Набор номера"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропущенный вызов"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущенные вызовы"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущий вызов"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"На удержании"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Входящий вызов"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Входящий видеовызов"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Входящий видеовызов"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Новое сообщение голосовой почты"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Новое сообщение голосовой почты (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Набор <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Позвонить <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Номер голосовой почты неизвестен"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Сеть не найдена"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Выбранная сеть (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна."</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Ответить"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Завершить разговор"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Голосовой вызов"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Принять"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Закрыть"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Позвонить"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Написать"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Перед тем как звонить, отключите режим полета."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Нет регистрации в сети."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобильная сеть недоступна."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Вызов не осуществляется, действительный номер телефона не указан."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Вызов не осуществляется."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Мобильная сеть недоступна."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Недействительный номер."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не удалось позвонить."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Запуск последовательности MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Услуга не поддерживается."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Не удается переключить вызовы."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Не удалось разделить вызов."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Не удалось перевести вызов."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Не удается создать конференц-вызов."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Невозможно отклонить вызов."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Не удается разъединить абонентов."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Неизвестный номер голосовой почты."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Интернет-вызов"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Сервис не поддерживается."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не удалось переключить вызов."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не удалось разделить вызов."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не удалось перенести."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Не удалось выполнить конференц-вызов."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Не удалось отклонить вызов."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Не удалось разъединить."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Вызов SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Экстренный вызов"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Включение радио…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Вне зоны действия сети, повторное подключение..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Вызов не выполнен. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> – не номер экстренной службы."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Вызов не выполнен. Наберите номер."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нет сигнала. Повторная попытка…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Не удалось позвонить. Номер <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не принадлежит экстренным службам."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не удалось позвонить. Наберите номер экстренных служб."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Используйте клавиатуру для набора номера"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Поставить на удержание"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Возобновить вызов"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Добавить вызов"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Объединить вызовы"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Другой вызов"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Удерживать"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Завершить"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Кнопки"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Соединить"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Перевод звонка"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управление вызовами"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Управление конференцией"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Управление конференц-связью"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Телефонный звонок"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Переключение камеры"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Приостановить видео"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Ещё"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Служба"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Настройка"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не задано&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Ваш ответ…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Отмена"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Отправить"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"один"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"три"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"четыре"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"пять"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"шесть"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"семь"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"восемь"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"девять"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"звездочка"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"ноль"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"решетка"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"набор номера"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"возврат"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Громкая связь включена."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук выключен."</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Правильный вариант"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Ответить"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Отправить SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Отклонить"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Ответить с видео"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Ответить на голосовой вызов"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Ответить на видеовызов"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Отклонить видеовызов"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Проведите вверх, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Проведите влево, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Проведите вправо, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Проведите вниз, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибросигнал"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="default_notification_description" msgid="78174796906240970">"По умолчанию (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Рингтон"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибросигнал и рингтон"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Звук клавиш"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Автозаполнение номера"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Автозаполнение номера"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон и вибросигнал"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управление конференц-связью"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Экстренная служба"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-si-rLK/strings.xml b/InCallUI/res/values-si-rLK/strings.xml
index bf700e5..e440b7c 100644
--- a/InCallUI/res/values-si-rLK/strings.xml
+++ b/InCallUI/res/values-si-rLK/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"රඳවා ගනිමින්"</string>
     <string name="unknown" msgid="6878797917991465859">"නොදනී"</string>
     <string name="private_num" msgid="6713286113000232309">"පුද්ගලික අංකය"</string>
-    <string name="payphone" msgid="1931775086311769314">"ගෙවුම් දුරකථනය"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"ඇමතුම කාර්ය බහුලයි"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"ජාලය කාර්ය බහුලයි"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ප්‍රතිචාරයක් නැත, කල් ඉකුත්ව ඇත"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"සේවාදායකය ළඟා විය නොහැක"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"අංකය ළඟා විය නොහැක"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"වැරදි පරිශීලක නාමයක් හෝ මුරපදයකි"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"අමතන ලද්දේ ජාලයෙන් පිටිනි"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"සේවාදායකයේ දෝෂයක්. පසුව නැවත උත්සාහ කරන්න."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"සංඥාවක් නැත"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM සීමාව ඉක්මවන ලදි"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"රේඩියෝව අක්‍රියයි"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM නැත හෝ SIM දෝෂයක්"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"ජංගම ජාලය නොමැත"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN මඟින් පිටතට යන ඇමතුම් නවත්වා ඇත."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"ඇමතුම් අත්හිටුවීමක් ඇතිවිට ඔබට පිටතට ඇමතුම් ගත නොහැක."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ප්‍රවේශ පාලකය මඟින් සියලුම ඇමතුම් අත්හිටුවා ඇත."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"ප්‍රවේශ පාලකය මඟින් හදිසි ඇමතුම් අත්හිටුවා ඇත."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ප්‍රවේශ පාලකය මඟින් සාමාන්‍ය ඇමතුම් අත්හිටුවා ඇත."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"අවලංගු අංකය"</string>
+    <string name="payphone" msgid="4793877574636445118">"පේෆෝනය"</string>
     <string name="confCall" msgid="1904840547188336828">"සම්මන්ත්‍රණ ඇමතුම"</string>
-    <string name="call_lost" msgid="317670617901479594">"ඇමතුම බිදවැටුණි."</string>
-    <string name="ok" msgid="3811371167865772377">"හරි"</string>
+    <string name="call_lost" msgid="6183862117003999578">"ඇමතුම නැවතුණි"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"නාදකය"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"හෑන්ඩ්සෙටයේ සවන් කඬ"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"රැහැන් සහිත හෙඩ්සෙටය"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"සම්මන්ත්‍රණ ඇමතුම <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"හඬ තැපැල් අංකය"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"අමතමින්"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"යළි උත්සාහ කරමින්"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"නැවත අංකනය කරමින්"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"සම්මන්ත්‍රණ ඇමතුම"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"එන ඇමතුම"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"ඇමතුම අවසන් විය"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"විසන්ධි කරමින්"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"ඇමතුමක"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"මගේ අංකය <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"වීඩියෝවකට සම්බන්ධ කරමින්"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"වීඩියෝ ඇමතුම"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"වීඩියෝවක් ඉල්ලමින්"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"වීඩියෝ ඇමතුම සම්බන්ධ කළ නොහැක"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"ඔබට ආපසු කථා කිරීමේ අංකය\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"ඔබගේ හදිසි ඇමතුම් අංකය\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"අමතමින්"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"මඟ හැරුණු ඇමතුම"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"මඟ හැරුණු ඇමතුම්"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"කරගෙනය යන ඇමතුම"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"රඳවා ගනිමින්"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"එන ඇමතුම"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"පැමිණෙන වීඩියෝ ඇමතුම"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"පැමිණෙන වීඩියෝ ඉල්ලීම"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"නව හඬතැපෑල"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"නව හඬ තැපැල් (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> අමතන්න"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"හඬතැපැල් අංකය නොදනී"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"සේවාව නැත"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"තෝරා ඇති ජාලය (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) නොමැත"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"පිළිතුරු දෙන්න"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"විසන්ධි කරන්න"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"වීඩියෝව"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"හඬ"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"පිළිගන්න"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ඉවත ලන්න"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"නැවත අමතන්න"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"පණිවිඩය"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ඇමතුමක් ගැනීමට, මුලින්ම ගුවන්යානා ආකාරය අක්‍රිය කරන්න."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ජාලය මත ලියාපදිංචි වී නැත."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"ජංගම ජාලය නොමැත."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ඇමතුම නොයැවිණි, වලංගු අංකයක් ඇතුලත් කර නැත."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"ඇමතුම නොයැවිණි."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"සෙලියුලර් ජාලය නොමැත"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ඇමතුමක් ලබාගැනීමට, වලංගු අංකයක් ලබාගන්න."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ඇමතුම් ගැනීමට නොහැක."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI අනුපිළිවෙල ආරම්භ කරමින්…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"සහාය නොදක්වන සේවාව."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"ඇමතුම මාරු කිරීමට නොහැකි විය."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"ඇමතුම වෙන් කිරීමට නොහැකි විය."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"ඇමතුම මාරු කිරීමට අපොහොසත් විය."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"සම්මන්ත්‍රණ ඇමතුම් ලබාගත නොහැකි විය."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"ඇමතුම ප්‍රතික්ෂේප කළ නොහැකි විය."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"ඇමතුම(ම්) නිදහස් කිරීමට නොහැකි විය."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"හඬ තැපැල් අංකය නොදනී."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"අන්තර්ජාල ඇමතුම"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"සේවාව සහාය ලබාදෙන්නේ නැත."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ඇමතුම් මාරු කිරීම කළ නොහැක."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ඇමතුම වෙන් කිරීම කළ නොහැක."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"මාරු කිරීමට නොහැක."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"සාකච්ඡාව කළ නොහැක."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ඇමතුම ප්‍රතික්ෂේප කළ නොහැක."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ඇමතුම(ම්) මුදාහැරීම කළ නොහැක."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP ඇමතුම"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"හදිසි ඇමතුම"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"රේඩියෝව ආරම්භ කරමින්…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"සේවා රහිත ප්‍රදේශය, යළි උත්සාහ කරමින්..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"ඇමතුම නොයැවිණි, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> හදිසි අංකයක් නොවේ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ඇමතුම නොයැවිණි, හදිසි අංකයක් අමතන්න!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"සේවා නැත. නැවත උත්සාහ කරන්න…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ඇමතුම් ලබාගැනීම කළ නොහැක. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> මෙය හදිස්සි ඇමතුම් අංකයක් නොවේ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ඇමතිය නොහැක. හදිසි අංකයක් අමතන්න."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ඇමතීමට කිරීමට යතුරු පුවරුව භාවිතා කරන්න"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ඇමතුම නවතා සිටින්න"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ඇමතුම නැවත පටන්ගන්න"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ඇමතුමක් එක් කරන්න"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ඇමතුම් එකට මුසු කරන්න"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ඇමතුම් මාරු කරන්න"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"රඳවා සිටින්න"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"අවසානයි"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ඇමතුම් පෑඩය"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ඇමතුම් එකට මුසු කරන්න"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"මාරු කරන්න"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"ඇමතුම් කළමනාකරණය කරන්න"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"සම්මන්ත්‍රණය කළමනාකරණය කරන්න"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"සම්මන්ත්‍රණ ඇමතුම කළමනාකරණය කරන්න"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ශ්‍රව්‍ය"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"වීඩියෝ ඇමතුම"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"හඬ ඇමතුමක් වෙත මාරු කරන ලදි"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"කැමරාව මාරු කරන්න"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"විඩියෝව විරාම කරන්න"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"තවත් විකල්ප"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"සේවාව"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"ස්ථාපනය කරන්න"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;පිහිටුවා නැත&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"ඔබෙම එකක් ලියන්න..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"අවලංගු කරන්න"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"යවන්න"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"එක"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"දෙක"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"තුනයි"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"හතර"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"පහ"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"හය"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"හත"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"අට"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"නවය"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"තරුව"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"බිංදුවයි"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"පවුම"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"අමතන්න"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"ආපසුයවන යතුර"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ස්පිකර්ෆෝන් සබලයි."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ඇමතුම නිශ්ශබ්දයි."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"පිළිතුරු දෙන්න"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS යවන්න"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ප්‍රතික්ෂේප කරන්න"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"වීඩියෝ ඇමතුමට පිළිතුරු දෙන්න"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ශ්‍රව්‍ය ඇමතුමට පිළිතුරු දෙන්න"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"වීඩියෝ ඉල්ලීම පිළිගනියි"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"වීඩියෝ ඉල්ලීම ප්‍රතික්ෂේප කරයි"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා උඩට සර්පණය කරන්න."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා වමට සර්පණය කරන්න."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා දකුණට සර්පණය කරන්න."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> සඳහා පහළට සර්පණය කරන්න."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"කම්පනය වීම"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"කම්පනය වීම"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ශබ්දය"</string>
     <string name="default_notification_description" msgid="78174796906240970">"සුපුරුදු ශබ්දය (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"දුරකථන රිංටෝනය"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"රිංග් වන විට කම්පනයවේ"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ඇමතුම් පෑඩයේ ස්පර්ශ නාද"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ඩයල් පෑඩය ස්වයංපූර්ණය"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ඩයල් පැඩය ස්වයං සම්පුර්ණ කරන්න"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"රිගින් ටෝන් සහ කම්පනය කරන්න"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"සම්මන්ත්‍රණ ඇමතුම කළමනාකරණය කරන්න"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"හදිසි ඇමතුම් අංකය"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml
index a0a0ab4..b6b3c3e 100644
--- a/InCallUI/res/values-sk/strings.xml
+++ b/InCallUI/res/values-sk/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Podržaný hovor"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznáme"</string>
     <string name="private_num" msgid="6713286113000232309">"Súkromné číslo"</string>
-    <string name="payphone" msgid="1931775086311769314">"Verejný telefón"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linka je obsadená"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Sieť je zaneprázdnená"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Bez odozvy, vypršal časový limit"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server je nedostupný"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Volané číslo je nedostupné"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nesprávne používateľské meno alebo heslo"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Volanie z priestoru mimo siete"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Chyba servera: Skúste to znova neskôr."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Žiadny signál"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Bol prekročený limit ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio je vypnuté"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Karta SIM chýba alebo nefunguje"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilná sieť nie je k dispozícii"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odchádzajúce hovory sú obmedzené na pevne určené čísla (FDN)."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ak je zapnuté blokovanie hovorov, nie je možné uskutočňovať odchádzajúce hovory."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Všetky hovory sú obmedzené ovládaním prístupu."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Tiesňové volania sú obmedzené ovládaním prístupu."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Bežné volania sú obmedzené ovládaním prístupu."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neplatné číslo"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefónny automat"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenčný hovor"</string>
-    <string name="call_lost" msgid="317670617901479594">"Hovor bol prerušený."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Hovor bol prerušený."</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Reproduktor"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Slúchadlo"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Náhlavná súprava s káblom"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenčný hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasovej schránky"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Vytáčanie"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Opakuje sa pokus"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Znova sa vytáča"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenčný hovor"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Prichádzajúci hovor"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Hovor bol ukončený"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ukončovanie hovoru"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Prebieha hovor"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Moje číslo je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Pripája sa video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videohovor"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Žiada sa video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videohovor nie je možné pripojiť"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Vaše číslo na spätné volanie\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Vaše číslo na spätné tiesňové volanie\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Vytáčanie"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Zmeškaný hovor"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Prebiehajúci hovor"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Podržaný hovor"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Prichádzajúci hovor"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Prichádzajúci videohovor"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Prichádzajúca žiadosť o video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová správa"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nová hlasová správa (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Zavolať hlasovú schránku <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Číslo hlasovej schránky je neznáme"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Žiadny signál"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Vybratá sieť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie je k dispozícii"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Odpoveď"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Položiť"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Hlas"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Prijať"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Zatvoriť"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zavolať späť"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Správa"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Ak chcete telefonovať, vypnite najprv režim V lietadle."</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"Ak chcete telefonovať, vypnite najprv režim v lietadle."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Prihlásenie do siete nebolo úspešné."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilná sieť nie je k dispozícii."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Hovor sa nepodarilo spojiť, nebolo zadané platné číslo."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Hovor nebol spojený."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilná sieť nie je k dispozícii."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ak chcete volať, zadajte platné číslo"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Hovor nie je možné uskutočniť"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Prebieha spúšťanie sekvencie MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodporovaná služba."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Hovory nie je možné prepnúť."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Hovor nie je možné oddeliť."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Hovor nie je možné preniesť."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Hovory nie je možné spojiť do konferenčného hovoru."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Hovor nie je možné odmietnuť."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Hovor nie je možné uvoľniť."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Číslo hlasovej schránky je neznáme"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetový hovor"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Služba nie je podporovaná"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nedajú sa prepínať hovory"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nedá sa rozdeliť hovor"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nedá sa preniesť"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Nedá sa uskutočniť konferenčný hovor"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nedá sa odmietnuť hovor"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nedajú sa ukončiť hovory"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Hovory SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Tiesňové volanie"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Prebieha zapínanie rádia..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Nepokrytá oblasť, opakovanie pokusu..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Hovor sa nepodarilo spojiť. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie je číslo núdzového volania."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Hovor nebol spojený, vytočte číslo tiesňového volania."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Žiadna služba. Prebieha opätovný pokus…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Hovor nie je možné uskutočniť. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie je číslo tiesňového volania."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Hovor nie je možné uskutočniť. Vytočte číslo tiesňového volania."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Číslo vytočíte pomocou klávesnice."</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Podržať hovor"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Obnoviť hovor"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Pridať hovor"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Zlúčiť hovory"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Zameniť hovory"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Podržať"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Koniec"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Číselná klávesnica"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Zlúčiť hovory"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zameniť"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Spravovať hovory"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Správa konferencie"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Spravovať kon. hovor"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohovor"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Zmeniť na hlasový hovor"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Prepnúť kameru"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pozastaviť video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Ďalšie možnosti"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Služba"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Nastavenie"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nenastavené&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napísať vlastnú..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Zrušiť"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Odoslať"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jeden"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dva"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tri"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"štyri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"päť"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šesť"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedem"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osem"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"deväť"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"hviezdička"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nula"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"vytáčanie"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Reproduktor je povolený."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvuk hovoru bol vypnutý."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odpovedať"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Odoslať SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odmietnuť"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Prijať ako videohovor"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Prijať ako zvukový hovor"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Prijať žiadosť o videohovor"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Odmietnuť žiadosť o videohovor"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Prejdite prstom nahor: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Prejdite prstom doľava: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Prejdite prstom doprava: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Prejdite prstom nadol: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrovať"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrovať"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Predvolený zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Tón zvonenia telefónu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrovať pri zvonení"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Zvuky pri dotyku číselníku"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Automatické dokonč. číselnej klávesnice"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Čís. klávesnica – aut. dopĺň."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tón zvonenia a vibrovanie"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Spravovať konferenčný hovor"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Číslo tiesňového volania"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index c67a093..c59ec6f 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Zadržano"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznano"</string>
     <string name="private_num" msgid="6713286113000232309">"Zasebna številka"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonska govorilnica"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linija je zasedena"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Omrežje je zasedeno"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Ni odziva, časovna omejitev je potekla"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Strežnik ni dosegljiv"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Številka ni dosegljiva"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Napačno uporabniško ime ali geslo"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Klic iz nepooblaščenega omrežja"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Napaka strežnika: poskusite znova pozneje."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Ni signala"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Presežena omejitev ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio je izklopljen"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ni kartice SIM ali napaka kartice SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobilno omrežje ni na voljo"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odhodni klici so omejeni s FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ko je vklopljena zapora klicev, ne morete klicati."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Vsi klici so omejeni z nadzorom dostopa."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Klici v sili so omejeni z nadzorom dostopa."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Navadni klici so omejeni z nadzorom dostopa."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neveljavna številka"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonska govorilnica"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenčni klic"</string>
-    <string name="call_lost" msgid="317670617901479594">"Klic je bil izgubljen."</string>
-    <string name="ok" msgid="3811371167865772377">"V redu"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Klic je bil prekinjen"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Zvočnik"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Slušalka"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Žične slušalke"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenčni klic <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Številka glasovne pošte"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Klicanje"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Ponovni poskus"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Vnovično klicanje"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenčni klic"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Dohodni klic"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Klic je bil končan"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Prekinitev"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Dohodni klic"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Moja številka je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Povezovanje videa"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videoklic"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Zahtevanje videa"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Videoklica ni mogoče vzpostaviti"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Vaša številka za povratni klic:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Vaša številka za povratni klic v sili:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Klicanje"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Neodgovorjeni klic"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neodgovorjeni klici"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktivni klic"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Zadržano"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Dohodni klic"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Dohodni videoklic"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Dohodna zahteva za video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova glasovna pošta"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nova glasovna pošta (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Kliči <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Neznana številka glasovne pošte"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ni storitve"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Izbrano omrežje (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ni na voljo"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Sprejmi"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Prekinite klic"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Videoklic"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Govor"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Sprejmi"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Opusti"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Povratni klic"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Sporočilo"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Če želite poklicati, najprej izklopite način za letalo."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ni registrirano v omrežju."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Omrežje prenosnega telefona ni na voljo."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Klic ni bil poslan, veljavna številka ni vnesena."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Klic ni bil poslan."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobilno omrežje ni na voljo."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Če želite opraviti klic, vnesite veljavno številko."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Klicanje ni mogoče."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Začetek zaporedja MMI ..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodprta storitev."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Preklop klicev ni mogoč."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Klica ni mogoče ločiti."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Klica ni mogoče prenesti."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Konferenčni klici onemogočeni."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Klica ni mogoče zavrniti."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Klicev ni mogoče sprostiti."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Neznana številka odzivnika."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetni klic"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Storitev ni podprta."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Preklop med klici ni mogoč."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ločitev klica ni mogoča."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Prenos ni mogoč."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferenčni klic ni mogoč."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Zavrnitev klica ni mogoča."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Prevzem klicev ni mogoč."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Klic SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Klic v sili"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Vklop radia …"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Zunaj območja storitve, ponovni poskus ..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Klic ni bil poslan. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ni številka za nujne primere!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Klic ni bil poslan. Pokličite številko za nujne primere!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ni signala. Vnovičen poskus …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Klicanje ni mogoče. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ni številka za klic v sili."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Klicanje ni mogoče. Opravite klic v sili."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Za klicanje uporabite tipkovnico"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Zadrži klic"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Nadaljuj klic"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Dodaj klic"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Združi klice"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Zamenjaj klice"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Zadrži"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Konec"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Številčnica"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Združi klice"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamenjaj"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Upravljanje klicev"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Upravljanje konference"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Upravljanje konferenčnih klicev"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvok"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videoklic"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Preklopi na glasovni klic"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Preklop fotoaparata"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Začasno ustavi video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Več možnosti"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Storitev"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Nastavitev"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ni nastavljeno&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napišite svoje besedilo …"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Prekliči"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Pošlji"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ena"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dve"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tri"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"štiri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pet"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šest"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedem"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osem"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devet"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"zvezda"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"nič"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"funt"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"klicanje"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"vračalka"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Zvočnik omogočen."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Klic izključen."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošlji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Zavrni"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Odgovori z videoklicem"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Odgovori z zvočnim klicem"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Sprejmi zahtevo za video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Zavrni zahtevo za video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Povlecite navzgor za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Povlecite v levo za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Povlecite v desno za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Povlecite navzdol za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibriraj"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibriraj"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvok"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Privzeti zvok (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ton zvonjenja telefona"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibriranje ob zvonjenju"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Zvok številčnice"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Samodokončanje za tipkovnico"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Samodokončanje tipkovnice"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvonjenje in vibriranje"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljanje konferenčnih klicev"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Številka za klic v sili"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index 35fd75c..d25ce60 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"На чекању"</string>
     <string name="unknown" msgid="6878797917991465859">"Непознато"</string>
     <string name="private_num" msgid="6713286113000232309">"Приватан број"</string>
-    <string name="payphone" msgid="1931775086311769314">"Јавна говорница"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Линија је заузета"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Мрежа је заузета"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Нема одговора, време је истекло"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер није доступан"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Број је недоступан"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неважеће корисничко име или лозинка"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Позив изван мреже"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Грешка сервера: покушајте поново касније."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Нема сигнала"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Прекорачено је ACM ограничење"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Радио је искључен"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Нема SIM картице или постоји грешка на њој"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Мобилна мрежа није доступна"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Број за фиксно бирање је ограничио одлазне позиве."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Не можете да упућујете одлазне позиве док је укључено ограничавање позива."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Сви позиви су ограничени контролом приступа."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Сви хитни позиви су ограничени контролом приступа."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Стандардни позиви су ограничени контролом приступа."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Неважећи број"</string>
+    <string name="payphone" msgid="4793877574636445118">"Телефонска говорница"</string>
     <string name="confCall" msgid="1904840547188336828">"Конференцијски позив"</string>
-    <string name="call_lost" msgid="317670617901479594">"Позив је изгубљен."</string>
-    <string name="ok" msgid="3811371167865772377">"Потврди"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Позив је прекинут"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Звучник"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Слушалица телефона"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Жичане слушалице"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференцијски позив <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број говорне поште"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Позивање"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Поновни покушај"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Поновно бирање"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конференцијски позив"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Долазни позив"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Позив је завршен"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Прекид везе"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"У позиву"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Мој број је <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Повезивање са видео позивом"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Видео позив"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Захтевање видео позива"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Повезивање видео позива није успело"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Број за повратни позив\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Број за хитан повратни позив\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Бирање"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуштен позив"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени позиви"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Актуелни позив"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"На чекању"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Долазни позив"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Долазни видео позив"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Захтев за долазни видео позив"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова говорна пошта"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова говорна пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Позови <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Непознат број говорне поште"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Нема услуге"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Изабрана мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) није доступна"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Одговори"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Прекини везу"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Гласовни"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Прихвати"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Одбиј"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Узврати позив"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Порука"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Да бисте упутили позив, прво искључите режим рада у авиону."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Није регистровано на мрежи."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобилна мрежа није доступна."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Позив није послат, није унет исправан број."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Позив није послат."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Мобилна мрежа није доступна."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Да бисте упутили позив, унесите важећи број."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Позив није успео."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Покретање MMI секвенце"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Неподржана услуга."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Није могуће пребацивати позиве."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Одвајање позива није могуће."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Пренос позива није могућ."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Конференцијски позиви нису могући."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Одбијање позива није могуће."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Није могуће успоставити позив"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Непознати број говорне поште"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Интернет позив"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Хитни позив"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Услуга није подржана."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Замена позива није успела."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Раздвајање позива није успело."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Пребацивање није успело."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Конференцијски позив није успео."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Одбијање позива није успело."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Успостављање позива није успело."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP позив"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Хитан позив"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Укључивање радија…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Област ван домета, поновни покушај..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Позив није послат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није број за хитне случајеве!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Позив није послат. Позовите број за хитне случајеве!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нема мреже. Поновни покушај…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Позив није успео. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није број за хитне случајеве."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Позив није успео. Позовите број за хитне случајеве."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Користите тастатуру за позивање"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Стави позив на чекање"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Настави позив"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Додај позив"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Обједини позиве"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Замени позиве"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Чекање"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Заврши"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Нумеричка тастатура"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обједини позиве"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Замени"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управљајте позивима"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Управљај конференцијом"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Управљај конф. позивом"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео поз."</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Промени у гласовни позив"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Промени камеру"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Паузирај видео"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Још опција"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Услуга"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Подешавање"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Није подешено&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напишите сами…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Откажи"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Пошаљи"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"један"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"три"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"четири"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"пет"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"шест"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"седам"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"осам"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"девет"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"звездица"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"нула"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"фунта"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"бирање"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"тастер за брисање"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Спикерфон је омогућен."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук позива је искључен."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Одговори"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Пошаљи SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Одговорите видео позивом"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Одговорите аудио-позивом"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Прихвати захтев за видео"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Одбиј захтев за видео"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Превуците нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Превуците улево за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Превуците удесно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Превуците надоле за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибрација"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибрација"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Подразумевани звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Мелодија звона телефона"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибрирај када звони"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Тонови при додиру нумеричке тастатуре"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Аутом. довршавање нумеричке тастатуре"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Аутоматско довршавање"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија звона и вибрација"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Управљање конференцијским позивом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Број за хитне случајеве"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sv/strings.xml b/InCallUI/res/values-sv/strings.xml
index 5c6690f..f024476 100644
--- a/InCallUI/res/values-sv/strings.xml
+++ b/InCallUI/res/values-sv/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Parkerat"</string>
     <string name="unknown" msgid="6878797917991465859">"Okänd"</string>
     <string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonautomat"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Linjen är upptagen"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Nätverket är upptaget"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Inget svar, avbröts"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servern kan inte nås"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numret kan inte nås"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Felaktigt användarnamn eller lösenord"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Uppringt från ett annat nätverk"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Serverfel. Försök igen senare."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Ingen signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-gränsen har överskridits"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio av"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Inget SIM-kort eller SIM-kortsfel"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Inget mobilt nätverk är tillgängligt"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Utgående samtal begränsas av FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan inte ringa utgående samtal när samtalsspärren är aktiverad."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alla samtal begränsas av åtkomstkontroll."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nödsamtal begränsas av åtkomstkontroll."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Vanliga samtal begränsas av åtkomstkontroll."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ogiltigt nummer"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonautomat"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenssamtal"</string>
-    <string name="call_lost" msgid="317670617901479594">"Samtal har försvunnit."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Samtalet avbröts"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Högtalare"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Telefonlur"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Trådanslutet headset"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenssamtal <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer till röstbrevlåda"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Försöker igen"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Ringer upp igen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenssamtal"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Inkommande samtal"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Samtal avslutat"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lägger på"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"I samtal"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Mitt nummer är <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Ansluter video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Videosamtal"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Begär video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Det gick inte att ansluta till videosamtalet"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Ditt nummer för återuppringning\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Ditt nödnummer för återuppringning\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Ringer"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missat samtal"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missade samtal"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtal"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Parkerat"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkommande samtal"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Ny röstbrevlåda"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Ny röstbrevlåda (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Inkommande videosamtal"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Inkommande begäran om videosamtal"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Nytt röstmeddelande"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nytt röstmeddelande (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nummer till röstbrevlåda okänt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen tjänst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Det valda nätverket (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) är inte tillgängligt"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Svara"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Lägg på"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Röst"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Godkänn"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Avvisa"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring upp"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Meddelande"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Om du vill ringa ett samtal måste du först inaktivera flygplansläge."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Inte registrerat på nätverk."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Inget mobilt nätverk är tillgängligt."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Samtalet har inte skickats. Du måste ange ett giltigt nummer."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Samtalet har inte skickats."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Det finns inget mobilnät tillgängligt."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ange ett giltigt nummer om du vill ringa ett samtal."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Det gick inte att ringa."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Startar sekvens för MMI-kod…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Inget stöd för tjänsten."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Det gick inte att växla mellan samtal."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Det gick inte att koppla isär samtalen."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Det gick inte överföra samtal."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Det gick inte att ringa konferenssamtal."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Det gick inte att avvisa samtal."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Det gick inte att släppa samtal."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Okänt nummer till röstbrevlådan."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetsamtal"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Tjänsten stöds inte."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Det gick inte att växla mellan samtal."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Det gick inte att koppla isär samtalen."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Det gick inte att överföra."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Det gick inte att starta en konferens."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Det gick inte att avvisa samtalet."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Det gick inte att släppa samtal."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-anrop"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nödsamtal"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Sätter på radion…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fungerar inte i detta område. Försöker igen…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Samtalet har inte skickats. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> är inte ett nödsamtalsnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Samtalet har inte skickats. Ring ett nödsamtalsnummer!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjänst. Försök igen …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Det gick inte att ringa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> är inget nödnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Det gick inte att ringa. Slå ett nödnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Använd tangentbordet om du vill ringa"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Parkera samtal"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Återuppta samtal"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Lägg till samtal"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Koppla ihop samtal"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Byt samtal"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Parkera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Avsluta"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Knappsats"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Koppla ihop samtal"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Växla"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Hantera samtal"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Hantera konferens"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Hantera konf.samtal"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ljud"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videosamtal"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Byt till röstsamtal"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Byt kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Pausa video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Fler alternativ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Tjänst"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfiguration"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Har inte angetts&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv ett eget svar ..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Avbryt"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Skicka"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ett"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"två"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fyra"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fem"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sex"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sju"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"åtta"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nio"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"stjärna"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"noll"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pund"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ring upp"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backsteg"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Högtalartelefon aktiverad."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Samtalets ljud avstängt."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Skicka SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Avvisa"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Svara som videosamtal"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Svara som röstsamtal"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Acceptera videobegäran"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Neka videobegäran"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Dra uppåt för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Dra åt vänster för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Dra åt höger för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Dra nedåt för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrera"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrera"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ljud"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Standardsignal (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ringsignal"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mobilen vibrerar när det ringer"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Knappljud"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Föreslå nummer vid inmatning"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Autoslutförande för knappsats"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringsignal och vibrera"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Hantera konferenssamtal"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nödsamtalsnummer"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index d4618d9..e3f3cc8 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Inangoja"</string>
     <string name="unknown" msgid="6878797917991465859">"Haijulikani"</string>
     <string name="private_num" msgid="6713286113000232309">" Number isiyojulikana"</string>
-    <string name="payphone" msgid="1931775086311769314">"Simu ya kulipia"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Simu inatumika"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Mtandao unatumika"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Hakuna jibu, muda umekwisha"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Seva haiwezi kufikiwa"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nambari haifikiwi"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Jina la mtumiaji au nenosiri sio sahihi"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Ilipigwa kutoka nje ya mtandao"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Hitilafu ya seva: Tafadhali jaribu tena baadaye."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Hakuna mtandao"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Kiwango cha ACM kimezidishwa"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio imezima"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Hakuna SIM au kuna hitilafu ya SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mtandao wa simu za mkononi haupatikani"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Simu zinazopigwa zimezuiliwa na FDN"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Huwezi kupiga simu za kutoka wakati kupiga simu kumezuiwa."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Simu zote zimezuiwa na kidhibiti ufikiaji."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Simu za dharura zimezuiwa na kidhibiti ufikiaji."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Simu za kawaida zimezuiwa na kidhibiti ufikiaji."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nambari isiyo sahihi"</string>
+    <string name="payphone" msgid="4793877574636445118">"Simu ya kulipia"</string>
     <string name="confCall" msgid="1904840547188336828">"Simu ya kongamano"</string>
-    <string name="call_lost" msgid="317670617901479594">"Simu imepotea."</string>
-    <string name="ok" msgid="3811371167865772377">"Sawa"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Simu imekatwa"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Spika"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Kipaza sauti cha kichwani"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Viskizi vya maskio pasiwaya"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Simu ya kongamano <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nambari ya ujumbe wa sauti"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Inapiga"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Inajaribu tena"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Inapiga simu tena"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Simu ya kongamano"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Simu inayoingia"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Simu imekamilika"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Kukata simu"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Katika simu"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Nambari yangu ni <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Inaunganisha video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Hangout ya Video"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Inaomba video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Haiwezi kuunganisha Hangout ya video"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Nambari yako ya kupigiwa simu\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Nambari yako ya dharura ya kupigiwa simu\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Inapiga"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Simu isiyojibiwa"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Simu zisizojibiwa"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Simu inayoendelea"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Inangoja"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Simu inayoingia"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Hangout ya Video inayoingia"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Ombi  linaloingia la video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ujumbe mpya wa sauti"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Barua mpya ya sauti <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Piga <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nambari ya ujumbe wa sauti haijulikani."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Hakuna huduma"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Mtandao uliochaguliwa <xliff:g id="OPERATOR_NAME">%s</xliff:g> haupatikani"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Jibu"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Kata simu"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Sauti"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Kubali"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Ondoa"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Mpigie"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Ujumbe"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Kupiga simu, kwanza zima hali ya ndege."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Haijasajiliwa kwa mitandao"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mtandao wa simu haupatikani."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Simu haijatumwa, hakuna nambari halali iliyoingizwa."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Simu haijatumwa."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mitandao ya simu za mkononi haipatikani"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ili upige simu, weka nambari sahihi."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Haiwezi kupiga simu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Inaanzisha msururu wa MMI…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Kifaa ambacho hakijahiliwa."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Imeshindwa kubadilisha simu"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Imeshindwa kutenganisha simu."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Imeshindwa kutuma simu"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Imeshindwa kupigia watu wengi."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Imeshindwa kukataa simu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Imeshindwa kuachilia simu."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Nambari ya ujumbe wa sauti haijulikani."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">" Simu ya wavuti"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Huduma haitumiki."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Haiwezi kubadili simu."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Haiwezi kutenganisha simu."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Haiwezi kuhamisha."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Haiwezi kushiriki katika simu ya mkutano."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Haiwezi kukataa simu."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Haiwezi kutoa simu."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Simu ya SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Simu ya dharura"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Inawasha redio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Uko mahali pasipokuwa na huduma, inajaribu tena…."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Simu haijatumwa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> sio nambari ya dharura!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Simu haijatumwa. Piga nambari ya dharura!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Hakuna huduma. Inajaribu tena..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Haiwezi kupiga simu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> si nambari ya dharura."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Haiwezi kupiga simu. Piga simu nambari ya dharura."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Tumia kibodi kubonyeza"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Shikilia simu"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Endelea na simu"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Ongeza simu"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Unganisha simu"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Badilisha simu"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Shikilia"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Mwisho"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Kibao cha kupiga"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Changanyisha simu"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Badili"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Dhibiti simu"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Dhibiti kongamano"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Dhibiti simu ya kongamano"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Kusikika"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Hangout ya Video"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Badilisha iwe simu ya sauti"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Badilisha kamera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Sitisha video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Chaguo zaidi"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Huduma"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Sanidi"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Haijawekwa&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Andika yako binafsi..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Ghairi"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Tuma"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"moja"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"mbili"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tatu"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"nne"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"tano"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sita"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"saba"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"nane"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"tisa"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"nyota"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"sufuri"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pauni"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"piga simu"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"nafasi ya nyuma"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Spika za simu zimewezeshwa"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Simu imezimwa."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jibu"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Tuma SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Kataa"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Pokea kama Hangout ya Video"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Pokea kama simu ya sauti"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Kubali ombi la video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Kataa ombi la video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Sogeza juu ili <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Sogeza kushoto ili <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Sogeza kulia ili <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Telezesha kidole chini kwa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mtetemo"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mtetemo"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sauti"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Sauti chaguo-msingi (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Mlio wa simu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Tetema wakati wa kulia"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toa sauti vitufe vya kupiga vinapoguswa"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Jaza nambari kiotomatiki"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Ukamilishaji otomatiki wa vitufe vya kupiga simu"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Mlio wa simu na Mtetemo"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Dhibiti simu ya kongamano"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Nambari ya dharura"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml
index 53ecb38..c1e17bf 100644
--- a/InCallUI/res/values-ta-rIN/strings.xml
+++ b/InCallUI/res/values-ta-rIN/strings.xml
@@ -17,37 +17,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"மொபைல்"</string>
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"ஃபோன்"</string>
     <string name="onHold" msgid="9035493194749959955">"காத்திருப்பில்"</string>
     <string name="unknown" msgid="6878797917991465859">"தெரியாதவர்"</string>
     <string name="private_num" msgid="6713286113000232309">"தனிப்பட்ட எண்"</string>
-    <string name="payphone" msgid="1931775086311769314">"கட்டண மொபைல்"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"லைன் பிஸியாக உள்ளது"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"நெட்வொர்க் பிஸி"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"பதில் இல்லை, நேரம் முடிந்தது"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"சேவையகம் தொடர்பில் இல்லை"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"தொடர்புகொள்ள முடியவில்லை"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"பயனர்பெயர் அல்லது கடவுச்சொல் தவறானது"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"நெட்வொர்க்கிற்கு அப்பாற்பட்ட எல்லையிலிருந்து அழைக்கப்பட்டது"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"சேவையகப் பிழை. பிறகு முயலவும்."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"சிக்னல் இல்லை"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM வரம்பு மீறப்பட்டது"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"ரேடியோ முடக்கப்பட்டது"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM இல்லை அல்லது SIM பிழை"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"மொபைல் நெட்வொர்க் இல்லை"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"வெளிச்செல்லும் அழைப்புகள் FDN ஆல் தடுக்கப்பட்டன."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"அழைப்பு தடுப்பில் இருக்கும்போது பிறரை அழைக்க முடியாது."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"அணுகல் கட்டுப்பாட்டின் மூலம் எல்லா அழைப்புகளும் தடுக்கப்பட்டன."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"அணுகல் கட்டுப்பாட்டின் மூலம் அவசர அழைப்புகள் தடுக்கப்பட்டன."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"அணுகல் கட்டுப்பாட்டின் மூலம் இயல்பான அழைப்புகள் தடுக்கப்பட்டன."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"எண் தவறானது"</string>
+    <string name="payphone" msgid="4793877574636445118">"கட்டணத் தொலைபேசி"</string>
     <string name="confCall" msgid="1904840547188336828">"குழு அழைப்பு"</string>
-    <string name="call_lost" msgid="317670617901479594">"அழைப்பு முடிந்தது."</string>
-    <string name="ok" msgid="3811371167865772377">"சரி"</string>
+    <string name="call_lost" msgid="6183862117003999578">"அழைப்பு நிறுத்தப்பட்டது"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"ஸ்பீக்கர்"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ஹேண்ட்செட் இயர்ஃபீஸ்"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"வயருடன்கூடிய ஹெட்செட்"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"புளூடூத்"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"பின்வரும் டோன்களை அனுப்பவா?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"டோன்களை அனுப்புகிறது\n"</string>
     <string name="send_button" msgid="4106860097497818751">"அனுப்பு"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"குழு அழைப்பு <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"குரலஞ்சல் எண்"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"டயல் செய்கிறது"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"மீண்டும் முயற்சிக்கிறது"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"மீண்டும் டயல் செய்கிறது"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"குழு அழைப்பு"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"உள்வரும் அழைப்பு"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"அழைப்பு முடிந்தது"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"துண்டிக்கிறது"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"அழைப்பில்"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"எனது எண் <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"வீடியோவை இணைக்கிறது"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"வீடியோ அழைப்பு"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"வீடியோவைக் கோருகிறது"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"வீடியோ அழைப்பை இணைக்க முடியாது"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"உங்களைத் திரும்ப அழைப்பதற்கான எண்\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"அவசர அழைப்பு எண்\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"அழைக்கிறது"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"தவறிய அழைப்பு"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"தவறிய அழைப்புகள்"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"செயலில் இருக்கும் அழைப்பு"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"காத்திருப்பில்"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"உள்வரும் வீடியோ அழைப்பு"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"உள்வரும் வீடியோ கோரிக்கை"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"புதிய குரலஞ்சல்"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"புதிய குரலஞ்சல் (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ஐ அழை"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"குரலஞ்சல் எண் அறியப்படவில்லை"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"சேவை இல்லை"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"தேர்ந்தெடுத்த நெட்வொர்க் (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) கிடைக்கவில்லை"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"பதில்"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"துண்டி"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"வீடியோ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"குரல்"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ஏற்கிறேன்"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"நிராகரி"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"திருப்பி அழை"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"செய்தி"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"அழைப்பதற்கு, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"நெட்வொர்க்கில் பதிவுசெய்யப்படவில்லை."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"மொபைல் நெட்வொர்க் கிடைக்கவில்லை."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"அழைக்க முடியவில்லை, சரியான எண் உள்ளிடப்படவில்லை."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"அழைக்க முடியவில்லை."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"செல்லுலார் நெட்வொர்க் கிடைக்கவில்லை."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"அழைக்க, சரியான எண்ணை உள்ளிடவும்."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"அழைக்க முடியாது."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI வரிசையைத் தொடங்குகிறது..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"ஆதரிக்கப்படாத சேவை."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"அழைப்புகளுக்குள் மாற முடியவில்லை."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"அழைப்பைத் தனியாக்க முடியவில்லை."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"அழைப்பைப் பரிமாற்ற முடியவில்லை."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"குழு அழைப்புகளை மேற்கொள்ள முடியவில்லை."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"அழைப்பை நிராகரிக்க முடியவில்லை."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"அழைப்பை(களை) முடிக்க முடியவில்லை."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"குரலஞ்சல் எண் அறியப்படாதது."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"இணைய அழைப்பு"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"சேவை ஆதரிக்கப்படவில்லை."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"அழைப்புகளில் மாற முடியாது."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"அழைப்பைப் பிரிக்க முடியாது."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"மாற்ற முடியாது."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"குழு அழைப்பு செய்ய முடியாது."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"அழைப்பை நிராகரிக்க முடியாது."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"அழைப்பை(அழைப்புகளை) விடுவிக்க முடியாது."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP அழைப்பு"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"அவசரகால அழைப்பு"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ரேடியோவை இயக்குகிறது…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"சேவை பகுதிக்கு வெளியே உள்ளது, மீண்டும் முயற்சிக்கிறது..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"அழைக்க முடியவில்லை, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ஆனது அவசரகால எண் அல்ல!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"அழைக்க முடியாது. அவசரகால எண்ணை டயல் செய்யவும்!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"சேவை இல்லை. மீண்டும் முயற்சிக்கிறது…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> அவசர அழைப்பு எண் இல்லை என்பதால் அழைக்க முடியாது."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"அழைக்க முடியாது. அவசர அழைப்பு எண்ணை அழைக்கவும்."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"டயல் செய்வதற்கு விசைப்பலகையைப் பயன்படுத்துக"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"அழைப்பை இடைநிறுத்து"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"அழைப்பைத் தொடர்"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"அழைப்பைச் சேர்"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"அழைப்புகளை இணை"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"அழைப்புக்களில் மாறு"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"காத்திரு"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"முடி"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"டயல்பேடு"</string>
@@ -111,13 +108,17 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"அழைப்புகளை இணை"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"மாற்று"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"அழைப்புகளை நிர்வகி"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"குழு அழைப்பை நிர்வகி"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"குழு அழைப்பை நிர்வகி"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ஆடியோ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"வீடியோ அழைப்பு"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"குரல் அழைப்பிற்கு மாறு"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"கேமராவை மாற்று"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"வீடியோவை இடைநிறுத்து"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"மேலும் விருப்பங்கள்"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"சேவை"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"அமைவு"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;அமைக்கப்படவில்லை&gt;"</string>
-    <string name="other_settings" msgid="3672912580359716394">"பிற அழைப்பு அமைப்புகள்"</string>
+    <string name="other_settings" msgid="3672912580359716394">"பிற அழைப்பு அமைப்பு"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> வழியாக அழைக்கிறது"</string>
     <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் உள்வருவது"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"தொடர்பு படம்"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"சொந்தமாக எழுதவும்..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"ரத்துசெய்"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"அனுப்பு"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ஒன்று"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"இரண்டு"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"மூன்று"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"நான்கு"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"ஐந்து"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ஆறு"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ஏழு"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"எட்டு"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ஒன்பது"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"நட்சத்திரம்"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"பூஜ்ஜியம்"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"பவுண்ட்"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"டயல்"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ஸ்பீக்கர்ஃபோன் இயக்கப்பட்டது."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"அழைப்பு முடக்கப்பட்டது."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"பதிலளி"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS அனுப்பு"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"நிராகரி"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"வீடியோ அழைப்பில் பதிலளி"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ஆடியோ அழைப்பில் பதிலளி"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"வீடியோ கோரிக்கையை அனுமதி"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"வீடியோ கோரிக்கையை நிராகரி"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> க்கு மேலாக நகர்த்தவும்."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> க்கு இடதுபக்கமாக நகர்த்தவும்."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> வலதுபக்கமாக நகர்த்தவும்."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> க்குக் கீழே ஸ்லைடு செய்க."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"அதிர்வு"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"அதிர்வு"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ஒலி"</string>
     <string name="default_notification_description" msgid="78174796906240970">"இயல்பு ஒலி (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"தொலைபேசி ரிங்டோன்"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ரிங் ஆகும்போது அதிர்வை ஏற்படுத்து"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"டயல்பேடு தொடுதலுக்கான டோன்கள்"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"டயல்பேடு தானாக முடித்தல்"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"டயல்பேட் தன்னிரப்பி"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ரிங்டோன் &amp; அதிர்வு"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"குழு அழைப்பை நிர்வகிக்கவும்"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"அவசரகால எண்"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml
index 774a74d..dc26f43 100644
--- a/InCallUI/res/values-te-rIN/strings.xml
+++ b/InCallUI/res/values-te-rIN/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"హోల్డ్‌లో ఉంది"</string>
     <string name="unknown" msgid="6878797917991465859">"తెలియదు"</string>
     <string name="private_num" msgid="6713286113000232309">"ప్రైవేట్ నంబర్"</string>
-    <string name="payphone" msgid="1931775086311769314">"పే ఫోన్"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"లైన్ బిజీగా ఉంది"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"నెట్‌వర్క్ బిజీగా ఉంది"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ప్రతిస్పందన లేదు, సమయం ముగిసింది"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"సర్వర్‌ను చేరుకోవడం సాధ్యపడలేదు"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"నంబర్‌ను చేరుకోవడం సాధ్యపడలేదు"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"చెల్లని వినియోగదారు పేరు లేదా పాస్‌వర్డ్"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"నెట్‌వర్క్ లేని చోటు నుండి కాల్ చేయబడింది"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"సర్వర్ లోపం. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"సిగ్నల్ లేదు"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM పరిమితి మించిపోయింది"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"రేడియో ఆఫ్‌లో ఉంది"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM లేదు లేదా SIM లోపం"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"మొబైల్ నెట్‌వర్క్ అందుబాటులో లేదు"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN ద్వారా అవుట్‌గోయింగ్ కాల్‌లు పరిమితం చేయబడ్డాయి."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"కాల్ బేరింగ్ ఆన్‌లో ఉన్నప్పుడు మీరు అవుట్‌గోయింగ్ కాల్‌లు చేయలేరు."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ప్రాప్యత నియంత్రణ ద్వారా అన్ని కాల్‌లు పరిమితం చేయబడ్డాయి."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"ప్రాప్యత నియంత్రణ ద్వారా అత్యవసర కాల్‌లు పరిమితం చేయబడ్డాయి."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ప్రాప్యత నియంత్రణ ద్వారా సాధారణ కాల్‌లు పరిమితం చేయబడ్డాయి."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"నంబర్ చెల్లదు"</string>
+    <string name="payphone" msgid="4793877574636445118">"పే ఫోన్"</string>
     <string name="confCall" msgid="1904840547188336828">"కాన్ఫరెన్స్ కాల్"</string>
-    <string name="call_lost" msgid="317670617901479594">"కాల్‌ను కోల్పోయారు."</string>
-    <string name="ok" msgid="3811371167865772377">"సరే"</string>
+    <string name="call_lost" msgid="6183862117003999578">"కాల్ కట్ అయింది"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"స్పీకర్"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"హ్యాండ్‌సెట్ ఇయర్‌పీస్"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"వైర్ గల హెడ్‌సెట్"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"కాన్ఫరెన్స్ కాల్ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"వాయిస్ మెయిల్ నంబర్"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"డయల్ చేస్తోంది"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"పునఃప్రయత్నిస్తోంది"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"మళ్లీ డయల్ చేస్తోంది"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"కాన్ఫరెన్స్ కాల్"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ఇన్‌కమింగ్ కాల్"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"కాల్ ముగిసింది"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"ముగిస్తోంది"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"కాల్‌లో ఉంది"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"నా నంబర్ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"వీడియోను కనెక్ట్ చేస్తోంది"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"వీడియో కాల్"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"వీడియో కోసం అభ్యర్థిస్తోంది"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"వీడియో కాల్‌ను కనెక్ట్ చేయలేరు"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"మీ కాల్‌బ్యాక్ నంబర్\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"మీ అత్యవసర కాల్‌బ్యాక్ నంబర్\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"డయల్ చేస్తోంది"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"సమాధానం ఇవ్వని కాల్"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"సమాధానం ఇవ్వని కాల్‌లు"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"కాల్ కొనసాగుతోంది"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"హోల్డ్‌లో ఉంది"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ఇన్‌కమింగ్ వీడియో కాల్"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"ఇన్‌కమింగ్ వీడియో అభ్యర్థన"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"కొత్త వాయిస్ మెయిల్"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"కొత్త వాయిస్ మెయిల్ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>కు డయల్ చేయండి"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"వాయిస్ మెయిల్ నంబర్ తెలియదు"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"సేవ లేదు"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"ఎంచుకున్న నెట్‌వర్క్ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) అందుబాటులో లేదు"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"సమాధానం"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"కాల్‌ను ముగించు"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"వీడియో"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"వాయిస్"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ఆమోదిస్తున్నాను"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"తీసివేయి"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"తిరిగి కాల్ చేయి"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"సందేశం"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"కాల్ చేయడానికి, మొదట ఎయిర్‌ప్లైన్ మోడ్‌ను ఆపివేయండి."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"నెట్‌వర్క్‌లో నమోదు కాలేదు."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"మొబైల్ నెట్‌వర్క్ అందుబాటులో లేదు."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"కాల్ చేయలేరు, చెల్లుబాటు అయ్యే నంబర్ నమోదు చేయలేదు."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"కాల్ వెళ్లలేదు."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"సెల్యులార్ నెట్‌వర్క్ అందుబాటులో లేదు."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"కాల్ చేయడానికి, చెల్లుబాటు అయ్యే నంబర్‌ను నమోదు చేయండి."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"కాల్ చేయలేరు."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI శ్రేణిని ప్రారంభిస్తోంది…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"మద్దతు లేని సేవ."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"కాల్‌లను మార్చడం సాధ్యపడలేదు."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"కాల్‌ను వేరు చేయడం సాధ్యపడలేదు."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"కాల్‌ను బదిలీ చేయడం సాధ్యపడలేదు."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"కాన్ఫరెన్స్ కాల్‌లు చేయడం సాధ్యపడలేదు."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"కాల్‌ను తిరస్కరించడం సాధ్యపడలేదు."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"కాల్(లు)ను చేయడం సాధ్యపడలేదు."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"వాయిస్‌మెయిల్ నంబర్ తెలియదు."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ఇంటర్నెట్ కాల్"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"సేవకు మద్దతు లేదు."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"కాల్‌లను మార్చలేరు."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"కాల్‌ను వేరు చేయలేరు."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"బదిలీ చేయలేరు."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"సమావేశం కుదరదు."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"కాల్‌ను తిరస్కరించలేరు."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"కాల్(ల)ను విడిచిపెట్టలేరు."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP కాల్"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"అత్యవసర కాల్"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"రేడియోను ప్రారంభిస్తోంది…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"సేవా ప్రాంతంలో లేదు, పునఃప్రయత్నిస్తోంది…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"కాల్ వెళ్లలేదు. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> అత్యవసర నంబర్ కాదు!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"కాల్ వెళ్లలేదు. అత్యవసర నంబర్‌కు డయల్ చేయండి!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"సేవ లేదు. మళ్లీ ప్రయత్నిస్తోంది…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"కాల్ చేయలేరు. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> అత్యవసర నంబర్ కాదు."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"కాల్ చేయలేరు. అత్యవసర నంబర్‌ను డయల్ చేయండి."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"డయల్ చేయడానికి కీబోర్డ్‌ను ఉపయోగించండి"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"కాల్‌ను హోల్డ్‌లో ఉంచు"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"కాల్‌ను పునఃప్రారంభించు"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"కాల్‌ను జోడించు"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"కాల్‌లను విలీనం చేయి"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"కాల్‌లను మార్చు"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"హోల్డ్ చేయి"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ముగించు"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"డయల్‌ప్యాడ్"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"కాల్‌లను విలీనం చేయి"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"స్వాప్ చేయి"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"కాల్‌లను నిర్వహించు"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"కాన్ఫరెన్స్‌ను నిర్వహించు"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"సమావేశ కాల్‌ను నిర్వహించు"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"ఆడియో"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"వీడియో కాల్"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"వాయిస్ కాల్‌కి మార్చు"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"కెమెరాను మార్చు"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"వీడియోను పాజ్ చేయి"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"మరిన్ని ఎంపికలు"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"సేవ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"సెటప్"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;సెట్ చేయలేదు&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"మీ స్వంతంగా వ్రాయండి…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"రద్దు చేయి"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"పంపు"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ఒకటి"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"రెండు"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"మూడు"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"నాలుగు"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"అయిదు"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ఆరు"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"ఏడు"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ఎనిమిది"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"తొమ్మిది"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"నక్షత్రం"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"సున్నా"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"పౌండ్"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"డయల్ చేయి"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"స్పీకర్ ఫోన్ ప్రారంభించబడింది."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"కాల్ మ్యూట్ చేయబడింది."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"సమాధానం ఇవ్వండి"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS పంపండి"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"తిరస్కరిస్తున్నాను"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"వీడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"ఆడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"వీడియో అభ్యర్థనను అంగీకరించండి"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"వీడియో అభ్యర్థనను తిరస్కరించండి"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం పైకి స్లైడ్ చేయండి."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం ఎడమవైపుకు స్లైడ్ చేయండి."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం కుడివైపుకు స్లైడ్ చేయండి."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> కోసం క్రిందికి స్లైడ్ చేయండి."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"వైబ్రేట్"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"వైబ్రేట్"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ధ్వని"</string>
     <string name="default_notification_description" msgid="78174796906240970">"డిఫాల్ట్ ధ్వని (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ఫోన్ రింగ్‌టోన్"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"రింగ్ అవుతున్నప్పుడు వైబ్రేట్ చేయి"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"డయల్ ప్యాడ్ టచ్ టోన్‌లు"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"డయల్ ప్యాడ్ స్వీయ పూర్తి"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"డయల్‌ప్యాడ్ స్వీయపూర్తి"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"రింగ్‌టోన్ &amp; వైబ్రేట్"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"కాన్ఫరెన్స్ కాల్‌ను నిర్వహించండి"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"అత్యవసర నంబర్"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index 1bed6c2..d932fe6 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"พักสาย"</string>
     <string name="unknown" msgid="6878797917991465859">"ไม่ทราบ"</string>
     <string name="private_num" msgid="6713286113000232309">"หมายเลขส่วนตัว"</string>
-    <string name="payphone" msgid="1931775086311769314">"โทรศัพท์สาธารณะ"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"สายไม่ว่าง"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"เครือข่ายไม่ว่าง"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"ไม่มีการตอบกลับ หมดเวลา"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"ไม่สามารถเข้าถึงเซิร์ฟเวอร์ได้"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ไม่สามารถติดต่อเลขหมายนี้ได้"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"โทรจากนอกเครือข่าย"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"ข้อผิดพลาดของเซิร์ฟเวอร์ โปรดลองอีกครั้งในภายหลัง"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"ไม่มีสัญญาณ"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"เกินจำนวนสูงสุดของ ACM แล้ว"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"ปิดวิทยุ"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"ไม่มีซิมหรือเกิดข้อผิดพลาดกับซิม"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"เครือข่ายมือถือใช้งานไม่ได้"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"การโทรออกถูกจำกัดโดย FDN"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"โทรออกไม่ได้เมื่อระงับการโทรไว้"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"การโทรทั้งหมดถูกจำกัดโดยการควบคุมการเข้าถึง"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"การโทรฉุกเฉินถูกจำกัดโดยการควบคุมการเข้าถึง"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"การโทรปกติถูกจำกัดโดยการควบคุมการเข้าถึง"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"หมายเลขไม่ถูกต้อง"</string>
+    <string name="payphone" msgid="4793877574636445118">"โทรศัพท์สาธารณะ"</string>
     <string name="confCall" msgid="1904840547188336828">"การประชุมสาย"</string>
-    <string name="call_lost" msgid="317670617901479594">"สายหลุดไป"</string>
-    <string name="ok" msgid="3811371167865772377">"ตกลง"</string>
+    <string name="call_lost" msgid="6183862117003999578">"สายหลุด"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"ลำโพง"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ชุดหูฟังโทรศัพท์"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ชุดหูฟังแบบมีสาย"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"การประชุมสาย <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"หมายเลขข้อความเสียง"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"กำลังโทรออก"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"กำลังทดลองซ้ำ"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"โทรใหม่"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"การประชุมสาย"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"สายเข้า"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"วางสายแล้ว"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"กำลังวางสาย"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"กำลังใช้สาย"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"หมายเลขของฉันคือ <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"กำลังเชื่อมต่อวิดีโอ"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"แฮงเอาท์วิดีโอ"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"กำลังขอวิดีโอ"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ไม่สามารถเชื่อมต่อแฮงเอาท์วิดีโอได้"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"หมายเลขโทรกลับของคุณ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"หมายเลขโทรกลับฉุกเฉินของคุณ\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"กำลังโทรออก"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"สายที่ไม่ได้รับ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"สายที่ไม่ได้รับ"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"โทรต่อเนื่อง"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"พักสาย"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"สายเรียกเข้า"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"แฮงเอาท์วิดีโอเรียกเข้า"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"คำขอโทรเข้าเป็นวิดีโอ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ข้อความเสียงใหม่"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ข้อความเสียงใหม่ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"หมุนหมายเลข <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ไม่ทราบหมายเลขข้อความเสียง"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"ไม่มีบริการ"</string>
-    <string name="notification_network_selection_text" msgid="2607085729661923269">"เครือข่ายที่เลือกไว้ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ใช้งานไม่ได้"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"เครือข่ายที่เลือกไว้ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ไม่พร้อมใช้งาน"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"ตอบ"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"วางสาย"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"วิดีโอ"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"เสียง"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"ยอมรับ"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"ปิด"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"โทรกลับ"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"ข้อความ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"หากต้องการโทรออก ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ยังไม่ได้ลงทะเบียนบนเครือข่าย"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"เครือข่ายมือถือใช้งานไม่ได้"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ไม่ได้โทรออก ไม่ได้ป้อนหมายเลขที่ถูกต้อง"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"ไม่ได้โทรออก"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"เครือข่ายมือถือใช้งานไม่ได้"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"หากต้องการโทรออก โปรดป้อนหมายเลขที่ถูกต้อง"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ไม่สามารถโทรได้"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"กำลังเริ่มต้นลำดับ MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"บริการไม่ได้รับการสนับสนุน"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"สลับสายไม่ได้"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"แยกสายไม่ได้"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"โอนสายไม่ได้"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"ประชุมทางโทรศัพท์ไม่ได้"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"ปฏิเสธสายไม่ได้"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"ปล่อยสายไม่ได้"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"ไม่ทราบหมายเลขข้อความเสียง"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"การโทรทางอินเทอร์เน็ต"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"ไม่สนับสนุนบริการนี้"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ไม่สามารถสลับสายได้"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ไม่สามารถแยกสายได้"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ไม่สามารถโอนได้"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"ไม่สามารถประชุมได้"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ไม่สามารถปฏิเสธสายได้"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ไม่สามารถเริ่มการโทรได้"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"โทรแบบ SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"หมายเลขฉุกเฉิน"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"กำลังเปิดวิทยุ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"นอกพื้นที่ให้บริการ กำลังลองซ้ำ..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"ไม่ได้โทรออก <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ไม่ได้โทรออก หมุนหมายเลขฉุกเฉิน!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ไม่มีบริการ โปรดลองอีกครั้ง…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ไม่สามารถโทรได้ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ไม่สามารถโทรออก โทรหมายเลขฉุกเฉิน"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ใช้แป้นพิมพ์กดหมายเลขโทรศัพท์"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"พักสาย"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"โทรต่อ"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"เพิ่มการโทร"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"รวมสาย"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"สลับสาย"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"พักสาย"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"สิ้นสุด"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"แป้นหมายเลข"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"รวมสาย"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"สลับ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"จัดการการโทร"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"จัดการการประชุม"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"จัดการการประชุมสาย"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"เสียง"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"แฮงเอาท์วิดีโอ"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"เปลี่ยนเป็นการโทรด้วยเสียง"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"สลับกล้องถ่ายรูป"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"หยุดวิดีโอชั่วคราว"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"ตัวเลือกอื่น"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"บริการ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"การตั้งค่า"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;ไม่ได้ตั้งค่า&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"เขียนคำตอบของคุณเอง..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"ยกเลิก"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"ส่ง"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"หนึ่ง"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"สอง"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"สาม"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"สี่"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"ห้า"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"หก"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"เจ็ด"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"แปด"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"เก้า"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ดาว"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"ศูนย์"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"ปอนด์"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"หมุนหมายเลข"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"ถอยหลัง"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"เปิดใช้งานลำโพงแล้ว"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ปิดเสียงการโทร"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"คำตอบ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ส่ง SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ปฏิเสธ"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"รับสายเป็นแฮงเอาท์วิดีโอ"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"รับสายเป็นการโทรด้วยเสียง"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ยอมรับคำขอวิดีโอ"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ปฏิเสธคำขอวิดีโอ"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"เลื่อนขึ้นเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"เลื่อนไปทางซ้ายเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"เลื่อนไปทางขวาเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"เลื่อนลงเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"สั่น"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"สั่น"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"เสียง"</string>
     <string name="default_notification_description" msgid="78174796906240970">"เสียงเริ่มต้น (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"เสียงเรียกเข้าโทรศัพท์"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"สั่นเมื่อมีสายเข้า"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"เสียงแตะแป้นหมายเลข"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ช่วยเติมอัตโนมัติในแป้นหมายเลข"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"เติมหมายเลขอัตโนมัติบนแป้น"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"เสียงเรียกเข้าและสั่น"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"จัดการการประชุมสาย"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"หมายเลขฉุกเฉิน"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index 97db42d..cf2efed 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Naka-hold"</string>
     <string name="unknown" msgid="6878797917991465859">"Di-kilala"</string>
     <string name="private_num" msgid="6713286113000232309">"Pribadong numero"</string>
-    <string name="payphone" msgid="1931775086311769314">"Pay phone"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Abala ang linya"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Abala ang network"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Walang pagtugon, na-time out"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Hindi maabot ang server"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Hindi maabot ang numero"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Maling username o password"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Tumawag mula sa labas ng metwork"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Error sa server. Pakisubukang muli sa ibang pagkakataon."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Walang signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Lumagpas na sa limitasyon ng ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Naka-off ang radyo"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Walang SIM, o error sa SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Hindi available ang mobile network"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Pinaghihigpitan ng FDN ang mga papalabas na tawag."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Hindi ka makakagawa ng mga papalabas na tawag habang naka-on ang pag-bar ng tawag."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Pinaghihigpitan ang lahat ng mga tawag ng kontrol sa access."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Pinaghihigpitan ang mga pang-emergency na tawag ng kontrol sa access."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Pinaghihigpitan ang mga normal na tawag ng kontrol sa access."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Hindi wastong numero"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="confCall" msgid="1904840547188336828">"Conference na tawag"</string>
-    <string name="call_lost" msgid="317670617901479594">"Nawala ang tawag."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Na-drop ang tawag"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handset earpiece"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired na headset"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference na tawag <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero ng voicemail"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dina-dial"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Sinusubukang muli"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Muling dina-dial"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conference na tawag"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Papasok na tawag"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Winakasan ang Tawag"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Binababa"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Nasa tawag"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Ang aking numero ay <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Ikinokonekta ang video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video call"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Humihiling ng video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Hindi makakonekta sa video call"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Ang iyong numero ng callback\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Ang iyong emergency na numero ng callback\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Dina-dial"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Hindi nasagot na tawag"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Mga hindi nasagot na tawag"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Kasalukuyang tawag"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Naka-hold"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Papasok na tawag"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Papasok na video call"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Papasok na kahilingan ng video"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Bagong voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Bagong voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"I-dial ang <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Hindi kilala ang numero ng voicemail"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Walang serbisyo"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Hindi available ang mga piniling network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Sagutin"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Ibaba"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Boses"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Tanggapin"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"I-dismiss"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Tawagan"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Padalhan ng mensahe"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Upang tumawag, paki-off ang Airplane mode."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Hindi nakarehistro sa network."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Hindi available ang mobile network."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Hindi naipadala ang tawag, walang ipinasok na wastong numero."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Hindi naipadala ang tawag."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Hindi available ang cellular network"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Upang tumawag, maglagay ng wastong numero."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Hindi makatawag."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Sinisimulan ang pagkakasunud-sunod ng MMI…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Hindi suportadong serbisyo."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Hindi nagawang maglipat ng mga tawag."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Hindi nagawang ihiwalay ang tawag."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Hindi nagawang ilipat ang tawag."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Hindi nagawang i-conference ang mga tawag."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Hindi nagawang tanggihan ang tawag."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Hindi nagawang mapalabas ang (mga) tawag."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Hindi kilala ang numero ng voicemail."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Tawag sa internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Hindi sinusuportahan ang serbisyo."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Hindi mailipat ang mga tawag."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Hindi mapaghiwalay ang tawag"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Hindi mailipat."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Hindi makapag-conference."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Hindi matanggihan ang tawag."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Hindi mailabas ang (mga) tawag."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Tawag sa SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency na tawag"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ino-on ang radyo…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Lugar na hindi nagseserbisyo, sinusubukang muli…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Hindi naipadala ang tawag. hindi pang-emergency na numero ang <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Hindi naipadala ang tawag. Mag-dial ng pang-emergency na numero!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Walang serbisyo. Sinusubukang muli…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Hindi makatawag. Ang <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ay hindi isang emergency na numero."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Hindi makatawag. Mag-dial ng emergency na numero."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gamitin ang keyboard upang mag-dial"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"I-hold ang tawag"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Ipagpatuloy ang tawag"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Magdagdag ng tawag"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Pagsamahin ang mga tawag"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Pagpalitin ang mga tawag"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"I-hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Wakasan"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dialpad"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Pagsamahin ang mga tawag"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Pagpalitin"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Pamahalaan ang mga tawag"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Pamahalaan ang conference"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Manage conference call"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Gawing voice call"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Magpalit ng camera"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"I-pause ang video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Higit pang mga opsyon"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Serbisyo"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Hindi nakatakda&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Sumulat ng sarili mong tugon…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Kanselahin"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Ipadala"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"isa"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dalawa"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tatlo"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"apat"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"lima"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"anim"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"pito"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"walo"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"siyam"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"star"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"Mag-dial"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Pinapagana ang speakerphone."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Naka-mute ang tawag."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Sagutin"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Magpadala ng SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tanggihan"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Sagutin bilang video call"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Sagutin bilang audio call"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Tanggapin ang kahilingan sa video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tanggihan ang kahilingan sa video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Mag-slide pataas para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Mag-slide pakaliwa para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Mag-slide pakanan para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Mag-slide pababa para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mag-vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mag-vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Tunog"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Default na tunog (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ringtone ng telepono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"I-vibrate kapag nagri-ring"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Mga tone ng pagpindot sa dial pad"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Pag-autocomplete ng dial pad"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"I-autocomplete ang dialpad"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone at Pag-vibrate"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Pamahalaan ang conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Pang-emergency na numero"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 8a16858..2782092 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Beklemede"</string>
     <string name="unknown" msgid="6878797917991465859">"Bilinmiyor"</string>
     <string name="private_num" msgid="6713286113000232309">"Özel numara"</string>
-    <string name="payphone" msgid="1931775086311769314">"Ankesörlü telefon"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Hat meşgul"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Ağ meşgul"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Yanıt yok, zaman aşımı oluştu"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Sunucuya ulaşılamıyor"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numaraya ulaşılamıyor"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Hatalı kullanıcı adı veya şifre"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Çağrı, ağın dışından yapıldı"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Sunucu hatası. Daha sonra tekrar deneyin."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Sinyal yok"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM sınırı aşıldı"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Radyo kapalı"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"SIM kart yok veya SIM hatası"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Mobil ağ kullanılamıyor"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Giden çağrılar SAN tarafından kısıtlandı."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Çağrı engelleme açıkken arama yapamazsınız"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tüm çağrılar erişim denetimi tarafından kısıtlandı."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Acil durum çağrıları erişim denetimi tarafından kısıtlandı."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normal çağrılar erişim denetimi tarafından kısıtlanmış."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Geçersiz numara"</string>
+    <string name="payphone" msgid="4793877574636445118">"Ankesörlü telefon"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferans görüşmesi"</string>
-    <string name="call_lost" msgid="317670617901479594">"Çağrı istemeden sonlandırıldı."</string>
-    <string name="ok" msgid="3811371167865772377">"Tamam"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Çağrı kesildi"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Hoparlör"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Mobil cihaz kulaklığı"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kablolu kulaklık"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferans görüşmesi <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Sesli mesaj numarası"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Çevriliyor"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Tekrar deniyor"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Yeniden aranıyor"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferans görüşmesi"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Gelen çağrı"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Çağrı sonlandırıldı"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Sonlandırılıyor"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Çağrı halinde"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Numaram: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Video bağlanıyor"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video görüşmesi"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Video isteniyor"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Video görüşmesi bağlantısı yapılamıyor"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Geri arama numaranız\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Acil durum geri arama numaranız\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Çevriliyor"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Cevapsız çağrı"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cevapsız çağrılar"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Devam eden çağrılar"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Beklemede"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Gelen çağrı"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Gelen video görüşmesi isteği"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Gelen video isteği"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Yeni sesli mesaj"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yeni sesli mesaj (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Çevir: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Sesli mesaj numarası bilinmiyor"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Hizmet yok"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Seçili ağ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) kullanılamıyor"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Yanıtla"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Kapat"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Ses"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Kabul et"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Kapat"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Geri ara"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj gönder"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Bir çağrı yapmak için öncelikle Uçak modunu kapatın."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ağda kayıtlı değil."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobil ağ kullanılamıyor."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Çağrı gönderilmedi. Geçerli numara girilmedi."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Çağrı gönderilmedi."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Hücresel ağ kullanılamıyor."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Arama yapmak için geçerli bir numara girin."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Arama yapılamıyor."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI dizisi başlatılıyor..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Desteklenmeyen hizmet."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Çağrılar arasında geçiş yapılamıyor."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Çağrı ayrılamıyor."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Çağrı aktarılamıyor."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Çağrılar konferans görüşmesi olarak birleştirilemiyor."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Çağrı reddedilemiyor."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Çağrılar serbest bırakılamıyor."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Sesli mesaj numarası bilinmiyor."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"İnternet çağrısı"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Servis desteklenmiyor."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Çağrı geçişi yapılamıyor."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Çağrı ayrılamıyor."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Aktarılamıyor."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferans yapılamıyor."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Çağrı reddedilemiyor."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Çağrılar bırakılamıyor."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP çağrısı"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Acil durum çağrısı"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radyo açılıyor..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Hizmet alanı dışında, tekrar deneniyor..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Çağrı gönderilmedi, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bir acil durum numarası değil!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Çağrı gönderilmedi. Bir acil durum numarası çevirin!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Servis yok. Tekrar deneniyor…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Aranamıyor. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bir acil durum numarası değil."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Aranamıyor. Bir acil durum numarasını arayın."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Çevirmek için klavyeyi kullan"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Çağrıyı beklet"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Çağrıya devam et"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Çağrı ekle"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Çağrıları birleştir"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Çağrılar arasında geçiş yap"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Beklet"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Sonlandır"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tuş takımı"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Çağrıları birleştir"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Değiştir"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Aramaları yönet"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferansı yönet"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Konferans çağrısını yönet"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ses"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video görüşmesi"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Sesli çağrıya geç"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Kamerayı değiştir"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Videoyu duraklat"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Diğer seçenekler"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Hizmet"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Kurulum"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ayarlanmadı&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kendi yanıtınızı oluşturun…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"İptal"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Gönder"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"bir"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"iki"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"üç"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"dört"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"beş"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"altı"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"yedi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"sekiz"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"dokuz"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"yıldız"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"sıfır"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"kare"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"çevir"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"geri tuşu"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Hoparlör etkin."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Çağrı sesi kapatıldı."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Yanıtla"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS gönder"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Reddet"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Video görüşmesi olarak yanıtla"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Sesli görüşme olarak yanıtla"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Video isteğini kabul et"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Video isteğini reddet"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için yukarı kaydırın."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için sola kaydırın."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için sağa kaydırın."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için aşağı kaydırın."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titreşim"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titreşim"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ses"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Varsayılan ses (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Telefon zil sesi"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Çalarken titret"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tuşlara basınca ses çıksın"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Tuş takımı otomatik tamamlama"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Tuş takımı otomatik tamamlama"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zil Sesi ve Titreşim"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferans görüşmesini yönet"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Acil durum numarası"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml
index e92ca37..d05fc42 100644
--- a/InCallUI/res/values-uk/strings.xml
+++ b/InCallUI/res/values-uk/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Очікує"</string>
     <string name="unknown" msgid="6878797917991465859">"Невідомий"</string>
     <string name="private_num" msgid="6713286113000232309">"Приватний номер"</string>
-    <string name="payphone" msgid="1931775086311769314">"Таксофон"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Лінія зайнята"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Мережа зайнята"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Нема відп., час очік.мин."</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер недоступний"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Номер недоступний"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неправ. ім\'я корист-ча чи пароль"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Виклик із-поза меж мережі"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Помилка сервера. Спроб. пізніше."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Немає сигналу"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Перевищено ліміт ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Вимк. радіо"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Помилка SIM-карти або SIM-карта відсутня"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Мобільна мережа недоступна"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Вихідні дзвінки обмежено FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ви не можете здійснювати вихідні виклики, коли ввімкнено заборону викликів."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Усі дзвінки обмежено контролем доступу."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Аварійні виклики обмежено контролем доступу."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Звичайні виклики обмежено контролем доступу."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Недійсний номер"</string>
+    <string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
     <string name="confCall" msgid="1904840547188336828">"Конференц-виклик"</string>
-    <string name="call_lost" msgid="317670617901479594">"Виклик утрачено."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Виклик перервано"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Динамік"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Гарнітура Bluetooth"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Дротова гарнітура"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-виклик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голос. пошти"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набір"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Повт. підкл."</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Повторний набір"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конференц-виклик"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Вхідний дзвінок"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Виклик заверш."</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Класти слухавку"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Вхід. викл."</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Мій номер: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Відеодзвінок: з’єднання"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Відеодзвінок"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Надсилання запиту на відеодзвінок"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Неможливо здійснити відеодзвінок"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Номер для зв’язку:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Екстрений номер:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Набір"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропущ. виклик"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущ. дзвінки"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Поточний виклик"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Очікує"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Вхідний дзвінок"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Вхідний відеодзвінок"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Запит на вхідний відеодзвінок"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова голос. пошта"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова голос. пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Набрати <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Невідомий номер голос. пошти"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Нема служби"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Вибрана мережа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Відповісти"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Завершити виклик"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Відео"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Голосовий дзвінок"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Приймаю"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Закрити"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Передзвонити"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Повідомлення"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Щоб установ. з\'єднання, споч. вимк. режим польоту."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не зареєстровано в мережі."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобільна мережа недоступна."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Виклик не надіслано, не збережено дійсний номер."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Виклик не надісл."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Мобільна мережа недоступна."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Щоб зателефонувати, введіть дійсний номер."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Неможливо зателефонувати."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Запуск ряду MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Непідтримувана служба"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Неможл. переключ. виклики."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Неможл. розділити дзвінок."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Неможл. переслати дзвінок."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Неможл. створ. конференц-викл."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Неможл. відхилити дзвінок."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Неможл. роз\'єднати виклики."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Невідомий номер голосової пошти."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Інтернет-дзвінок"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Служба не підтримується."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Неможливо переключитися між викликами."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Неможливо розділити виклик."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Неможливо перенести."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Неможливо здійснити конференц-виклик."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Неможливо відхилити виклик."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Неможливо телефонувати."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Дзвінок через протокол SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Аварійний виклик"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Увімкнення радіо…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Поза межами дії служби, повтор..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Виклик не надіслано. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не є екстреним номером!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Виклик не надіслано. Наберіть екстрений номер!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Зв’язку немає. Повторна спроба…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Неможливо зателефонувати. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> – не є екстреним номером."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Неможливо зателефонувати. Наберіть екстрений номер."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Викор. клав. для набору"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Утримати виклик"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Відновити виклик"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Додати виклик"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Об’єднати виклики"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Поміняти виклики"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Утрим."</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Закінч."</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Цифр. клав."</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Об’єдн. дзвінки"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Поміняти"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Керув. викликами"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Керувати конференц."</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Керувати дзвінком"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Звук"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Відеодзвінок"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Перейти в режим голосового дзвінка"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Змінити камеру"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Призупинити відео"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Більше опцій"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Служба"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Налаштування"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не встановлено&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напишіть власну відповідь..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Скасувати"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Надіслати"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"один"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"три"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"чотири"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"п’ять"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"шість"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"сім"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"вісім"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"дев’ять"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"зірочка"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"нуль"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"решітка"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"дзвонити"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Гучний зв’язок увімкнено."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук виклику вимкнено."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Відповісти"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Надіслати SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Відхилити"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Відповісти в режимі відеодзвінка"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Відповісти в режимі аудіодзвінка"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Прийняти запит на відеодзвінок"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Відхилити запит на відеодзвінок"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – проведіть пальцем угору."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – проведіть пальцем ліворуч."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – проведіть пальцем праворуч."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Проведіть пальцем донизу, щоб <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вібросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вібросигнал"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Звук за умовчанням (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Сигнал дзвінка телефону"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вібрувати під час дзвінка"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Звук клавіш"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Автозавершення для цифрової клавіатури"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Автозаповн. цифрової клавіат."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Сигнал дзвінка та вібросигнал"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Керувати конференц-викликом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Екстрений номер"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index f58e33f..2f84bd3 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"ہولڈ پر"</string>
     <string name="unknown" msgid="6878797917991465859">"نامعلوم"</string>
     <string name="private_num" msgid="6713286113000232309">"نجی نمبر"</string>
-    <string name="payphone" msgid="1931775086311769314">"پے فون"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"لائن مصروف ہے"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"نیٹ ورک مصروف ہے"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"کوئی جواب نہیں، وقت ختم ہوگیا"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"سرور ناقابل رسائی ہے"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"نمبر ناقابل رسائی ہے"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"غلط صارف نام یا پاس ورڈ"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"نیٹ ورک کے باہر سے کال کیا"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"سرور کی خرابی۔ بعد میں دوبارہ کوشش کریں۔"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"کوئی سگنل نہیں ہے"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"‏ACM حد سے تجاوز کر گیا"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"ریڈیو آف ہے"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"‏SIM نہیں ہے یا SIM میں خرابی ہے"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"موبائل نیٹ ورک دستیاب نہیں ہے۔"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"‏باہر جانے والی کالیں FDN کے ذریعہ ممنوع کر دی گئی ہیں۔"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"آپ کال بندش آن ہونے کی حالت میں باہر جانے والی کالیں نہیں کرسکتے ہیں۔"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"تمام کالیں رسائی کنٹرول کے ذریعہ ممنوع کر دی گئی ہیں۔"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"ایمرجنسی کالیں رسائی کنٹرول کے ذریعہ ممنوع کر دی گئی ہیں۔"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"عمومی کالیں رسائی کنٹرول کے ذریعہ ممنوع کر دی گئی ہیں۔"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"غلط نمبر"</string>
+    <string name="payphone" msgid="4793877574636445118">"پے فون"</string>
     <string name="confCall" msgid="1904840547188336828">"کانفرنس کال"</string>
-    <string name="call_lost" msgid="317670617901479594">"کال کھو گئی ہے۔"</string>
-    <string name="ok" msgid="3811371167865772377">"ٹھیک ہے"</string>
+    <string name="call_lost" msgid="6183862117003999578">"کال چھوڑ دی گئی"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"اسپیکر"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"ہینڈسیٹ ایئرپیس"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"تار والا ہیڈسیٹ"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"کانفرنس کال <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"صوتی میل نمبر"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ڈائل ہو رہا ہے"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"دوبارہ کوشش کر رہا ہے"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"دوبارہ ڈائل ہو رہا ہے"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"کانفرنس کال"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"آنے والی کال"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"کال ختم ہوگئی"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"کال منقطع ہو رہی ہے"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"کال میں"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"میرا نمبر ہے <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"ویڈیو کال مربوط ہو رہی ہے"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"ویڈیو کال"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ویڈیو کی درخواست کی جا رہی ہے"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"ویڈیو کال منسلک نہیں کر سکتا"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"‏آپ کا کال بیک نمبر‎\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>‎"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"‏آپ کا ہنگامی کال بیک نمبر‎\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>‎"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"ڈائل ہو رہا ہے"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"چھوٹی ہوئی کال"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"چھوٹی ہوئی کالیں"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"جاری کال"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ہولڈ پر"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"آنے والی کال"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"اِن کمنگ ویڈیو کال"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"اِن کمنگ ویڈیو درخواست"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"نیا صوتی میل"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"نیا صوتی میل (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ڈائل کریں"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"صوتی میل نمبر نامعلوم ہے"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"کوئی سروس نہیں ہے"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"منتخب کردہ نیٹ ورک (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) دستیاب نہیں ہے"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"جواب دیں"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"کال منقطع کریں"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"ویڈیو"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"آواز"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"قبول کریں"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"برخاست کریں"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"واپس کال کریں"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"پیغام"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"کال کرنے کیلئے، پہلے ہوائی جہاز طرز کو آف کریں۔"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"نیٹ ورک پر رجسٹرڈ نہیں ہے۔"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"موبائل نیٹ ورک دستیاب نہیں ہے۔"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"کال نہیں بھیجی گئی، کوئی درست نمبر درج نہیں کیا گیا۔"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"کال نہیں بھیجی گئی۔"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"سیلولر نیٹ ورک دستیاب نہیں ہے۔"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"کال کرنے کیلئے، ایک درست نمبر درج کریں۔"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"کال نہیں کر سکتے۔"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏MMI ترتیب شروع ہو رہی ہے…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"غیر تعاون یافتہ سروس۔"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"کالیں سوئچ کرنے سے قاصر ہے۔"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"کال علیحدہ کرنے سے قاصر ہے۔"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"کال منتقل کرنے سے قاصر ہے۔"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"کانفرنس کالیں کرنے سے قاصر ہے۔"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"کال مسترد کرنے سے قاصر ہے۔"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"کال (کالیں) جاری کرنے سے قاصر ہے۔"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"صوتی میل نمبر نامعلوم ہے۔"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"انٹرنیٹ کال"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"سروس تعاون یافتہ نہیں ہے۔"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"کالز سوئچ نہیں کر سکتے۔"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"کال کو الگ نہیں کر سکتے۔"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"منتقل نہیں کر سکتے۔"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"کانفرنس نہیں کر سکتے۔"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"کال مسترد نہیں کی جا سکتی۔"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"کال(ز) ریلیز نہیں کر سکتے۔"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"‏SIP کال"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ہنگامی کال"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ریڈیو آن کر رہا ہے…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"سروس کے علاقے سے باہر، دوبارہ کوشش ہو رہی ہے…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"کال نہیں بھیجی گئی۔ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ایک ہنگامی نمبر نہیں ہے!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"کال نہیں بھیجی گئی۔ ایک ہنگامی نمبر ڈائل کریں!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"کوئی سروس نہیں ہے۔ دوبارہ کوشش کی جا رہی ہے…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"کال نہیں کی جا سکتی۔ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ایک ہنگامی نمبر نہیں ہے۔"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"کال نہیں کی جا سکتی۔ ایک ہنگامی نمبر ڈائل کریں۔"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ڈائل کرنے کیلئے کی بورڈ استعمال کریں"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"کال کو ہولڈ کریں"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"کال کو دوبارہ شروع کریں"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"کال شامل کریں"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"کالز کو ضم کریں"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"کالز تبدیل کریں"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ہولڈ کریں"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ختم کریں"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ڈائل پیڈ"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"کالیں ضم کریں"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تبادلہ کریں"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"کالوں کا نظم کریں"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"کانفرنس کا نظم کریں"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"کانفرنس کال کا نظم کریں"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"آڈیو"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ویڈیو کال"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"صوتی کال میں تبدیل کریں"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"کیمرہ سوئچ کریں"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ویڈیو موقوف کریں"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"مزید اختیارات"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"سروس"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"سیٹ اپ"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;متعین نہیں ہے&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"اپنا خود کا تحریر کریں…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"منسوخ کریں"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"بھیجیں"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ایک"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"دو"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"تین"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"چار"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"پانچ"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"چھ"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"سات"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"آٹھ"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"نو"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ستارہ"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"صفر"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"پاؤنڈ"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"ڈائل کریں"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"بیک اسپیس"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"اسپیکر فون فعال ہوگیا۔"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"کال خاموش کر دی گئی۔"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"جواب دیں"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏SMS بھیجیں"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"مسترد کریں"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"ویڈیو کال کے بطور جواب دیں"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"آڈیو کال کے بطور جواب دیں"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"ویڈیو کی درخواست قبول کریں"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"ویڈیو کی درخواست مسترد کریں"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے اوپر سلائیڈ کریں۔"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے بائیں سلائیڈ کریں۔"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے دائیں سلائیڈ کریں۔"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> کیلئے نیچے سلائیڈ کریں۔"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"وائبریٹ"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"وائبریٹ"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"آواز"</string>
     <string name="default_notification_description" msgid="78174796906240970">"ڈیفالٹ آواز (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"فون رنگ ٹون"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"بجنے کے وقت مرتعش کریں"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ڈائل پیڈ ٹچ ٹونز"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"ڈائل پیڈ خود کار تکمیل"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ڈائل پیڈ کی خودکار تکمیل"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"رنگ ٹون اور وائبریٹ"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"کانفرنس کال کا نظم کریں"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"ہنگامی نمبر"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-uz-rUZ/strings.xml b/InCallUI/res/values-uz-rUZ/strings.xml
new file mode 100644
index 0000000..bece8a9
--- /dev/null
+++ b/InCallUI/res/values-uz-rUZ/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
+    <string name="onHold" msgid="9035493194749959955">"Kutmoqda"</string>
+    <string name="unknown" msgid="6878797917991465859">"Noma’lum"</string>
+    <string name="private_num" msgid="6713286113000232309">"Shaxsiy raqam"</string>
+    <string name="payphone" msgid="4793877574636445118">"Taksofon"</string>
+    <string name="confCall" msgid="1904840547188336828">"Konferensiya qo‘ng‘irog‘i"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Qo‘ng‘iroq tugatildi"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Karnay"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Telefon quloq eshitgichlari"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Simli garnitura"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Ushbu tovushlar jo‘natilsinmi?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Tovushlar jo‘natilmoqda\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"Jo‘natish"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"Ha"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"Yo‘q"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Belgilarni quyidagilar bilan almashtiring:"</string>
+    <string name="caller_manage_header" msgid="3231519674734638786">"Konferensiya qo‘ng‘irog‘i <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Ovozli xabar raqami"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Raqam terilmoqda"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Qayta terilmoqda"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"Konferensiya qo‘ng‘irog‘i"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Qo‘ng‘iroq tugadi"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"Kutish holatida"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Go‘shak qo‘yilmoqda"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"Qo‘ng‘iroqda"</string>
+    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mening raqamim - <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Videoga ulanmoqda"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Video qo‘ng‘iroq"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Video so\'ralmoqda"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Video qo‘ng‘iroqqa ulanib bo‘lmadi"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Teskari qo‘ng‘iroq raqamingiz\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Favqulodda holatlar uchun teskari qo‘ng‘iroq raqamingiz\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Terilmoqda"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Javob berilmagan qo‘ng‘iroq"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Javobsiz qo‘ng‘iroqlar"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ta javobsiz qo‘ng‘iroq"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>dan javobsiz qo‘ng‘iroq"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Joriy qo‘ng‘iroq"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"Kutmoqda"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Kiruvchi videoqo‘ng‘iroq"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Kiruvchi video so\'rovi"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Yangi ovozli xabar"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yangi ovozli xabar (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>ni terish"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ovozli qo‘ng‘iroq raqami noma’lum"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"Xizmat mavjud emas"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"Tanlangan tarmoq (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) mavjud emas"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Javob berish"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Go‘shakni qo‘yish"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Ovoz"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Roziman"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Yopish"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Teskari qo‘ng‘iroq"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Xabar"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"Qo‘ng‘iroq qilish uchun, avval \"Parvoz rejimi\" o‘chirilishi kerak."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobil tarmoq mavjud emas."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Qo‘ng‘iroq qilib bo‘lmadi."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI tartibi ishga tushmoqda..."</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Xizmat qo‘llab-quvvatlanmaydi."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Qo‘ng‘iroqlarni almashtirib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Qo‘ng‘iroqni ajratib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"O‘tkazib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Konferens-aloqa o‘rnatib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Qo‘ng‘iroqni rad qilib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Qo‘ng‘iroq(lar)ni chiqarib bo‘lmadi."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP qo‘ng‘iroq"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Favqulodda qo‘ng‘iroq"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio yoqilmoqda…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aloqa yo‘q. Qayta urinilmoqda…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Qo‘ng‘iroq qilib bo‘lmadi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> favqulodda raqam emas."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Qo‘ng‘iroq qilib bo‘lmadi. Favqulodda raqamga tering."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Terish uchun tugmatagdan foydalaning"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Qo‘ng‘iroqni ushlab turish"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Qo‘ng‘iroqni davom ettirish"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Qo‘ng‘iroq qo‘shish"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Qo‘ng‘iroqlarni birlashtirish"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Boshqa qo‘ng‘iroq"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Ushlab turish"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"Tugatish"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Terish paneli"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Ovozni o‘chirish"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Qo‘ng‘iroq qo‘shish"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Qo‘ng‘iroqlarni birlashtirish"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Almashish"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Qo‘ng‘iroqlarni boshqarish"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Konf. aloqani boshqarish"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video qo‘ng‘iroq"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Ovozli qo‘ng‘iroqqa o‘zgartirish"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Kamerani almashtirish"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Videoni vaqtincha to‘xtatish"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Ko‘proq"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Xizmat"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Moslash"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;O‘rnatilmagan&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Boshqa qo‘ng‘iroq sozlamalari"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
+    <string name="incoming_via_template" msgid="1696993226115570960">"Kiruvchi qo‘ng‘iroqlar <xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"kontakt surati"</string>
+    <string name="goPrivate" msgid="865837794424530980">"alohidaga o‘tish"</string>
+    <string name="selectContact" msgid="781975788478987237">"kontaktni tanlash"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"O‘z javobingizni yozing..."</string>
+    <string name="custom_message_cancel" msgid="7516406059429609296">"Bekor qilish"</string>
+    <string name="custom_message_send" msgid="5795754217085747742">"Jo‘natish"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Javob berish"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS yuborish"</string>
+    <string name="description_target_decline" msgid="4789834364389731957">"Rad qilish"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Video qo\'ng\'iroq sifatida javob berish"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Audio qo\'ng\'iroq sifatida javob berish"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Video qo‘ng‘iroq so‘rovini qabul qilish"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Video qo‘ng‘iroq so‘rovini rad qilish"</string>
+    <string name="description_direction_up" msgid="4441409581444516690">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun tepaga suring."</string>
+    <string name="description_direction_left" msgid="7129873384376533287">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun chapga suring."</string>
+    <string name="description_direction_right" msgid="2122584234531957308">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun o‘ngga suring."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> uchun pastga suring."</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Tebranish"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Tebratish"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ovoz"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Standart ovoz (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"Telefon qo‘ng‘iroq ohangi"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Jiringlash vaqtida tebranish"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Tugmachalarni avto-to‘ldirish"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Qo‘ng‘iroq ohangi &amp; tebranish"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferensiya qo‘ng‘irog‘ini boshqarish"</string>
+    <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Favqulodda qo‘ng‘iroq raqamlari"</string>
+</resources>
diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml
index f59715c..7e7a694 100644
--- a/InCallUI/res/values-vi/strings.xml
+++ b/InCallUI/res/values-vi/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Đang chờ"</string>
     <string name="unknown" msgid="6878797917991465859">"Không xác định"</string>
     <string name="private_num" msgid="6713286113000232309">"Số cá nhân"</string>
-    <string name="payphone" msgid="1931775086311769314">"Điện thoại tự động"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Đường dây bận"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Mạng bận"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Không có phản hồi, đã hết thời gian chờ"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Máy chủ không thể truy cập được"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Số không thể truy cập được"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Tên người dùng hoặc mật khẩu không chính xác"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Được gọi từ ngoài mạng"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Lỗi máy chủ. Hãy thử lại sau."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Không có tín hiệu nào"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Đã vượt quá giới hạn ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Tắt radio"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Không có SIM hoặc lỗi SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Không có mạng di động"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Cuộc gọi đi bị hạn chế bởi FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Bạn không thể thực hiện cuộc gọi đi khi đang bật chế độ chặn cuộc gọi."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tất cả cuộc gọi bị hạn chế bởi kiểm soát truy cập."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Cuộc gọi khẩn cấp bị hạn chế bằng kiểm soát truy cập."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Cuộc gọi thông thường bị hạn chế bởi kiểm soát truy cập."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Số không hợp lệ"</string>
+    <string name="payphone" msgid="4793877574636445118">"Điện thoại công cộng"</string>
     <string name="confCall" msgid="1904840547188336828">"Cuộc gọi hội nghị"</string>
-    <string name="call_lost" msgid="317670617901479594">"Cuộc gọi đã bị mất."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Cuộc gọi bị gián đoạn"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Loa"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Tai nghe ĐTDĐ"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Tai nghe có dây"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Cuộc gọi hội nghị <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Số thư thoại"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Đang quay số"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Đang thử lại"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Đang quay số lại"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Cuộc gọi hội nghị"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Cuộc gọi đến"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Cuộc gọi đã kết thúc"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Kết thúc cuộc gọi"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Đang trong cuộc gọi"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Số điện thoại của tôi là <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Đang kết nối video"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Cuộc gọi điện video"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Đang yêu cầu video"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Không kết nối được cuộc gọi điện video"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Số gọi lại của bạn\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Số gọi lại khẩn cấp của bạn\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Đang gọi"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Cuộc gọi nhỡ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cuộc gọi nhỡ"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Cuộc gọi đang thực hiện"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Đang chờ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Cuộc gọi đến"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Cuộc gọi điện video đến"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Yêu cầu video đến"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Thư thoại mới"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Thư thoại mới (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Quay số <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Số thư thoại không xác định"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Không có dịch vụ nào"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Mạng được chọn (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) không khả dụng"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Trả lời"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Kết thúc"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Video"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Thoại"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Chấp nhận"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Loại bỏ"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Gọi lại"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Tin nhắn"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Để thực hiện cuộc gọi, trước tiên, hãy tắt chế độ trên Máy bay."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Chưa được đăng ký trên mạng."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mạng di động không khả dụng."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Cuộc gọi không được gửi đi, bạn đã nhập số không hợp lệ."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Cuộc gọi không được gửi đi."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Không có mạng di động."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Để thực hiện cuộc gọi, hãy nhập một số hợp lệ."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Không thực hiện được cuộc gọi."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Khởi động chuỗi MMI…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Dịch vụ không được hỗ trợ."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Không thể chuyển đổi cuộc gọi."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Không thể tách cuộc gọi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Không thể chuyển cuộc gọi."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Không thể thực hiện cuộc gọi hội nghị."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Không thể từ chối cuộc gọi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Không thể thực hiện cuộc gọi."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Số thư thoại không xác định."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Cuộc gọi qua internet"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Dịch vụ không được hỗ trợ."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Không chuyển đổi được cuộc gọi."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Không tách được cuộc gọi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Không chuyển được cuộc gọi."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Không thực hiện được cuộc gọi hội nghị."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Không từ chối được cuộc gọi."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Không thực hiện được cuộc gọi."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Cuộc gọi qua SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Cuộc gọi khẩn cấp"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Đang bật radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Ngoài vùng dịch vụ, đang thử lại..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Cuộc gọi không được gửi đi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> không phải là số khẩn cấp!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Cuộc gọi không được gửi đi. Hãy quay số số khẩn cấp!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Không có dịch vụ nào. Đang thử lại…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Không thực hiện được cuộc gọi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> không phải là số khẩn cấp."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Không thực hiện được cuộc gọi. Hãy quay số khẩn cấp."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sử dụng bàn phím để quay số"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Giữ cuộc gọi"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Tiếp tục cuộc gọi"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Thêm cuộc gọi"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Hợp nhất cuộc gọi"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Hoán đổi cuộc gọi"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Giữ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Kết thúc"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Bàn phím số"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hợp nhất cuộc gọi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Hoán đổi"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Quản lý cuộc gọi"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Quản lý hội nghị"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Quản lý cuộc gọi nhiều bên"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Âm thanh"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"C.gọi video"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Thay đổi thành cuộc gọi thoại"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Chuyển đổi máy ảnh"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Tạm dừng video"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Thêm tùy chọn"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Dịch vụ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Thiết lập"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Chưa được đặt&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Viết trả lời của riêng bạn…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Hủy"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Gửi"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"một"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"hai"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ba"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"bốn"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"năm"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sáu"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"bảy"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"tám"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"chín"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"dấu sao"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"không"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"dấu thăng"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"quay số"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"phím lùi"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Đã bật loa ngoài."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Đã tắt tiếng cuộc gọi."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Trả lời"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Gửi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Từ chối"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Trả lời là cuộc gọi điện video"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Trả lời là cuộc gọi âm thanh"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Chấp nhận yêu cầu cuộc gọi video"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Từ chối yêu cầu cuộc gọi video"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Trượt lên để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Trượt sang trái để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Trượt sang phải để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Trượt xuống để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rung"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rung"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Âm thanh"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Âm thanh mặc định (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Nhạc chuông điện thoại"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Rung khi đổ chuông"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Âm chạm bàn phím số"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Tự động hoàn thành bằng bàn phím số"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Bàn phím số tự động điền"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nhạc chuông và rung"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Quản lý cuộc gọi hội nghị"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Số khẩn cấp"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index 1c89ffd..be2ac76 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -17,33 +17,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"手机"</string>
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"电话"</string>
     <string name="onHold" msgid="9035493194749959955">"保持"</string>
     <string name="unknown" msgid="6878797917991465859">"未知"</string>
     <string name="private_num" msgid="6713286113000232309">"私密号码"</string>
-    <string name="payphone" msgid="1931775086311769314">"公用电话"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"线路忙"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"网络忙"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"无响应，已超时"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"无法连接到服务器"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"该号码无法拨通"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"用户名或密码错误"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"网外呼叫"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"服务器错误，请稍后再试。"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"无信号"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"超出 ACM 限制"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"已关闭天线"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"无 SIM 卡或 SIM 卡出错"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"没有移动网络"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"外拨电话受固定拨号限制。"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"您无法在已启用通话限制的情况下拨出电话。"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"所有通话都受访问控制限制。"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"急救或报警电话受访问控制限制。"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"正常通话受访问控制限制。"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"号码无效"</string>
+    <string name="payphone" msgid="4793877574636445118">"公用电话"</string>
     <string name="confCall" msgid="1904840547188336828">"电话会议"</string>
-    <string name="call_lost" msgid="317670617901479594">"通话已中断。"</string>
-    <string name="ok" msgid="3811371167865772377">"确定"</string>
+    <string name="call_lost" msgid="6183862117003999578">"通话中断"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"扬声器"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"手机听筒"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有线耳机"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"电话会议<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"语音信箱号码"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"正在拨号"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"正在重拨"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"正在重拨"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"电话会议"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"来电"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通话结束"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"正在挂断"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"正在通话"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"我的手机号码：<xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"正在连接视频"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"视频通话"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"正在发出视频请求"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"无法连接视频通话"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"您的回拨号码\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"您的紧急回拨号码\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"正在拨号"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接电话"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接电话"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"当前通话"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保持"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"来电"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"有视频通话来电"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"收到视频通话邀请"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新语音邮件"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新语音邮件 (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"拨打 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"语音信箱号码未知"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"无服务"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"所选网络（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）不可用"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"接听"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"挂断"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"视频"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"语音"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"接受"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"忽略"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回拨"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"短信"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"要进行呼叫，请先关闭飞行模式。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未注册网络。"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"无法连接到移动网络"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"拨号失败，因为输入的号码无效。"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"拨号失败。"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"无法连接到移动网络。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"要拨打电话，请输入有效的电话号码。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"无法拨打该电话。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"正在启动 MMI 序列..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"不支持此服务。"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"无法切换通话。"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"无法分离通话。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"无法转移呼叫。"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"无法进行电话会议。"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"无法拒绝呼叫。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"无法挂断。"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"语音信箱号码未知。"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"互联网电话"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"服务不受支持。"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"无法切换通话。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"无法单独通话。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"无法转移呼叫。"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"无法进行电话会议。"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"无法拒接来电。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"无法挂断电话。"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP电话"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"紧急呼救"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"正在打开天线..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"不在服务区，正在重试..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"电话未拨出，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码！"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"电话未拨出，请拨打紧急呼救电话！"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"无服务，正在重试…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"无法拨打该电话。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"无法拨打该电话。请拨打紧急呼救电话。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用键盘拨号"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"保持通话"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"恢复通话"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"添加通话"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"合并通话"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"切换通话"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"等待"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"挂断"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"拨号键盘"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合并通话"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"交换"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通话"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"管理会议"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"管理电话会议"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"音频"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"视频通话"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"改为语音通话"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"切换摄像头"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"暂停视频"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"更多选项"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"服务"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"设置"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未设置&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"自行撰写回复…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"取消"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"发送"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"一"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"二"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"三"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"四"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"五"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"六"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"七"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"八"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"九"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"星标"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"零"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"英镑"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"拨号"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Backspace 键"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"扬声器已启用。"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通话已静音。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"接听"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"发送短信"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒绝"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"以视频通话的形式接听"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"以音频通话的形式接听"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"接受视频请求"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"拒绝视频请求"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"向上滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"向左滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"向右滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"向下滑动即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"振动"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"振动"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"提示音"</string>
     <string name="default_notification_description" msgid="78174796906240970">"默认提示音 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"手机铃声"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"响铃时振动"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"拨号键盘触摸音效"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"拨号键盘自动补全"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"拨号键盘自动填充"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"铃声和振动"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理电话会议"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"紧急电话号码"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml
index 429306e..b067eee 100644
--- a/InCallUI/res/values-zh-rHK/strings.xml
+++ b/InCallUI/res/values-zh-rHK/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"保留通話"</string>
     <string name="unknown" msgid="6878797917991465859">"未知"</string>
     <string name="private_num" msgid="6713286113000232309">"私人號碼"</string>
-    <string name="payphone" msgid="1931775086311769314">"公共電話"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"忙線"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"網絡忙碌"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"沒有回應，已逾時"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"無法連接伺服器"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"無法撥通的號碼"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"用戶名稱或密碼不正確"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"無法在網外撥號"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"伺服器錯誤，請稍後再試一次。"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"沒有訊號"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"已超過 ACM 上限"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"無線電已關閉"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"沒有 SIM 卡，或是 SIM 卡錯誤"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"無法連線至流動網絡"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"撥出通話受 FDN 限制。"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"啟用通話限制時，無法撥出電話。"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"所有通話都受存取控制限制。"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"緊急通話受存取控制限制。"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"正常通話受存取控制限制。"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"號碼無效"</string>
+    <string name="payphone" msgid="4793877574636445118">"公共電話"</string>
     <string name="confCall" msgid="1904840547188336828">"視訊會議"</string>
-    <string name="call_lost" msgid="317670617901479594">"電話已斷線。"</string>
-    <string name="ok" msgid="3811371167865772377">"確定"</string>
+    <string name="call_lost" msgid="6183862117003999578">"已中斷通話"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"揚聲器"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"免提聽筒"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有線頭戴式耳機"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"電話會議 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"留言信箱號碼"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"撥號中"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"重試中"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"重撥"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"視訊會議"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"來電"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通話已結束"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"結束通話"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"通話中"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"我的電話號碼：<xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"連結視像"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"視像通話"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"提出視像要求"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"無法連接視像通話"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"您的回撥號碼：\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"您的緊急回撥號碼：\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"撥號中"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接來電"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保留通話"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"視像通話來電"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"收到視像要求"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新留言"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新留言 (<xliff:g id="COUNT">%d</xliff:g> 個)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"撥號 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"沒有可用的留言信箱號碼"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"沒有服務"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"您所選取的網絡 (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) 無法使用"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"接聽"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"掛斷"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"影片"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"語音"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"接受"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"關閉"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回撥"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"短訊"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"請先關閉飛行模式後再撥打電話。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"未在網絡上完成註冊。"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"無法使用流動網絡。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"無法傳送，輸入的號碼無效。"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"無法傳送通話。"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"無法連線至流動網絡。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"要撥打電話，請輸入有效的號碼。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"無法通話。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"開始 MMI 序列..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"不支援的服務。"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"無法切換通話。"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"無法區分來電。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"無法傳接電話。"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"無法進行會議通話"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"無法拒接來電。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"無法結束通話。"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"留言信箱號碼不明。"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"網絡電話"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"不支援的服務。"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分開通話。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"無法轉移。"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"無法進行會議。"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"無法拒絕來電。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"無法釋放通話。"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP 通話"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急電話"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"正在開啟無線電..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"超出服務範圍，正在重試..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"無法撥號，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼！"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"無法撥號，請撥打緊急電話號碼！"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"沒有服務。請再試一次…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急號碼。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"無法通話。撥打緊急號碼。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"保留通話"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"恢復通話"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"新增通話"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"合併通話"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"切換通話"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"按住"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"撥號鍵盤"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合併通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切換"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通話"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"管理電話會議"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"管理會議通話"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"音頻裝置"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"視像通話"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"變更為語音通話"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"切換相機"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"暫停視像"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"更多選項"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"服務"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"設定"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未設定&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"自行撰寫回覆…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"取消"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"傳送"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"一"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"二"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"三"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"四"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"五"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"六"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"七"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"八"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"九"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"星號"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"零"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"井字鍵"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"退格鍵"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"擴音器已啟用"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"接聽"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"發送短訊"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"接聽視像通話"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"接聽語音通話"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"接受視像通話要求"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"拒絕視像通話要求"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"向上滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"向左滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"向右滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"向下滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"震動"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"震動"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
     <string name="default_notification_description" msgid="78174796906240970">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"手機鈴聲"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"鈴響時震動"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"撥號鍵盤音頻"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"撥號鍵盤自動完成"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"撥號盤自動完成功能"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急電話號碼"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index b9ef350..508a653 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"通話保留"</string>
     <string name="unknown" msgid="6878797917991465859">"不明"</string>
     <string name="private_num" msgid="6713286113000232309">"私人號碼"</string>
-    <string name="payphone" msgid="1931775086311769314">"公共電話"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"線路忙碌中"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"網路忙碌"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"沒有回應，已逾時"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"無法連上伺服器"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"無法撥通的號碼"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"使用者名稱或密碼有誤"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"無法進行網外撥號"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"伺服器錯誤，請稍後再試。"</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"沒有訊號"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"已達 ACM 限制"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"無線通訊關閉"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"沒有 SIM 卡或 SIM 卡發生錯誤"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"無法連線至行動網路"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"撥出受固定撥號限制。"</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"通話限制啟用時無法撥號。"</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"所有通話都受存取控制限制。"</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"緊急通話受存取控制限制。"</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"正常通話受存取控制限制。"</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"號碼無效"</string>
+    <string name="payphone" msgid="4793877574636445118">"公用電話"</string>
     <string name="confCall" msgid="1904840547188336828">"多方通話"</string>
-    <string name="call_lost" msgid="317670617901479594">"電話已斷線。"</string>
-    <string name="ok" msgid="3811371167865772377">"確定"</string>
+    <string name="call_lost" msgid="6183862117003999578">"通話已中斷"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"喇叭"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"手機聽筒"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有線頭戴式耳機"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"多方通話<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"語音信箱號碼"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"撥號中"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"重試中"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"重撥中"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"多方通話"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"來電"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通話結束"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"掛斷電話"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"通話中"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"我的電話號碼：<xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"連接視訊"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"視訊通話"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"提出視訊要求"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"無法建立視訊通話連線"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"您的回撥號碼如下\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"您的緊急回撥號碼如下\n<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"撥號中"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接來電"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"通話保留"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"視訊通話來電"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"收到視訊要求"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新留言"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新留言 (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"撥打 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"無語音信箱號碼"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"沒有服務"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"您所選取的網路 (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) 無法使用"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"接聽"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"掛斷"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"視訊"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"語音"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"接受"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"拒絶"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回撥"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"簡訊"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"撥號前，請先關閉飛航模式。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未註冊網路。"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"無法使用 Google 行動服務網路。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"撥號未送出，未輸入正確號碼。"</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"撥號未送出。"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"無法連線到行動網路。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"如要撥打電話，請輸入有效的號碼。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"無法通話。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"開始 MMI 序列…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"不支援的服務。"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"無法切換通話。"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"無法分隔來電。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"無法轉接來電。"</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"無法進行多方通話。"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"無法拒絕來電。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"無法釋出通話。"</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"語音留言號碼不明。"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"網路電話"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"不支援的服務。"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分割通話。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"無法轉接。"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"無法進行電話會議。"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"無法拒接來電。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"無法掛斷電話。"</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP 通話"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急電話"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"開啟無線通訊中…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"超出服務範圍，重試中…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"未送出通話要求，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼！"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"未送出通話要求，請撥打緊急電話號碼！"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"找不到服務訊號，正在重試…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急號碼。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"無法通話。只能撥打緊急號碼。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"保留通話"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"恢復通話"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"新增通話"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"合併通話"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"切換通話"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"撥號鍵盤"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合併通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切換"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通話"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"管理會議"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"管理會議通話"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"音訊"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"視訊通話"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"變更為語音通話"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"切換相機"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"暫停影片"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"更多選項"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"服務"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"設定"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未設定&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"自行撰寫回應…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"取消"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"傳送"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"3"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"4"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"5"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"6"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"7"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"8"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"9"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"星號"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"零"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"井字鍵"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"喇叭已啟用"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"解答"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"接聽"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"傳送簡訊"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"接聽視訊通話"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"接聽語音通話"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"接受視訊要求"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"拒絕視訊要求"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"向上滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_left" msgid="7129873384376533287">"向左滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="description_direction_right" msgid="2122584234531957308">"向右滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"向下滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"震動"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"震動"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
     <string name="default_notification_description" msgid="78174796906240970">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"手機鈴聲"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"鈴響時震動"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"撥號鍵盤觸控音效"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"撥號鍵盤自動完成"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"撥號鍵盤自動完成"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"緊急電話號碼"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml
index 4c2ea07..370d84c 100644
--- a/InCallUI/res/values-zu/strings.xml
+++ b/InCallUI/res/values-zu/strings.xml
@@ -21,29 +21,9 @@
     <string name="onHold" msgid="9035493194749959955">"Ibambile"</string>
     <string name="unknown" msgid="6878797917991465859">"Akwaziwa"</string>
     <string name="private_num" msgid="6713286113000232309">"Inombolo eyimfihlo"</string>
-    <string name="payphone" msgid="1931775086311769314">"Ifoni ekhokhelwayo"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Ulayini umatasa"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Inethiwekhi imatasa"</string>
-    <string name="callFailed_timedOut" msgid="7590961703135543346">"Ayikho impendulo, isikhathi siphelile"</string>
-    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Iseva ayitholakali"</string>
-    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Inombolo ayifinyeleleki"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Igama lomsebenzisi noma iphasiwedi engalungile"</string>
-    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Kushayelwe kwinethiwekhi yangaphandle"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Iphutha leseva. Zama futhi emva kwesikhathi."</string>
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Ayikho isignali"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Umkhawulo we-ACM ufinyelelwe"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Umsakazo uvaliwe"</string>
-    <string name="callFailed_simError" msgid="4476360200030635828">"Ayikho i-SIM, noma iphutha le-SIM"</string>
-    <string name="callFailed_outOfService" msgid="682300184520329366">"Inethiwekhi yeselula ayitholakali"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Amakholi aphumayo avinjelwe i-FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Awukwazi ukwenza amakholi aphumayo ngenkathi ukuvimba kuvuliwe."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Wonke amakholi avimbelwa ngesilawuli sokufinyelela."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Amakholi aphuthumayo avinjelwe isilawuli sokufinyelela."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Amakholi avamile avinjelwe ukulawula kokufinyelela."</string>
-    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Inombolo Engalungile"</string>
+    <string name="payphone" msgid="4793877574636445118">"Ucingo olufakwa imali"</string>
     <string name="confCall" msgid="1904840547188336828">"Ikholi yengqungquthela"</string>
-    <string name="call_lost" msgid="317670617901479594">"Ikholi ikulahlekele."</string>
-    <string name="ok" msgid="3811371167865772377">"KULUNGILE"</string>
+    <string name="call_lost" msgid="6183862117003999578">"Ikholi ivaliwe"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Isipikha"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Ucezulwendlebe lwe-Handset"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"I-headset enezincingo"</string>
@@ -57,7 +37,7 @@
     <string name="caller_manage_header" msgid="3231519674734638786">"Ikholi yengqungquthela <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Inombolo yevoyisimeyili"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Iyadayela"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Izama futhi"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Iphinda iyashaya"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Ikholi yengqungquthela"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Ikholi engenayo"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Ikholi iqediwe"</string>
@@ -65,6 +45,12 @@
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Iyavala"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Isecingweni"</string>
     <string name="card_title_my_phone_number" msgid="112428362494434191">"Inombolo yami ngu <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="card_title_video_call_connecting" msgid="297586766381973954">"Ixhuma ividiyo"</string>
+    <string name="card_title_video_call" msgid="5898636679563320218">"Ikholi yevidiyo"</string>
+    <string name="card_title_video_call_requesting" msgid="4587504939739340937">"Icela ividiyo"</string>
+    <string name="card_title_video_call_error" msgid="9000555878389539225">"Ayikwazi ukuxhuma ikholi yevidiyo"</string>
+    <string name="card_title_callback_number" msgid="7307938207564217293">"Inombolo yakho okumele ishayelwe futhi ngu-\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+    <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Inombolo yakho yesimo esiphuthumayo okumele iphinde ishayelwe ngu-\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Iyadayela"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ikholi ekulahlekele"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Amakholi akuphuthele"</string>
@@ -73,36 +59,47 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"Ikholi eqhubekayo"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ibambile"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ikholi engenayo"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"Ikholi yevidiyo engenayo"</string>
+    <string name="notification_requesting_video_call" msgid="1405576812892369451">"Isicelo sevidiyo engenayo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Umlayezo wezwi omusha"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Umyalezo wezwi omusha (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dayela <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Inombolo yevoyisimeyili ayaziwa"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ayikho isevisi"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Inethiwekhi ekhethiwe <xliff:g id="OPERATOR_NAME">%s</xliff:g> ayitholakali"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Phendula"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Vala ikholi"</string>
+    <string name="notification_action_answer_video" msgid="7809271910870211729">"Ividiyo"</string>
+    <string name="notification_action_answer_voice" msgid="1770796916369437773">"Izwi"</string>
+    <string name="notification_action_accept" msgid="2898609801209468429">"Yamukela"</string>
+    <string name="notification_action_dismiss" msgid="2679969397930852858">"Cashisa"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Phinda ushaye"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Umlayezo"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Ukwenza ikholi, vala kuqala imodi Yendiza."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ayibhalisiwe kwinethiwekhi."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Inethiwekhi yefoni ayitholakali"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Ikholi ayithunyelwanga, ayikho inombolo elungile efakiwe."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Ikholi ayithunyelwanga."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Inethiwekhi yeselula ayitholakali."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ukuze wenze ikholi, faka inombolo evumelekile."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ayikwazi ukushaya."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iqalisa ukulandelana kwe-MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Isevisi engasekelwe."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ayikwazi ukushintsha amakholi"</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Ayikwazi ukwehlukanisa ucingo."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Ayikwazi ukudlulisa ucingo."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Ayikwazi ukwenza amakholi engqungquthela."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Ayikwazi ukwenqaba ikholi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Ayikwazi ukuyeka ikholi (ama)."</string>
-    <string name="incall_error_missing_voicemail_number" msgid="2995137160077097934">"Inombolo yevoyisimeyili ayaziwa."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Ikholi ye-Inthanethi"</string>
+    <string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Isevisi ayisekelwe."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ayikwazi ukushintsha amakholi."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ayikwazi ukuhlukanisa ikholi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ayikwazi ukudlulisela."</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Ayikwazi ukwenza inkomfa."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Ayikwazi ukunqabela ikholi."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Ayikwazi ukukhipha amakholi."</string>
+    <string name="incall_call_type_label_sip" msgid="4931428719494190371">"Ikholi ye-SIP"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ikholi ephuthumayo"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ivula umsakazo..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Indawo engenayo isevisi, iyazama futhi..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Ikholi ayithunyelwe. I-<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> akuyona inombolo ephuthumayo!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Ikholi ayithunyelwanga, sicela udayela inombolo ephuthumayo!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ayikho isevisi. Iyazama futhi…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ayikwazi ukushaya. I-<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> akuyona inombolo yesimo esiphuthumayo."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ayikwazi ukushaya. Shayela inombolo yesimo esiphuthumayo."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sebenzisa ikhibhodi ukudayela"</string>
+    <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Bamba ikholi"</string>
+    <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Qhubekisa ikholi"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"Engeza ikholi"</string>
+    <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"Hlanganisa amakholi"</string>
+    <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"Shintsha amakholi"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Bamba"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Qeda"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Iphedi yokudayela"</string>
@@ -111,9 +108,13 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hlanganisa amakholi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Shintsha"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Phatha amakholi"</string>
-    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Phatha umhlangano wezokuxhumana"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Phatha ikholi yenkomfa"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Umsindo"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Ikholi yevidiyo ye-Hangout"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Shintshela kukholi yezwi"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Shintsha ikhamela"</string>
+    <string name="onscreenPauseVideoText" msgid="5663965924921429203">"Misa isikhashana ividiyo"</string>
+    <string name="onscreenOverflowText" msgid="2702376562345723132">"Izinketho eziningi"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Isevisi"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Ukumisa"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ayisethiwe&gt;"</string>
@@ -126,47 +127,25 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Bhala okwakho…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Khansela"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Thumela"</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"kunye"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"okubili"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ntathu"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"okune"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"okuhlanu"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"isithupha"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"isikhombisa"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"isishiyagalombili"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"isishiyagalolunye"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"inkanyezi"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"lutho"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"iphawundi"</string>
-    <string name="description_dial_button" msgid="7459705245418435351">"dayela"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"i-backspace"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Isipikha sefoni sinikwe amandla"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Ikholu ithulisiwe"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Phendula"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Thumela i-SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Nqaba"</string>
+    <string name="description_target_answer_video_call" msgid="3495965588512395026">"Phendula njengekholi yevidiyo"</string>
+    <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Phendula njengekholi yomsindo"</string>
+    <string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Yamukela isicelo sevidiyo"</string>
+    <string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Yenqaba isicelo sevidiyo"</string>
     <string name="description_direction_up" msgid="4441409581444516690">"Slayidela phezulu ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_left" msgid="7129873384376533287">"Slayida ngakwesokunxele ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="description_direction_right" msgid="2122584234531957308">"Slayida ngakwesokudla ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+    <string name="description_direction_down" msgid="4317245625565166742">"Slayida ngezansi ku-<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Dlidliza"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Dlidliza"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Umsindo"</string>
     <string name="default_notification_description" msgid="78174796906240970">"Umsindo ozenzakalelayo (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"Ithoni yokukhala kocingo"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Dlidlizisa uma ikhala"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Amathoni okuthinta iphedi yokudayela"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Okokudayela kuqedwe ngokuzenzakalela"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"Ukuqedelwa ngokuzenzakalela kwephedi yokudayela"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ithoni yokukhala nokudlidliza"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Phatha ucingo lwengqungquthela"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"Inombolo yesimo esiphuthumayo"</string>
-    <string name="dialpad_0_number" msgid="4644117034319354934">"0"</string>
-    <string name="dialpad_1_number" msgid="9005660581700930162">"1"</string>
-    <string name="dialpad_2_number" msgid="4037709919757417820">"2"</string>
-    <string name="dialpad_3_number" msgid="7146166309009131439">"3"</string>
-    <string name="dialpad_4_number" msgid="9075039274846639476">"4"</string>
-    <string name="dialpad_5_number" msgid="5780019709590672721">"5"</string>
-    <string name="dialpad_6_number" msgid="8261355170951265389">"6"</string>
-    <string name="dialpad_7_number" msgid="277455349526398354">"7"</string>
-    <string name="dialpad_8_number" msgid="4764964930466503513">"8"</string>
-    <string name="dialpad_9_number" msgid="4023642800448238950">"9"</string>
 </resources>
diff --git a/InCallUI/src/com/android/incallui/AccelerometerListener.java b/InCallUI/src/com/android/incallui/AccelerometerListener.java
index 95f48e3..ca8e7d0 100644
--- a/InCallUI/src/com/android/incallui/AccelerometerListener.java
+++ b/InCallUI/src/com/android/incallui/AccelerometerListener.java
@@ -131,16 +131,19 @@
     }
 
     SensorEventListener mSensorListener = new SensorEventListener() {
+        @Override
         public void onSensorChanged(SensorEvent event) {
             onSensorEvent(event.values[0], event.values[1], event.values[2]);
         }
 
+        @Override
         public void onAccuracyChanged(Sensor sensor, int accuracy) {
             // ignore
         }
     };
 
     Handler mHandler = new Handler() {
+        @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
             case ORIENTATION_CHANGED:
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 81b9ff7..649176c 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -378,7 +378,7 @@
             mPrimaryName.setText(null);
         } else {
             mPrimaryName.setText(nameIsNumber
-                    ? PhoneNumberUtils.ttsSpanAsPhoneNumber(name)
+                    ? PhoneNumberUtils.getPhoneTtsSpannable(name)
                     : name);
 
             // Set direction of the name field
@@ -404,7 +404,7 @@
             mPhoneNumber.setText(null);
             mPhoneNumber.setVisibility(View.GONE);
         } else {
-            mPhoneNumber.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(number));
+            mPhoneNumber.setText(PhoneNumberUtils.getPhoneTtsSpannable(number));
             mPhoneNumber.setVisibility(View.VISIBLE);
             mPhoneNumber.setTextDirection(View.TEXT_DIRECTION_LTR);
         }
@@ -462,7 +462,7 @@
             mSecondaryCallConferenceCallIcon.setVisibility(isConference ? View.VISIBLE : View.GONE);
 
             mSecondaryCallName.setText(nameIsNumber
-                    ? PhoneNumberUtils.ttsSpanAsPhoneNumber(name)
+                    ? PhoneNumberUtils.getPhoneTtsSpannable(name)
                     : name);
             if (hasProvider) {
                 mSecondaryCallProviderLabel.setText(providerLabel);
diff --git a/InCallUI/src/com/android/incallui/CircularRevealActivity.java b/InCallUI/src/com/android/incallui/CircularRevealActivity.java
index 7a9b7cc..4dc58ba 100644
--- a/InCallUI/src/com/android/incallui/CircularRevealActivity.java
+++ b/InCallUI/src/com/android/incallui/CircularRevealActivity.java
@@ -59,9 +59,7 @@
         super.onCreate(savedInstanceState);
         overridePendingTransition(0, 0);
         setContentView(R.layout.outgoing_call_animation);
-        final Point touchPoint = getIntent().getParcelableExtra(TouchPointManager.TOUCH_POINT);
-        final MaterialPalette palette = getIntent().getParcelableExtra(EXTRA_THEME_COLORS);
-        setupDecorView(touchPoint, palette);
+        prepareDecorViewFromIntent(getIntent());
     }
 
     @Override
@@ -81,6 +79,18 @@
         super.onStop();
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        setIntent(intent);
+        prepareDecorViewFromIntent(intent);
+    }
+
+    private void prepareDecorViewFromIntent(Intent intent) {
+        final Point touchPoint = intent.getParcelableExtra(TouchPointManager.TOUCH_POINT);
+        final MaterialPalette palette = intent.getParcelableExtra(EXTRA_THEME_COLORS);
+        setupDecorView(touchPoint, palette);
+    }
+
     private void setupDecorView(final Point touchPoint, MaterialPalette palette) {
         final View view  = getWindow().getDecorView();
 
diff --git a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
index 7825dc1..62c1214 100644
--- a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -418,7 +418,7 @@
             numberTypeTextView.setVisibility(View.GONE);
         } else {
             numberTextView.setVisibility(View.VISIBLE);
-            numberTextView.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(callerNumber));
+            numberTextView.setText(PhoneNumberUtils.getPhoneTtsSpannable(callerNumber));
             numberTypeTextView.setVisibility(View.VISIBLE);
             numberTypeTextView.setText(callerNumberType);
         }
diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index da3f0cb..611815a 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -83,30 +83,6 @@
         }
     }
 
-    /**
-     * LinearLayout that always returns true for onHoverEvent callbacks, to fix
-     * problems with accessibility due to the dialpad overlaying other fragments.
-     */
-    public static class HoverIgnoringLinearLayout extends LinearLayout {
-
-        public HoverIgnoringLinearLayout(Context context) {
-            super(context);
-        }
-
-        public HoverIgnoringLinearLayout(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        public HoverIgnoringLinearLayout(Context context, AttributeSet attrs, int defStyle) {
-            super(context, attrs, defStyle);
-        }
-
-        @Override
-        public boolean onHoverEvent(MotionEvent event) {
-            return true;
-        }
-    }
-
     private EditText mDtmfDialerField;
 
     /** Hash Map to map a view id to a character*/
@@ -514,7 +490,7 @@
      * @param text Text to set Dialpad EditText to.
      */
     public void setDtmfText(String text) {
-        mDtmfDialerField.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(text));
+        mDtmfDialerField.setText(PhoneNumberUtils.getPhoneTtsSpannable(text));
     }
 
     @Override
diff --git a/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java b/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java
index 1f61070..d65580e 100644
--- a/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java
+++ b/InCallUI/src/com/android/incallui/InCallUIMaterialColorMapUtils.java
@@ -45,8 +45,8 @@
     }
 
     public static MaterialPalette getDefaultPrimaryAndSecondaryColors(Resources resources) {
-        final int primaryColor = resources.getColor(R.color.dialer_theme_color);
-        final int secondaryColor = resources.getColor(R.color.dialer_theme_color_dark);
+        final int primaryColor = resources.getColor(R.color.dialer_theme_color, null);
+        final int secondaryColor = resources.getColor(R.color.dialer_theme_color_dark, null);
         return new MaterialPalette(primaryColor, secondaryColor);
     }
 }
\ No newline at end of file
diff --git a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java
index e1edbc7..09b626a 100644
--- a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java
+++ b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java
@@ -62,7 +62,6 @@
         });
 
         final AlertDialog dialog = builder.create();
-        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
         return dialog;
     }
 
diff --git a/InCallUI/src/com/android/incallui/SmallerHitTargetTouchListener.java b/InCallUI/src/com/android/incallui/SmallerHitTargetTouchListener.java
deleted file mode 100644
index 83feaf5..0000000
--- a/InCallUI/src/com/android/incallui/SmallerHitTargetTouchListener.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.incallui;
-
-import android.view.MotionEvent;
-import android.view.View;
-
-/**
- * OnTouchListener used to shrink the "hit target" of some onscreen buttons.
- *
- * We do this for a few specific buttons which are vulnerable to
- * "false touches" because either (1) they're near the edge of the
- * screen and might be unintentionally touched while holding the
- * device in your hand, (2) they're in the upper corners and might
- * be touched by the user's ear before the prox sensor has a chance to
- * kick in, or (3) they are close to other buttons.
- */
-public class SmallerHitTargetTouchListener implements View.OnTouchListener {
-    private static final String TAG = "SmallerHitTargetTouchListener";
-
-    /**
-     * Edge dimensions where a touch does not register an action (in DIP).
-     */
-    private static final int HIT_TARGET_EDGE_IGNORE_DP_X = 30;
-    private static final int HIT_TARGET_EDGE_IGNORE_DP_Y = 10;
-    private static final int HIT_TARGET_MIN_SIZE_DP_X = HIT_TARGET_EDGE_IGNORE_DP_X * 3;
-    private static final int HIT_TARGET_MIN_SIZE_DP_Y = HIT_TARGET_EDGE_IGNORE_DP_Y * 3;
-
-    // True if the most recent DOWN event was a "hit".
-    boolean mDownEventHit;
-
-    /**
-     * Called when a touch event is dispatched to a view. This allows listeners to
-     * get a chance to respond before the target view.
-     *
-     * @return True if the listener has consumed the event, false otherwise.
-     *         (In other words, we return true when the touch is *outside*
-     *         the "smaller hit target", which will prevent the actual
-     *         button from handling these events.)
-     */
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        // if (DBG) log("SmallerHitTargetTouchListener: " + v + ", event " + event);
-
-        if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            // Note that event.getX() and event.getY() are already
-            // translated into the View's coordinates.  (In other words,
-            // "0,0" is a touch on the upper-left-most corner of the view.)
-            final int touchX = (int) event.getX();
-            final int touchY = (int) event.getY();
-
-            final int viewWidth = v.getWidth();
-            final int viewHeight = v.getHeight();
-
-            final float pixelDensity = v.getResources().getDisplayMetrics().density;
-            final int targetMinSizeX = (int) (HIT_TARGET_MIN_SIZE_DP_X * pixelDensity);
-            final int targetMinSizeY = (int) (HIT_TARGET_MIN_SIZE_DP_Y * pixelDensity);
-
-            int edgeIgnoreX = (int) (HIT_TARGET_EDGE_IGNORE_DP_X * pixelDensity);
-            int edgeIgnoreY = (int) (HIT_TARGET_EDGE_IGNORE_DP_Y * pixelDensity);
-
-            // If we are dealing with smaller buttons where the dead zone defined by
-            // HIT_TARGET_EDGE_IGNORE_DP_[X|Y] is too large.
-            if (viewWidth < targetMinSizeX || viewHeight < targetMinSizeY) {
-                // This really should not happen given our two use cases (as of this writing)
-                // in the call edge button and secondary calling card. However, we leave
-                // this is as a precautionary measure.
-                Log.w(TAG, "onTouch: view is too small for SmallerHitTargetTouchListener");
-                edgeIgnoreX = 0;
-                edgeIgnoreY = 0;
-            }
-
-            final int minTouchX = edgeIgnoreX;
-            final int maxTouchX = viewWidth - edgeIgnoreX;
-            final int minTouchY = edgeIgnoreY;
-            final int maxTouchY = viewHeight - edgeIgnoreY;
-
-            if (touchX < minTouchX || touchX > maxTouchX ||
-                    touchY < minTouchY || touchY > maxTouchY) {
-                // Missed!
-                // if (DBG) log("  -> MISSED!");
-                mDownEventHit = false;
-                return true;  // Consume this event; don't let the button see it
-            } else {
-                // Hit!
-                // if (DBG) log("  -> HIT!");
-                mDownEventHit = true;
-                return false;  // Let this event through to the actual button
-            }
-        } else {
-            // This is a MOVE, UP or CANCEL event.
-            //
-            // We only do the "smaller hit target" check on DOWN events.
-            // For the subsequent MOVE/UP/CANCEL events, we let them
-            // through to the actual button IFF the previous DOWN event
-            // got through to the actual button (i.e. it was a "hit".)
-            return !mDownEventHit;
-        }
-    }
-}