Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	res/values-fr/cm_strings.xml
	res/values-nl/cm_strings.xml

Change-Id: I6313434f76233a9c5c37edbf665033656dd305e2

17 files changed, 412 insertions, 18 deletions

diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index 4c442b08..932a9cdd 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -80,6 +80,7 @@
                           android:textColor="@color/incall_call_banner_text_color"
                           android:textAllCaps="true"
                           android:singleLine="true"
+                          android:layout_marginTop="1dp"
                           android:ellipsize="end"/>
 
                 <!-- Name (or the phone number, if we don't have a name to display). -->
@@ -122,6 +123,7 @@
                 <TextView android:id="@+id/elapsedTime"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
+                    android:layout_below="@id/subId"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 4678fb52..367eb035 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -53,4 +53,7 @@
   <string name="blacklist_dialog_message">Zukünftige Anrufe von <xliff:g id="number">%s</xliff:g> werden abgewiesen</string>
   <string name="sub_1">SIM 1</string>
   <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Lautstärkeanhebung ist aktiviert</string>
+  <string name="volume_boost_notify_disabled">Lautstärkeanhebung ist deaktiviert</string>
+  <string name="volume_boost_notify_unavailable">Erhöhte Lautstärke ist nicht verfügbar, wenn ein Headset genutzt wird</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index a85c1f58..ae7d531c 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -19,7 +19,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="callFailed_dialToUssd">Requête DIAL modifiée en requête USSD.</string>
   <string name="callFailed_dialToSs">Requête DIAL modifiée en requête SS.</string>
-  <string name="callFailed_dialToDial">Requête DIAL modifiée en DIAL  avec une numéro différent.</string>
+  <string name="callFailed_dialToDial">Requête DIAL modifiée en DIAL  avec un numéro différent.</string>
   <string name="callFailed_incoming_cb_enabled">L\'interlocuteur a interdit tous les appels entrants.</string>
   <string name="callUnanswered_forwarded">Appel sans réponse et transmis</string>
   <string name="modify_call_prompt_yes">Oui</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 2ee86754..18512439 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -17,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">בקשת חיוג שונתה לבקשת USSD.</string>
+  <string name="callFailed_dialToSs">בקשת חיוג שונתה לבקשת SS.</string>
+  <string name="callFailed_dialToDial">בקשת חיוג שונתה לחיוג עם מספר שונה.</string>
+  <string name="callFailed_incoming_cb_enabled">שיחת ועידה הגבילה את האפשרות לקבלת שיחות נכנסות.</string>
+  <string name="callUnanswered_forwarded">שיחה לא נענתה או הועברה</string>
+  <string name="modify_call_prompt_yes">כן</string>
+  <string name="modify_call_prompt_no">לא</string>
+  <string name="modify_call_failure_str">הבקשה לשינו שיחה נכשלה\n</string>
+  <string name="modify_call_option_title">בחר סוג שיחה</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">שידור וידאו</string>
+  <string name="modify_call_option_vt_rx">קבלת וידאו</string>
+  <string name="modify_call_option_voice">קול בלבד</string>
+  <string name="accept_modify_call_request_prompt">לקבל את הבקשה לשינוי השיחה?</string>
+  <string name="upgrade_vt_prompt">האם ברצונך לשנות את השיחה לשיחת וידאו?</string>
+  <string name="upgrade_vt_tx_prompt">האם ברצונך לשנות את השיחה לשידור וידאו בלבד?</string>
+  <string name="upgrade_vt_rx_prompt">האם ברצונך לאפשר קבלת שיחות וידאו בלבד?</string>
+  <string name="onscreenModifyCallText">הגדרות שיחה</string>
+  <string name="onscreenAddParticipant">הוסף משתתף</string>
+  <string name="description_target_answer_video">ענה עם וידאו</string>
+  <string name="description_target_answer_tx_video">ענה עם וידאו TX</string>
+  <string name="description_target_answer_rx_video">ענה עם וידאו RX</string>
+  <string name="description_direction_up_right">ימין למעלה</string>
+  <string name="description_direction_up_left">שמאל למעלה</string>
+  <string name="description_direction_down_left">שמאל למטה</string>
+  <string name="description_direction_down_right">ימין למטה</string>
   <string name="incall_call_type_label_forwarded">שיחה שהועברה</string>
   <string name="card_title_dialing_waiting">חיוג (ממתין\u2026)</string>
   <string name="card_title_waiting_call">שיחה ממתינה</string>
@@ -25,4 +51,9 @@
   <string name="call_recording_failed_message">נכשל בניגון הקלטה</string>
   <string name="blacklist_dialog_title">הוסף לרשימה שחורה</string>
   <string name="blacklist_dialog_message">שיחות עתידיות מ-<xliff:g id="number">%s</xliff:g> ייחסמו</string>
+  <string name="sub_1">סים 1</string>
+  <string name="sub_2">סים 2</string>
+  <string name="volume_boost_notify_enabled">הגברת עוצמת קול מופעלת</string>
+  <string name="volume_boost_notify_disabled">הגברת עוצמת קול כבויה</string>
+  <string name="volume_boost_notify_unavailable">הגברת ווליום אינה אפשרית בשימוש עם אוזניות</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 41f94c71..6e51382a 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -44,7 +44,7 @@
   <string name="description_direction_down_left">左下</string>
   <string name="description_direction_down_right">右下</string>
   <string name="incall_call_type_label_forwarded">転送された通話</string>
-  <string name="card_title_dialing_waiting">ダイアル中（待機中\u2026）</string>
+  <string name="card_title_dialing_waiting">ダイヤル中（待機中\u2026）</string>
   <string name="card_title_waiting_call">通話待機中</string>
   <string name="onscreenBlacklistText">ブラックリスト</string>
   <string name="onscreenRecordText">録音を開始/停止</string>
@@ -55,5 +55,5 @@
   <string name="sub_2">SIM 2</string>
   <string name="volume_boost_notify_enabled">音量ブーストは有効です</string>
   <string name="volume_boost_notify_disabled">音量ブーストは無効です</string>
-  <string name="volume_boost_notify_unavailable">ヘッドセット使用時は特別な音量の設定を利用することはできません</string>
+  <string name="volume_boost_notify_unavailable">ヘッドセット使用時は特別な音量機能を利用することはできません</string>
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 6bec44d3..e87d932c 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -17,8 +17,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL-Ufro gouf an eng USSD-Ufro ëmgewandelt.</string>
+  <string name="callFailed_dialToSs">DIAL-Ufro gouf an eng SS-Ufro ëmgewandelt.</string>
+  <string name="callFailed_dialToDial">DIAL-Ufro gouf an eng DIAL-Ufro mat anerer Nummer ëmgewandelt.</string>
+  <string name="callFailed_incoming_cb_enabled">De Kontakt huet all erakommend Uriff gespaart.</string>
+  <string name="callUnanswered_forwarded">Uruff net beäntwert a weidergeleet</string>
+  <string name="modify_call_prompt_yes">Jo</string>
+  <string name="modify_call_prompt_no">Nee</string>
+  <string name="modify_call_failure_str">Ännerung vum Urufftyp feelgeschloen\n</string>
+  <string name="modify_call_option_title">Urufftyp auswielen</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Video iwwerdroen</string>
+  <string name="modify_call_option_vt_rx">Video empfänken</string>
+  <string name="modify_call_option_voice">Just Stëmm</string>
+  <string name="upgrade_vt_prompt">Soll den Uruff an e Videouruff geännert ginn?</string>
+  <string name="upgrade_vt_tx_prompt">Soll den Uruff an e Videouruff (just schécken) geännert ginn?</string>
+  <string name="description_direction_up_right">Uewe riets</string>
+  <string name="description_direction_up_left">Uewe lénks</string>
+  <string name="description_direction_down_left">Ënne lénks</string>
   <string name="incall_call_type_label_forwarded">Weidergeleeten Uruff</string>
+  <string name="card_title_waiting_call">Waardenden Uruff</string>
   <string name="onscreenBlacklistText">Schwaarz Lëscht</string>
+  <string name="onscreenRecordText">Opnam starten/stoppen</string>
+  <string name="call_recording_failed_message">D\'Opnam vum Uruff konnt net gestart ginn</string>
   <string name="blacklist_dialog_title">Op d\'schwaarz Lëscht setzen</string>
   <string name="blacklist_dialog_message">An Zukunft ginn Uriff vun der Nummer <xliff:g id="number">%s</xliff:g> blockéiert</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 20397cc0..babb89d0 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -46,34 +46,50 @@
   <string name="ok">OK</string>
   <string name="audio_mode_speaker">Lautsprecher</string>
   <string name="audio_mode_earpiece">Telefonshörer</string>
+  <string name="audio_mode_wired_headset">Verkaabelte Kopfhörer</string>
   <string name="audio_mode_bluetooth">Bluetooth</string>
   <string name="wait_prompt_str">Dës Téin schécken?\n</string>
   <string name="pause_prompt_str">Téin gi geschéckt\n</string>
   <string name="send_button">Schécken</string>
   <string name="pause_prompt_yes">Jo</string>
   <string name="pause_prompt_no">Nee</string>
+  <string name="wild_prompt_str">Plazhalter ersetzen duerch</string>
   <string name="caller_manage_header">Konferenzuruff <xliff:g id="conf_call_time">%s</xliff:g></string>
+  <string name="voicemail_settings_number_label">Mailbox-Nummer</string>
   <string name="card_title_dialing">Gëtt gewielt</string>
   <string name="card_title_redialing">Gëtt nees probéiert</string>
   <string name="card_title_conf_call">Konferenzuruff</string>
   <string name="card_title_incoming_call">Erakommenden Uruff</string>
   <string name="card_title_call_ended">Uruff ofgeschloss</string>
   <string name="card_title_on_hold">Gehalen</string>
+  <string name="card_title_hanging_up">Uruff gëtt getrennt</string>
   <string name="card_title_in_call">An engem Gespréich</string>
   <string name="card_title_my_phone_number">Meng Nummer ass <xliff:g id="my_phone_number">%s</xliff:g></string>
   <string name="notification_dialing">Gëtt gewielt</string>
   <string name="notification_missedCallTitle">Verpassten Uruff</string>
+  <string name="notification_missedCallsTitle">Verpasst Uriff</string>
+  <string name="notification_missedCallsMsg"><xliff:g id="num_missed_calls">%s</xliff:g> verpasst Uriff</string>
   <string name="notification_missedCallTicker">Verpassten Uruff vum <xliff:g id="missed_call_from">%s</xliff:g></string>
   <string name="notification_ongoing_call">Uruff am Gaang</string>
   <string name="notification_on_hold">Gehalen</string>
   <string name="notification_incoming_call">Erakommenden Uruff</string>
+  <string name="notification_voicemail_title">Nei Mailbox-Opnam</string>
+  <string name="notification_voicemail_title_count">Nei Mailbox-Opnamen (<xliff:g id="count">%d</xliff:g>)</string>
+  <string name="notification_voicemail_text_format"><xliff:g id="voicemail_number">%s</xliff:g> uruffen</string>
+  <string name="notification_voicemail_no_vm_number">Mailbox-Nummer onbekannt</string>
+  <string name="notification_network_selection_title">Kee Service</string>
+  <string name="notification_network_selection_text">Ausgewielt Netzwierk (<xliff:g id="operator_name">%s</xliff:g>) net erreechbar</string>
+  <string name="notification_action_end_call">Anhänken</string>
   <string name="notification_missedCall_call_back">Zréckuruffen</string>
   <string name="notification_missedCall_message">Message schécken</string>
+  <string name="incall_error_power_off">Desaktivéier de Fligermodus, fir unzeruffen.</string>
   <string name="incall_error_emergency_only">Net am Netzwierk registréiert.</string>
+  <string name="incall_error_out_of_service">Mobilt Netzwierk net disponibel.</string>
   <string name="incall_error_no_phone_number_supplied">Uruff net geschéckt, keng gëlteg Nummer.</string>
   <string name="incall_error_call_failed">Uruff net ofgesat.</string>
   <string name="incall_status_dialed_mmi">MMI-Sequenz gëtt gestartet\u2026</string>
   <string name="incall_error_supp_service_unknown">Net ënnerstëtze Service.</string>
+  <string name="incall_error_supp_service_switch">Wiesselen tëscht Uriff net méiglech.</string>
   <string name="incall_error_supp_service_separate">Uruff kann net getrennt ginn</string>
   <string name="incall_error_supp_service_transfer">Uruff kann net iwwerdroe ginn.</string>
   <string name="incall_error_supp_service_conference">Keng Telefonskonferenz méiglech.</string>
@@ -85,11 +101,13 @@
   <string name="emergency_enable_radio_dialog_retry">Plaz ouni Netzofdeckung; gëtt nees probéiert\u2026</string>
   <string name="dial_emergency_error">Uruff net geschéckt. <xliff:g id="non_emergency_number">%s</xliff:g> ass keng Noutruffnummer!</string>
   <string name="dial_emergency_empty_error">Uruff net geschéckt. Wiel eng Noutruffnummer!</string>
+  <string name="dialerKeyboardHintText">D\'Tastatur benotze fir ze wielen</string>
   <string name="onscreenHoldText">Halen</string>
   <string name="onscreenEndCallText">Anhänken</string>
   <string name="onscreenShowDialpadText">Wieltasten</string>
   <string name="onscreenMuteText">Stomm</string>
   <string name="onscreenAddCallText">Uruff dobäisetzen</string>
+  <string name="onscreenMergeCallsText">Uriff verbannen</string>
   <string name="onscreenSwapCallsText">Auswiesselen</string>
   <string name="onscreenManageCallsText">Uriff geréieren</string>
   <string name="onscreenManageConferenceText">Konferenz geréieren</string>
@@ -98,17 +116,23 @@
   <string name="voicemail_provider">Service</string>
   <string name="voicemail_settings">Astellen</string>
   <string name="voicemail_number_not_set">&lt;Net definéiert&gt;</string>
+  <string name="other_settings">Aner Uruff-Astellungen</string>
+  <string name="calling_via_template">Uruff iwwer <xliff:g id="provider_name">%s</xliff:g></string>
   <string name="contactPhoto">Kontaktfoto</string>
   <string name="goPrivate">privat schwätzen</string>
   <string name="selectContact">Kontakt auswielen</string>
   <string name="respond_via_sms_canned_response_1">Ech kann elo net schwätzen. Ëm wat geet et?</string>
+  <string name="respond_via_sms_canned_response_2">Ech ruffe geschwënn zréck.</string>
   <string name="respond_via_sms_canned_response_3">Ech ruffe méi spéit zréck.</string>
+  <string name="respond_via_sms_canned_response_4">Kann elo net schwätzen. Telefonéiere mer méi spéit?</string>
   <string name="respond_via_sms_custom_message">Eegen Äntwert...</string>
   <string name="custom_message_cancel">Ofbriechen</string>
   <string name="custom_message_send">Schécken</string>
   <string name="respond_via_sms_setting_title">Séier Äntwerten</string>
   <string name="respond_via_sms_setting_title_2">Séier Äntwerten änneren</string>
   <string name="respond_via_sms_edittext_dialog_title">Séier Äntwert</string>
+  <string name="respond_via_sms_menu_reset_default_activity">Standard-App zrécksetzen</string>
+  <string name="respond_via_sms_confirmation_format">Message geschéckt un <xliff:g id="phone_number">%s</xliff:g>.</string>
   <string name="description_image_button_one">een</string>
   <string name="description_image_button_two">zwee</string>
   <string name="description_image_button_three">dräi</string>
@@ -123,12 +147,18 @@
   <string name="description_image_button_pound">Pond</string>
   <string name="description_dial_button">wielen</string>
   <string name="description_delete_button">Récktast</string>
+  <string name="accessibility_speakerphone_enabled">Lautsprecher aktivéiert.</string>
   <string name="accessibility_call_muted">Uruff stomm geschalt.</string>
   <string name="description_target_answer">Äntweren</string>
   <string name="description_target_send_sms">SMS schécken</string>
   <string name="description_target_decline">Refuséieren</string>
+  <string name="description_direction_up">Eropwësche fir \"<xliff:g id="target_description" example="Unlock">%s</xliff:g>\".</string>
+  <string name="description_direction_left">No lénks wësche fir \"<xliff:g id="target_description" example="Unlock">%s</xliff:g>\".</string>
+  <string name="description_direction_right">No riets wësche fir \"<xliff:g id="target_description" example="Unlock">%s</xliff:g>\".</string>
   <string name="voicemail_notification_vibrate_when_title" msgid="8731372580674292759">Vibréieren</string>
   <string name="voicemail_notification_vibarte_when_dialog_title" msgid="8995274609647451109">Vibréieren</string>
+  <string name="voicemail_notification_ringtone_title">Toun</string>
+  <string name="default_notification_description">Standard-Toun (<xliff:g id="default_sound_title">%1$s</xliff:g>)</string>
   <string name="ringtone_title" msgid="5379026328015343686">Schelltoun</string>
   <string name="vibrate_on_ring_title">Vibréiere beim Schellen</string>
   <string name="dtmf_tone_enable_title">Wieltastentéin</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
new file mode 100644
index 00000000..d2983ee1
--- /dev/null
+++ b/res/values-lv/cm_strings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2014 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL pieprasījums izmainīts uz USSD pieprasījumu.</string>
+  <string name="callFailed_dialToSs">DIAL pieprasījums izmainīts uz SS pieprasījumu.</string>
+  <string name="callFailed_dialToDial">DIAL pieprasījums izmainīts uz DIAL pieprasījumu ar citu numuru.</string>
+  <string name="callFailed_incoming_cb_enabled">Puse ir aizliegusi visus ienākošos zvanus.</string>
+  <string name="callUnanswered_forwarded">Neatbildēts zvans ir pārsūtīts</string>
+  <string name="modify_call_prompt_yes">Jā</string>
+  <string name="modify_call_prompt_no">Nē</string>
+  <string name="modify_call_failure_str">Pieprasījums mainīt zvanu neizdevās\n</string>
+  <string name="modify_call_option_title">Izvēlieties zvana veidu</string>
+  <string name="modify_call_option_vt">Video raidīšana</string>
+  <string name="modify_call_option_vt_tx">Raidīt video</string>
+  <string name="modify_call_option_vt_rx">Uztvert video</string>
+  <string name="modify_call_option_voice">Tikai balss</string>
+  <string name="accept_modify_call_request_prompt">Apstiprināt pieprasījumu mainīt zvanu?</string>
+  <string name="upgrade_vt_prompt">Vai vēlaties uzlabot zvana uz videozvanu?</string>
+  <string name="upgrade_vt_tx_prompt">Vai vēlaties uzlabot zvanu uz tikai video pārraides zvanu?</string>
+  <string name="upgrade_vt_rx_prompt">Vai vēlaties uzlabot zvanu uz tikai video uztveršanas zvanu?</string>
+  <string name="onscreenModifyCallText">Mainīt zvanu</string>
+  <string name="onscreenAddParticipant">Pievienot dalībnieku</string>
+  <string name="description_target_answer_video">Atbildēt ar video</string>
+  <string name="description_target_answer_tx_video">Atbildēt ar tikai raidīt video</string>
+  <string name="description_target_answer_rx_video">Atbildēt ar tikai uztvert video</string>
+  <string name="description_direction_up_right">Uz augšu pa labi</string>
+  <string name="description_direction_up_left">Uz augšu pa kreisi</string>
+  <string name="description_direction_down_left">Uz leju pa kreisi</string>
+  <string name="description_direction_down_right">Uz leju pa labi</string>
+  <string name="incall_call_type_label_forwarded">Pārsūtīts zvans</string>
+  <string name="card_title_dialing_waiting">Izsauc numuru (gaida\u2026)</string>
+  <string name="card_title_waiting_call">Gaida zvanu</string>
+  <string name="onscreenBlacklistText">Melnais saraksts</string>
+  <string name="onscreenRecordText">Sākt/beigt ierakstu</string>
+  <string name="call_recording_failed_message">Neizdevās sākt zvana ierakstu</string>
+  <string name="blacklist_dialog_title">Pievienot melnajam sarakstam</string>
+  <string name="blacklist_dialog_message">Turpmākie zvani no <xliff:g id="number">%s</xliff:g> tiks bloķēti</string>
+  <string name="sub_1">1. SIM</string>
+  <string name="sub_2">2. SIM</string>
+  <string name="volume_boost_notify_enabled">Skaļuma pastiprināšana ir ieslēgta</string>
+  <string name="volume_boost_notify_disabled">Skaļuma pastiprināšana ir izslēgta</string>
+  <string name="volume_boost_notify_unavailable">Izmantojot austiņas, papildu skaļums nav pieejams</string>
+</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index d3bb8c22..f68390d9 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -30,7 +30,7 @@
   <string name="modify_call_option_vt_tx">Video verzenden</string>
   <string name="modify_call_option_vt_rx">Video ontvangen</string>
   <string name="modify_call_option_voice">Alleen geluid</string>
-  <string name="accept_modify_call_request_prompt">Verzoek om gesprek wijzigen accepteren?</string>
+  <string name="accept_modify_call_request_prompt">Verzoek om gesprek te wijzigen accepteren?</string>
   <string name="upgrade_vt_prompt">Wilt u het gesprek opwaarderen naar een videogesprek?</string>
   <string name="upgrade_vt_tx_prompt">Wilt u het gesprek opwaarderen naar een alleen-verzenden-videogesprek?</string>
   <string name="upgrade_vt_rx_prompt">Wilt u het gesprek opwaarderen naar een alleen-ontvangen-videogesprek?</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 20333d8b..8b6c0671 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -17,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Żądanie wybierania numeru zostało zmodyfikowane na żądanie usługodawcy.</string>
+  <string name="callFailed_dialToSs">Żądanie wybierania numerów zmodyfikowane na żądanie usługodawcy.</string>
+  <string name="callFailed_dialToDial">Wniosek wybierania zmodyfikowany przez wybieranie z innego numeru.</string>
+  <string name="callFailed_incoming_cb_enabled">Strona posiada przedawnione wszystkie połączenia przychodzące.</string>
+  <string name="callUnanswered_forwarded">Połączenie nieodebrane i przekazane dalej</string>
+  <string name="modify_call_prompt_yes">Tak</string>
+  <string name="modify_call_prompt_no">Nie</string>
+  <string name="modify_call_failure_str">Żądanie modyfikacji połączenia nieudane\n</string>
+  <string name="modify_call_option_title">Wybierz typ połączenia</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmisja wideo</string>
+  <string name="modify_call_option_vt_rx">Odbiór wideo</string>
+  <string name="modify_call_option_voice">Tylko głos</string>
+  <string name="accept_modify_call_request_prompt">Zaakceptować żądanie modyfikacji połączenia?</string>
+  <string name="upgrade_vt_prompt">Czy chcesz aktywować funkcję wideorozmowy?</string>
+  <string name="upgrade_vt_tx_prompt">Czy chcesz aktywować funkcję wideorozmowy (tylko przesyłanie obrazu)?</string>
+  <string name="upgrade_vt_rx_prompt">Czy chcesz aktywować funkcję wideorozmowy (tylko odbieranie obrazu)?</string>
+  <string name="onscreenModifyCallText">Modyfikuj połączenie</string>
+  <string name="onscreenAddParticipant">Dodaj uczestnika</string>
+  <string name="description_target_answer_video">Odpowiedz z wideo</string>
+  <string name="description_target_answer_tx_video">Odpowiedz z wideo RX</string>
+  <string name="description_target_answer_rx_video">Odpowiedz z wideo TX</string>
+  <string name="description_direction_up_right">Do góry w prawo</string>
+  <string name="description_direction_up_left">Do góry w lewo</string>
+  <string name="description_direction_down_left">Na dół w lewo</string>
+  <string name="description_direction_down_right">Na dół w prawo</string>
   <string name="incall_call_type_label_forwarded">Połączenie przekazane</string>
   <string name="card_title_dialing_waiting">Wybieranie (proszę czekać\u2026)</string>
   <string name="card_title_waiting_call">Połączenie oczekujące</string>
@@ -27,5 +53,7 @@
   <string name="blacklist_dialog_message">Przyszłe połączenia od  <xliff:g id="number">%s</xliff:g> będą blokowane</string>
   <string name="sub_1">SIM 1</string>
   <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Zwiększona głośność jest włączona</string>
+  <string name="volume_boost_notify_disabled">Zwiększona głośność jest wyłączona</string>
   <string name="volume_boost_notify_unavailable">Wzmocniona głośność nie jest dostępna po podłączeniu zestawu słuchawkowego</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 8114ed2b..64034e63 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -17,6 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="modify_call_prompt_yes">Ja</string>
   <string name="incall_call_type_label_forwarded">Vidarebefordrat samtal</string>
   <string name="card_title_dialing_waiting">Ringer (väntar\u2026)</string>
   <string name="card_title_waiting_call">Väntande samtal</string>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
new file mode 100644
index 00000000..4277eff9
--- /dev/null
+++ b/res/values-ug/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+  ~ 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="phoneAppLabel" product="default">تېلېفون</string>
+  <string name="inCallLabel" translate="false">InCallUI</string>
+  <string name="onHold">كۈتۈپ تۇر</string>
+  <string name="unknown">يوچۇن</string>
+  <string name="private_num">شەخسىي نومۇر</string>
+  <string name="payphone">ئاممىۋى تېلېفون</string>
+  <string name="callFailed_userBusy">لىنىيە ئالدىراش</string>
+  <string name="callFailed_congestion">تور ئالدىراش</string>
+  <string name="callFailed_timedOut">ئىنكاس يوق، ۋاقىت ھالقىدى</string>
+  <string name="callFailed_server_unreachable">مۇلازىمېتىرغا يېتەلمەيدۇ</string>
+  <string name="callFailed_number_unreachable">تېلېفون ئۇلانمىدى</string>
+  <string name="callFailed_invalid_credentials">ئىشلەتكۈچى ئاتى ياكى ئىم خاتا</string>
+  <string name="callFailed_out_of_network">تور سىرتىدىن چاقىرىلغان</string>
+  <string name="callFailed_server_error">مۇلازىمېتىر خاتالىقى. سەل تۇرۇپ قايتا سىناڭ.</string>
+  <string name="callFailed_noSignal">سىگنال يوق</string>
+  <string name="callFailed_limitExceeded">ACM چېكىدىن ئېشىپ كەتتى</string>
+  <string name="callFailed_powerOff">سىمسىز ئالاقە تاقاق</string>
+  <string name="callFailed_simError">SIM يوق ياكى SIM خاتا</string>
+  <string name="callFailed_outOfService">مۇلازىمەت دائىرىسىدىن ھالقىدى</string>
+  <string name="callFailed_fdn_only">سىرتقى چاقىرىش مۇقىم چاقىرىشنىڭ چەكلىمىسىگە ئۇچرايدۇ.</string>
+  <string name="callFailed_cb_enabled">سۆزلىشىش چەكلىمىسى قوزغىتىلغاندا سىرتقا تېلېفون ئۇرالمايسىز.</string>
+  <string name="callFailed_dsac_restricted">ھەممە چاقىرىش زىيارەت تىزگىنىنىڭ چەكلىمىسىگە ئۇچرايدۇ.</string>
+  <string name="callFailed_dsac_restricted_emergency">جىددىي چاقىرىش زىيارەت تىزگىنىنىڭ چەكلىمىسىگە ئۇچرايدۇ.</string>
+  <string name="callFailed_dsac_restricted_normal">ئادەتتىكى چاقىرىش زىيارەت تىزگىنىنىڭ چەكلىمىسىگە ئۇچرايدۇ.</string>
+  <string name="callFailed_unobtainable_number">ئىناۋەتسىز نومۇر</string>
+  <string name="confCall">تېلېفون يىغىنى</string>
+  <string name="call_lost">چاقىرىش ئۈزۈلگەن.</string>
+  <string name="ok">جەزملە</string>
+  <string name="audio_mode_speaker">ياڭراتقۇ</string>
+  <string name="audio_mode_earpiece">تېلېفون تىڭشىغۇچ</string>
+  <string name="audio_mode_wired_headset">سىملىق تىڭشىغۇچ</string>
+  <string name="audio_mode_bluetooth">كۆكچىش</string>
+  <string name="wait_prompt_str">تۆۋەندىكى ئۈننى يوللامدۇ؟\n</string>
+  <string name="pause_prompt_str">ئۈن يوللاۋاتىدۇ\n</string>
+  <string name="send_button">يوللا</string>
+  <string name="pause_prompt_yes">ھەئە</string>
+  <string name="pause_prompt_no">ياق</string>
+  <string name="wild_prompt_str">ئورتاق بەلگە ئالماشتۇرىدىغىنى</string>
+  <string name="caller_manage_header">تېلېفون يىغىنى <xliff:g id="CONF_CALL_TIME">%s</xliff:g></string>
+  <string name="voicemail_settings_number_label">ئۈنخەت نومۇرى</string>
+  <string name="card_title_dialing">نومۇر بۇراۋاتىدۇ</string>
+  <string name="card_title_redialing">قايتا سىناۋاتىدۇ</string>
+  <string name="card_title_conf_call">تېلېفون يىغىنى</string>
+  <string name="card_title_incoming_call">چاقىرىلىش</string>
+  <string name="card_title_call_ended">سۆزلىشىش تامام</string>
+  <string name="card_title_on_hold">كۈتۈپ تۇر</string>
+  <string name="card_title_hanging_up">ئۈزۈۋاتىدۇ</string>
+  <string name="card_title_in_call">سۆزلىشىۋاتىدۇ</string>
+  <string name="card_title_my_phone_number">نومۇرۇم <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g></string>
+  <string name="notification_dialing">نومۇر بۇراۋاتىدۇ</string>
+  <string name="notification_missedCallTitle">سۆزلەشمىگەن چاقىرىش</string>
+  <string name="notification_missedCallsTitle">سۆزلەشمىگەن چاقىرىشلار</string>
+  <string name="notification_missedCallsMsg"><xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> سۆزلەشمىگەن چاقىرىش</string>
+  <string name="notification_missedCallTicker"><xliff:g id="MISSED_CALL_FROM">%s</xliff:g> دىن كەلگەن جاۋابسىز چاقىرىش</string>
+  <string name="notification_ongoing_call">نۆۋەتتىكى سۆزلىشىش</string>
+  <string name="notification_on_hold">كۈتۈپ تۇر</string>
+  <string name="notification_incoming_call">چاقىرىلىش</string>
+  <string name="notification_voicemail_title">يېڭى ئۈنخەت</string>
+  <string name="notification_voicemail_title_count">يېڭى ئۈنخەت(<xliff:g id="COUNT">%d</xliff:g>)</string>
+  <string name="notification_voicemail_text_format"><xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> نومۇر بۇرا</string>
+  <string name="notification_voicemail_no_vm_number">ئۈنخەت نومۇرى نامەلۇم</string>
+  <string name="notification_network_selection_title">مۇلازىمەت يوق</string>
+  <string name="notification_network_selection_text">تاللانغان تور(<xliff:g id="OPERATOR_NAME">%s</xliff:g>)نى ئىشلەتكىلى بولمايدۇ</string>
+  <string name="notification_action_end_call">ئۈز</string>
+  <string name="notification_missedCall_call_back">قايتۇرۇپ چاقىر</string>
+  <string name="notification_missedCall_message">خەت</string>
+  <string name="incall_error_power_off">تېلېفون ئۇرماقچى بولسىڭىز، ئايروپىلان ھالىتىنى تاقاڭ.</string>
+  <string name="incall_error_emergency_only">تورغا خەتلەتمىگەن.</string>
+  <string name="incall_error_out_of_service">كۆچمە تورنى ئىشلەتكىلى بولمايدۇ.</string>
+  <string name="incall_error_no_phone_number_supplied">چاقىرىش يوللانمىدى. كىرگۈزگەن نومۇر ئىناۋەتسىز.</string>
+  <string name="incall_error_call_failed">چاقىرىش يوللانمىدى.</string>
+  <string name="incall_status_dialed_mmi">MMI تەرتىپىنى قوزغىتىۋاتىدۇ…</string>
+  <string name="incall_error_supp_service_unknown">قوللىمايدىغان مۇلازىمەت.</string>
+  <string name="incall_error_supp_service_switch">سۆزلىشىشنى ئالماشتۇرالمايدۇ.</string>
+  <string name="incall_error_supp_service_separate">سۆزلىشىشنى ئايرىيالمايدۇ.</string>
+  <string name="incall_error_supp_service_transfer">سۆزلىشىشنى ئۇلاپ يۆتكىيەلمەيدۇ.</string>
+  <string name="incall_error_supp_service_conference">تېلېفون يىغىنى ئېلىپ بارالمايدۇ.</string>
+  <string name="incall_error_supp_service_reject">چاقىرىشنى رەت قىلالمايدۇ.</string>
+  <string name="incall_error_supp_service_hangup">چاقىرىشنى ئۈزۈۋېتەلمەيدۇ.</string>
+  <string name="incall_call_type_label_sip">ئىنتېرنېت چاقىرىشى</string>
+  <string name="emergency_enable_radio_dialog_title">جىددىي چاقىرىش</string>
+  <string name="emergency_enable_radio_dialog_message">سىمسىز ئالاقىنى ئېچىۋاتىدۇ…</string>
+  <string name="emergency_enable_radio_dialog_retry">مۇلازىمەت دائىرىسىدىن ھالقىدى، قايتا سىناۋاتىدۇ…</string>
+  <string name="dial_emergency_error">چاقىرىش يوللانمىدى، <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> جىددىي چاقىرىش نومۇرى ئەمەس!</string>
+  <string name="dial_emergency_empty_error">چاقىرىش يوللانمىدى. جىددىي چاقىرىش نومۇرىنى بۇراڭ!</string>
+  <string name="dialerKeyboardHintText">ھەرپتاختىدا نومۇر بۇراش</string>
+  <string name="onscreenHoldText">كۈتۈش</string>
+  <string name="onscreenEndCallText">تامام</string>
+  <string name="onscreenShowDialpadText">نومۇر تاختا</string>
+  <string name="onscreenMuteText">ئۈنسىز</string>
+  <string name="onscreenAddCallText">چاقىرىش قوش</string>
+  <string name="onscreenMergeCallsText">چاقىرىشنى بىرلەشتۈر</string>
+  <string name="onscreenSwapCallsText">ئالماشتۇر</string>
+  <string name="onscreenManageCallsText">چاقىرىش باشقۇرۇش</string>
+  <string name="onscreenManageConferenceText">تېلېفون يىغىنى باشقۇرۇش</string>
+  <string name="onscreenAudioText">ئۈن</string>
+  <string name="onscreenVideoCallText">سىنلىق چاقىر</string>
+  <string name="voicemail_provider">مۇلازىمەت</string>
+  <string name="voicemail_settings">تەڭشەك</string>
+  <string name="voicemail_number_not_set">‹تەڭشەلمىگەن›</string>
+  <string name="other_settings">باشقا چاقىرىش تەڭشىكى</string>
+  <string name="calling_via_template"><xliff:g id="PROVIDER_NAME">%s</xliff:g> ئارقىلىق چاقىرىۋاتىدۇ</string>
+  <string name="contactPhoto">ئالاقەداش سۈرىتى</string>
+  <string name="goPrivate">شەخسىي پاراڭ</string>
+  <string name="selectContact">ئالاقەداش تاللاڭ</string>
+  <string name="respond_via_sms_canned_response_1">ھازىر سۆزلىشىش بىئەپ. نېمە ئىش بولدى؟</string>
+  <string name="respond_via_sms_canned_response_2">ھازىرلا سىزگە تېلېفون قايتۇرىمەن.</string>
+  <string name="respond_via_sms_canned_response_3">سەل تۇرۇپ تېلېفون قايتۇرىمەن.</string>
+  <string name="respond_via_sms_canned_response_4">ھازىر سۆزلىشىش بىئەپ. سەل تۇرۇپ تېلېفون قىلامسىز؟</string>
+  <string name="respond_via_sms_custom_message">جاۋابنى ئۆزلۈكىدىن ياز…</string>
+  <string name="custom_message_cancel">ۋاز كەچ</string>
+  <string name="custom_message_send">يوللا</string>
+  <string name="respond_via_sms_setting_title">تېز جاۋابلار</string>
+  <string name="respond_via_sms_setting_title_2">تېز جاۋاب تەھرىر</string>
+  <string name="respond_via_sms_edittext_dialog_title">تېز جاۋاب</string>
+  <string name="respond_via_sms_menu_reset_default_activity">كۆڭۈلدىكى ئەپنى ئەسلىگە قايتۇر</string>
+  <string name="respond_via_sms_confirmation_format">ئۇچۇر <xliff:g id="PHONE_NUMBER">%s</xliff:g> غا يوللاندى.</string>
+  <string name="description_image_button_one">بىر</string>
+  <string name="description_image_button_two">ئىككى</string>
+  <string name="description_image_button_three">ئۈچ</string>
+  <string name="description_image_button_four">تۆت</string>
+  <string name="description_image_button_five">بەش</string>
+  <string name="description_image_button_six">ئالتە</string>
+  <string name="description_image_button_seven">يەتتە</string>
+  <string name="description_image_button_eight">سەككىز</string>
+  <string name="description_image_button_nine">توققۇز</string>
+  <string name="description_image_button_star">يۇلتۇز</string>
+  <string name="description_image_button_zero">نۆل</string>
+  <string name="description_image_button_pound">چارچاپ</string>
+  <string name="description_dial_button">نومۇر بۇراش</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="accessibility_speakerphone_enabled">ياڭراتقۇ قوزغىتىلدى</string>
+  <string name="accessibility_call_muted">چاقىرىش ئۈنسىز.</string>
+  <string name="description_target_answer">جاۋاب </string>
+  <string name="description_target_send_sms">قىسقا ئۇچۇر يوللا</string>
+  <string name="description_target_decline">قوشۇلما</string>
+  <string name="description_direction_up"><xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ئۈستىگە.</string>
+  <string name="description_direction_left"><xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> سولغا.</string>
+  <string name="description_direction_right"><xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ئوڭغا.</string>
+  <string name="voicemail_notification_vibrate_when_title" msgid="8731372580674292759">تىترەت</string>
+  <string name="voicemail_notification_vibarte_when_dialog_title" msgid="8995274609647451109">تىترەت</string>
+  <string name="voicemail_notification_ringtone_title">ئاۋاز</string>
+  <string name="default_notification_description">كۆڭۈلدىكى ئەسكەرتىش ئاۋازى (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)</string>
+  <string name="ringtone_title" msgid="5379026328015343686">تېلېفون قوڭغۇراق</string>
+  <string name="vibrate_on_ring_title">قوڭغۇراق چېلىنغاندا تىترەت</string>
+  <string name="dtmf_tone_enable_title">نومۇر تاختا مەشغۇلات ئاۋازى</string>
+  <string name="dial_pad_autocomplete">نومۇر تاختىنى ئۆزلۈكىدىن تاماملاش</string>
+  <string name="preference_category_ringtone">قوڭغۇراق ئاۋازى ۋە تىترىتىش</string>
+  <string name="manageConferenceLabel">تېلېفون يىغىنى باشقۇرۇش</string>
+  <string name="emergency_call_dialog_number_for_display">جىددىي قۇتقۇزۇش ياكى ساقچىغا مەلۇم قىلىش تېلېفۇنى</string>
+  <string name="dialpad_0_number">0</string>
+  <string name="dialpad_1_number">1</string>
+  <string name="dialpad_2_number">2</string>
+  <string name="dialpad_3_number">3</string>
+  <string name="dialpad_4_number">4</string>
+  <string name="dialpad_5_number">5</string>
+  <string name="dialpad_6_number">6</string>
+  <string name="dialpad_7_number">7</string>
+  <string name="dialpad_8_number">8</string>
+  <string name="dialpad_9_number">9</string>
+  <string name="dialpad_star_number">*</string>
+  <string name="dialpad_pound_number">#</string>
+  <string name="dialpad_0_letters">+</string>
+  <string name="dialpad_2_letters">ABC</string>
+  <string name="dialpad_3_letters">DEF</string>
+  <string name="dialpad_4_letters">GHI</string>
+  <string name="dialpad_5_letters">JKL</string>
+  <string name="dialpad_6_letters">MNO</string>
+  <string name="dialpad_7_letters">PQRS</string>
+  <string name="dialpad_8_letters">TUV</string>
+  <string name="dialpad_9_letters">WXYZ</string>
+</resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 46e7ed42..09a62bc0 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -17,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL-запит перетворений в USSD-запит.</string>
+  <string name="callFailed_dialToSs">DIAL-запит перетворений в SS-запит.</string>
+  <string name="callFailed_dialToDial">DIAL-запит перетворений в новий DIAL-запит з іншим номером.</string>
+  <string name="callFailed_incoming_cb_enabled">Учасник заборонив усі вхідні виклики.</string>
+  <string name="callUnanswered_forwarded">Виклик без відповіді і переадресований</string>
+  <string name="modify_call_prompt_yes">Так</string>
+  <string name="modify_call_prompt_no">Ні</string>
+  <string name="modify_call_failure_str">Запит на зміну типу виклику не вдався\n</string>
+  <string name="modify_call_option_title">Виберіть тип дзвінка</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Передача відео</string>
+  <string name="modify_call_option_vt_rx">Прийом відео</string>
+  <string name="modify_call_option_voice">Тільки передача голосу</string>
+  <string name="accept_modify_call_request_prompt">Прийняти запит на зміну типу виклику?</string>
+  <string name="upgrade_vt_prompt">Переключитися в режим відео-дзвінка?</string>
+  <string name="upgrade_vt_tx_prompt">Переключитися в режим відео-дзвінка? (Буде передаватися тільки зображення з камери цього пристрою)?</string>
+  <string name="upgrade_vt_rx_prompt">Переключитися в режим відео-дзвінка? (Буде показано тільки зображення з камери співрозмовника)?</string>
+  <string name="onscreenModifyCallText">Змінити виклик</string>
+  <string name="onscreenAddParticipant">Додати учасника</string>
+  <string name="description_target_answer_video">Відповісти з відео</string>
+  <string name="description_target_answer_tx_video">Відповісти з TX відео</string>
+  <string name="description_target_answer_rx_video">Відповісти з RX відео</string>
+  <string name="description_direction_up_right">Вгору праворуч</string>
+  <string name="description_direction_up_left">Вгору ліворуч</string>
+  <string name="description_direction_down_left">Вниз ліворуч</string>
+  <string name="description_direction_down_right">Вниз праворуч</string>
   <string name="incall_call_type_label_forwarded">Переадресований дзвінок</string>
   <string name="card_title_dialing_waiting">Набираю (очікую\u2026)</string>
   <string name="card_title_waiting_call">Очікується дзвінок</string>
@@ -25,4 +51,9 @@
   <string name="call_recording_failed_message">Не вдалося запустити запис дзвінка</string>
   <string name="blacklist_dialog_title">Додати в чорний список</string>
   <string name="blacklist_dialog_message">Майбутні дзвінки від <xliff:g id="number">%s</xliff:g> будуть заблоковані</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Підсиленя гучності увімкнено</string>
+  <string name="volume_boost_notify_disabled">Підсиленя гучності вимкнено</string>
+  <string name="volume_boost_notify_unavailable">Підсилення гучності недоступне під час використання гарнітури</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 155116ad..1faba760 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -18,6 +18,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="incall_call_type_label_forwarded">已轉發通話</string>
+  <string name="card_title_dialing_waiting">正在撥號（等待中\ u2026）</string>
   <string name="onscreenBlacklistText">黑名單</string>
+  <string name="onscreenRecordText">開始/停止錄音</string>
+  <string name="call_recording_failed_message">未能啟動通話錄音</string>
   <string name="blacklist_dialog_title">新增至黑名單</string>
+  <string name="sub_1">SIM 卡 1</string>
+  <string name="sub_2">SIM 卡 2</string>
 </resources>
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index cfa73fa6..234ab8e6 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -334,20 +334,20 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         showCallTypeLabel(isSipCall, isForwarded);
         MSimTelephonyManager tm = MSimTelephonyManager.getDefault();
-        int numPhones = tm.getPhoneCount();
 
         if (tm.isMultiSimEnabled() && !(tm.getMultiSimConfiguration()
                 == MSimTelephonyManager.MultiSimVariants.DSDA)) {
-            final String multiSimName = "perferred_name_sub";
             int subscription = getPresenter().getActiveSubscription();
 
             if ((subscription != -1) && (!isSipCall)
                     && MSimTelephonyManager.getDefault().getSimState(subscription)
                             != TelephonyManager.SIM_STATE_ABSENT) {
-                final String simName = Settings.System.getString(getActivity()
-                        .getContentResolver(), multiSimName + (subscription + 1));
+                final String simName = Settings.Global.getSimNameForSubscription(getActivity(),
+                        subscription, null);
                 showSubscriptionInfo(simName);
             }
+        }  else {
+            mSubscriptionId.setVisibility(View.GONE);
         }
 
         if (! isVideo) {
diff --git a/src/com/android/incallui/MSimInCallActivity.java b/src/com/android/incallui/MSimInCallActivity.java
index cb2ac5b6..e8c637d1 100644
--- a/src/com/android/incallui/MSimInCallActivity.java
+++ b/src/com/android/incallui/MSimInCallActivity.java
@@ -47,10 +47,6 @@ public class MSimInCallActivity extends InCallActivity {
     private Tab[] mDsdaTab = new Tab[TAB_COUNT_TWO];
     private boolean[] mDsdaTabAdd = {false, false};
 
-    private static final String[] MULTI_SIM_NAME = {
-        "perferred_name_sub1", "perferred_name_sub2"
-    };
-
     @Override
     protected void onCreate(Bundle icicle) {
         Log.d(this, "onCreate()...  this = " + this);
@@ -159,8 +155,7 @@ public class MSimInCallActivity extends InCallActivity {
                         .setBackground(icons.getDrawable(i));
 
                 ((TextView)mDsdaTabLayout[i].findViewById(R.id.tabSubText))
-                        .setText(Settings.System.getString(getContentResolver(),
-                                MULTI_SIM_NAME[i]));
+                        .setText(Settings.Global.getSimNameForSubscription(this, i, null));
             }
             mDsdaTab[i] = bar.newTab().setCustomView(mDsdaTabLayout[i])
                     .setTabListener(new TabListener(i));
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 7ecd732f..7f4a72a7 100755
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -46,8 +46,6 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
 
     private static final long IN_CALL_TIMEOUT = 1000L;
 
-    private static final String MULTI_SIM_NAME = "perferred_name_sub";
-
     private interface NotificationTimer {
         enum State {
             SCHEDULED,
@@ -333,8 +331,8 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         String contentText = mContext.getString(contentResId);
         if (contentResId == R.string.notification_dialing) {
             int sub = call.getSubscription();
-            String name = Settings.System.getString(mContext.getContentResolver(),
-                    MULTI_SIM_NAME + (sub + 1));
+            String name = Settings.Global.getSimNameForSubscription(mContext, sub,
+                    String.valueOf(sub));
             contentText +=  "  (" + name + ")";
         }
         builder.setContentText(contentText);