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

author: Brint E. Kriebel <bekit@cyngn.com> 2014-10-01 00:03:36 -0700
committer: Brint E. Kriebel <bekit@cyngn.com> 2014-10-01 00:03:36 -0700
commit: ef26510a17c1b8ada4f3c767d080ce486673efeb (patch)
tree: 9adc5d3df5cd63de0333261a417f7785f2398eff
parent: c386047a0efcafccf3ae9619e64bcd7be91d84a0 (diff)
parent: f8af471aff524c1b92dd81534df62e1042b63a93 (diff)
download: android_packages_apps_InCallUI-ef26510a17c1b8ada4f3c767d080ce486673efeb.tar.gz
android_packages_apps_InCallUI-ef26510a17c1b8ada4f3c767d080ce486673efeb.tar.bz2
android_packages_apps_InCallUI-ef26510a17c1b8ada4f3c767d080ce486673efeb.zip
115 files changed, 1510 insertions, 1989 deletions
diff --git a/res/drawable-mdpi/volume_in_boost_nor.png b/res/drawable-mdpi/volume_in_boost_nor.png
new file mode 100644
index 00000000..5a650929
--- /dev/null
+++ b/res/drawable-mdpi/volume_in_boost_nor.png
diff --git a/res/drawable-mdpi/volume_in_boost_sel.png b/res/drawable-mdpi/volume_in_boost_sel.png
new file mode 100644
index 00000000..620e8d26
--- /dev/null
+++ b/res/drawable-mdpi/volume_in_boost_sel.png
diff --git a/res/drawable-mdpi/volume_in_boost_unavailable.png b/res/drawable-mdpi/volume_in_boost_unavailable.png
new file mode 100644
index 00000000..816edd91
--- /dev/null
+++ b/res/drawable-mdpi/volume_in_boost_unavailable.png
diff --git a/res/drawable-xhdpi/volume_in_boost_nor.png b/res/drawable-xhdpi/volume_in_boost_nor.png
new file mode 100644
index 00000000..35f0f693
--- /dev/null
+++ b/res/drawable-xhdpi/volume_in_boost_nor.png
diff --git a/res/drawable-xhdpi/volume_in_boost_sel.png b/res/drawable-xhdpi/volume_in_boost_sel.png
new file mode 100644
index 00000000..c65346fd
--- /dev/null
+++ b/res/drawable-xhdpi/volume_in_boost_sel.png
diff --git a/res/drawable-xhdpi/volume_in_boost_unavailable.png b/res/drawable-xhdpi/volume_in_boost_unavailable.png
new file mode 100644
index 00000000..a5499658
--- /dev/null
+++ b/res/drawable-xhdpi/volume_in_boost_unavailable.png
diff --git a/res/drawable/volume_in_boost_nor.png b/res/drawable/volume_in_boost_nor.png
new file mode 100644
index 00000000..76cc19b4
--- /dev/null
+++ b/res/drawable/volume_in_boost_nor.png
diff --git a/res/drawable/volume_in_boost_sel.png b/res/drawable/volume_in_boost_sel.png
new file mode 100644
index 00000000..fd30dd94
--- /dev/null
+++ b/res/drawable/volume_in_boost_sel.png
diff --git a/res/drawable/volume_in_boost_unavailable.png b/res/drawable/volume_in_boost_unavailable.png
new file mode 100644
index 00000000..1eb0168e
--- /dev/null
+++ b/res/drawable/volume_in_boost_unavailable.png
diff --git a/res/layout-land/incall_screen_msim.xml b/res/layout-land/incall_screen_msim.xml
index cb70541c..45248185 100644
--- a/res/layout-land/incall_screen_msim.xml
+++ b/res/layout-land/incall_screen_msim.xml
@@ -51,7 +51,7 @@
 
     </RelativeLayout>
 
-    <fragment android:name="com.android.incallui.MsimAnswerFragment"
+    <fragment android:name="com.android.incallui.MSimAnswerFragment"
               android:id="@+id/answerFragment"
               android:layout_width="wrap_content"
               android:layout_height="match_parent"
diff --git a/res/layout/incall_screen_msim.xml b/res/layout/incall_screen_msim.xml
index be164a40..b42bd347 100644
--- a/res/layout/incall_screen_msim.xml
+++ b/res/layout/incall_screen_msim.xml
@@ -56,7 +56,7 @@
 
     </RelativeLayout>
 
-    <fragment android:name="com.android.incallui.MsimAnswerFragment"
+    <fragment android:name="com.android.incallui.MSimAnswerFragment"
               android:id="@+id/answerFragment"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index c6ee323c..4c442b08 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -1,20 +1,20 @@
 <?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
-  -->
+~ 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
+-->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
@@ -139,9 +139,17 @@
                     android:textColor="@color/incall_call_banner_text_color"
                     android:maxLines="1"
                     android:ellipsize="end" />
-
             </RelativeLayout>  <!-- End of call_banner -->
 
+            <!-- Volume boost and Volume enhancements in-call UI -->
+            <Button android:id="@+id/volumeBoost"
+                android:layout_below="@id/primary_call_banner"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:visibility="gone"
+                android:soundEffectsEnabled="false"
+                android:background="@drawable/volume_in_boost_nor"/>
+
             <LinearLayout android:id="@+id/supplementary_info_container"
                 style="@style/PrimaryCallInfoSupplementaryInfoContainer"
                 android:layout_width="match_parent"
diff --git a/res/values-af/cm_caf.xml b/res/values-af/cm_caf.xml
deleted file mode 100644
index 79843ab4..00000000
--- a/res/values-af/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">SKAKEL versoek verander na USSD versoek.</string>
-  <string name="callFailed_dialToSs">DIAL versoek verander na SS versoek.</string>
-  <string name="callFailed_dialToDial">SKAKEL versoek is verander om te skakel met \'n ander telefoonnommer.</string>
-  <string name="callFailed_incoming_cb_enabled">Party het alle inkomende oproepe verbied.</string>
-  <string name="callUnanswered_forwarded">Oproep was onbeantwoord en aangestuur</string>
-  <string name="modify_call_prompt_yes">Ja</string>
-  <string name="modify_call_prompt_no">Nee</string>
-  <string name="modify_call_failure_str">Versoek om oproep te verander het misluk\n</string>
-  <string name="modify_call_option_title">Kies tipe oproep</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Video uitsaai</string>
-  <string name="modify_call_option_vt_rx">Video ontvang</string>
-  <string name="modify_call_option_voice">Stem alleenlik</string>
-  <string name="accept_modify_call_request_prompt">Aanvaar versoek om oproep te verander?</string>
-  <string name="upgrade_vt_prompt">Wil jy graag die oproep na video-oproep opgradeer?</string>
-  <string name="upgrade_vt_tx_prompt">Wil jy graag die oproep alleenlik opgradeer na \'n video uitsaai oproep?</string>
-  <string name="upgrade_vt_rx_prompt">Wil jy graag die oproep alleenlik opgradeer na video ontvang oproep?</string>
-  <string name="vt_init_fail_str">Video uitsaai inisialisering het misluk. Afgradering oproep na VoLTE\n</string>
-  <string name="onscreenModifyCallText">Verander oproep</string>
-  <string name="onscreenAddParticipant">Voeg by deelnemer</string>
-  <string name="description_target_answer_video">Antwoord met video</string>
-  <string name="description_target_answer_tx_video">Antwoord met TX video</string>
-  <string name="description_target_answer_rx_video">Antwoord met RX video</string>
-  <string name="description_direction_up_right">Regs op</string>
-  <string name="description_direction_up_left">Links op</string>
-  <string name="description_direction_down_left">Links af</string>
-  <string name="description_direction_down_right">Regs af</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index b98f3214..08e383ec 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">SKAKEL versoek verander na USSD versoek.</string>
+  <string name="callFailed_dialToSs">DIAL versoek verander na SS versoek.</string>
+  <string name="callFailed_dialToDial">SKAKEL versoek is verander om te skakel met \'n ander telefoonnommer.</string>
+  <string name="callFailed_incoming_cb_enabled">Party het alle inkomende oproepe verbied.</string>
+  <string name="callUnanswered_forwarded">Oproep was onbeantwoord en aangestuur</string>
+  <string name="modify_call_prompt_yes">Ja</string>
+  <string name="modify_call_prompt_no">Nee</string>
+  <string name="modify_call_failure_str">Versoek om oproep te verander het misluk\n</string>
+  <string name="modify_call_option_title">Kies tipe oproep</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Video uitsaai</string>
+  <string name="modify_call_option_vt_rx">Ontvang video</string>
+  <string name="modify_call_option_voice">Stem alleenlik</string>
+  <string name="accept_modify_call_request_prompt">Aanvaar versoek om oproep te verander?</string>
+  <string name="upgrade_vt_prompt">Wil jy graag die oproep na video-oproep opgradeer?</string>
+  <string name="upgrade_vt_tx_prompt">Wil jy graag die oproep opgradeer na video uitsaai alleenlik oproep?</string>
+  <string name="upgrade_vt_rx_prompt">Wil jy graag die oproep opgradeer na video ontvang alleenlik oproep?</string>
+  <string name="onscreenModifyCallText">Verander oproep</string>
+  <string name="onscreenAddParticipant">Voeg by deelnemer</string>
+  <string name="description_target_answer_video">Antwoord met video</string>
+  <string name="description_target_answer_tx_video">Antwoord met TX video</string>
+  <string name="description_target_answer_rx_video">Antwoord met RX video</string>
+  <string name="description_direction_up_right">Regs op</string>
+  <string name="description_direction_up_left">Links op</string>
+  <string name="description_direction_down_left">Links af</string>
+  <string name="description_direction_down_right">Regs af</string>
   <string name="incall_call_type_label_forwarded">Aangestuurde oproep</string>
   <string name="card_title_dialing_waiting">Skakel (wag\u2026)</string>
   <string name="card_title_waiting_call">Gewagde oproep</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Kon nie oproep opname begin nie</string>
   <string name="blacklist_dialog_title">Voeg by swartlys</string>
   <string name="blacklist_dialog_message">Toekomstige oproepe van <xliff:g id="number">%s</xliff:g> sal geblokkeer word</string>
-  <string name="sub_no_sim">Geen SIM nie</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Volume inspuiting is geaktiveer</string>
+  <string name="volume_boost_notify_disabled">Volume inspuiting is gedeaktiveer</string>
+  <string name="volume_boost_notify_unavailable">Ekstra volume is nie beskikbaar met die gebruik van oorfone</string>
 </resources>
diff --git a/res/values-ar/cm_caf.xml b/res/values-ar/cm_caf.xml
deleted file mode 100644
index 4be565c0..00000000
--- a/res/values-ar/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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">فديو</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="vt_init_fail_str">إرسال الفيديو فشل تهيئة. تخفيض رتبة الدعوة إلى VoLTE\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 6364a7a8..1de4e4b6 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,4 @@
   <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_no_sim">لا SIM</string>
 </resources>
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
index f91176e8..aa17e17e 100644
--- a/res/values-az/cm_strings.xml
+++ b/res/values-az/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
diff --git a/res/values-ca/cm_caf.xml b/res/values-ca/cm_caf.xml
deleted file mode 100644
index 2882dd2a..00000000
--- a/res/values-ca/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Petició DIAL modificada cap a una petició USSD.</string>
-  <string name="callFailed_dialToSs">Petició DIAL modificada cap a una petició SS.</string>
-  <string name="callFailed_dialToDial">Petició DIAL modificada cap a una petició DIAL amb diferent número.</string>
-  <string name="callFailed_incoming_cb_enabled">La multi-conferència ha bloquejat totes les trucades entrants.</string>
-  <string name="callUnanswered_forwarded">Trucada no contestada i desviada</string>
-  <string name="modify_call_prompt_yes">Si</string>
-  <string name="modify_call_prompt_no">No</string>
-  <string name="modify_call_failure_str">La petició de modificar la trucada ha fallat\n</string>
-  <string name="modify_call_option_title">Selecciona el tipus de trucada</string>
-  <string name="modify_call_option_vt">Vídeotrucada</string>
-  <string name="modify_call_option_vt_tx">Transmetre vídeo</string>
-  <string name="modify_call_option_vt_rx">Rebre vídeo</string>
-  <string name="modify_call_option_voice">Només veu</string>
-  <string name="accept_modify_call_request_prompt">Acceptar la petició de modificar la trucada?</string>
-  <string name="upgrade_vt_prompt">Vols convertir la trucada en una videotrucada?</string>
-  <string name="upgrade_vt_tx_prompt">Vols convertir la trucada en una trucada de només transmissió de vídeo?</string>
-  <string name="upgrade_vt_rx_prompt">Vols convertir la trucada en una trucada de només recepció de vídeo?</string>
-  <string name="vt_init_fail_str">Ha fallat la inicialització de la transmissió de vídeo. Convertint trucada cap a VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modifica trucada</string>
-  <string name="onscreenAddParticipant">Afegeix participant</string>
-  <string name="description_target_answer_video">Respondre amb vídeo</string>
-  <string name="description_target_answer_tx_video">Respondre amb vídeo TX</string>
-  <string name="description_target_answer_rx_video">Respondre amb vídeo RX</string>
-  <string name="description_direction_up_right">Amunt a la dreta</string>
-  <string name="description_direction_up_left">Amunt a l\'esquerra</string>
-  <string name="description_direction_down_left">Avall a l\'esquerra</string>
-  <string name="description_direction_down_right">Avall a la dreta</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 84980e27..ad614e5b 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Petició DIAL modificada a una petició USSD.</string>
+  <string name="callFailed_dialToSs">Petició DIAL modificada a una petició SS.</string>
+  <string name="callFailed_dialToDial">Petició DIAL modificada a una petició DIAL amb un número diferent.</string>
+  <string name="callFailed_incoming_cb_enabled">La multi-conferència ha bloquejat totes les trucades entrants.</string>
+  <string name="callUnanswered_forwarded">Trucada no contestada i desviada</string>
+  <string name="modify_call_prompt_yes">Sí</string>
+  <string name="modify_call_prompt_no">No</string>
+  <string name="modify_call_failure_str">La petició de modificar la trucada ha fallat\n</string>
+  <string name="modify_call_option_title">Selecciona el tipus de trucada</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmissió de vídeo</string>
+  <string name="modify_call_option_vt_rx">Recepció de vídeo</string>
+  <string name="modify_call_option_voice">Només veu</string>
+  <string name="accept_modify_call_request_prompt">Vols acceptar la petició de modificar la trucada?</string>
+  <string name="upgrade_vt_prompt">Vols convertir la trucada en una vídeotrucada?</string>
+  <string name="upgrade_vt_tx_prompt">Vols convertir la trucada en una trucada de només transmissió de vídeo?</string>
+  <string name="upgrade_vt_rx_prompt">Vols convertir la trucada en una trucada de només recepció de vídeo?</string>
+  <string name="onscreenModifyCallText">Modifica trucada</string>
+  <string name="onscreenAddParticipant">Afegeix participant</string>
+  <string name="description_target_answer_video">Respondre amb vídeo</string>
+  <string name="description_target_answer_tx_video">Respondre amb vídeo TX</string>
+  <string name="description_target_answer_rx_video">Respondre amb vídeo RX</string>
+  <string name="description_direction_up_right">Amunt a la dreta</string>
+  <string name="description_direction_up_left">Amunt a l\'esquerra</string>
+  <string name="description_direction_down_left">Avall a l\'esquerra</string>
+  <string name="description_direction_down_right">Avall a la dreta</string>
   <string name="incall_call_type_label_forwarded">Trucada desviada</string>
   <string name="card_title_dialing_waiting">Trucant (esperant\u2026)</string>
   <string name="card_title_waiting_call">Trucada en espera</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">No s\'ha pogut començar la gravació de la trucada</string>
   <string name="blacklist_dialog_title">Afegeix a la llista negra</string>
   <string name="blacklist_dialog_message">Les futures trucades de <xliff:g id="number">%s</xliff:g> seran bloquejades</string>
-  <string name="sub_no_sim">Sense SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">L\'amplificació del volum està activada</string>
+  <string name="volume_boost_notify_disabled">L\'amplificació del volum està desactivada</string>
+  <string name="volume_boost_notify_unavailable">El volum extra no està disponible quan s\'utilitzen uns auriculars</string>
 </resources>
diff --git a/res/values-cs/cm_caf.xml b/res/values-cs/cm_caf.xml
deleted file mode 100644
index d608d330..00000000
--- a/res/values-cs/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Požadavek DIAL změněn na požadavek USSD.</string>
-  <string name="callFailed_dialToSs">Požadavek DIAL změněn na požadavek SS.</string>
-  <string name="callFailed_dialToDial">Požadavek DIAL změněn na požadavek DIAL s jiným číslem.</string>
-  <string name="callFailed_incoming_cb_enabled">Volaná skupina odmítá všechny příchozí hovory?</string>
-  <string name="callUnanswered_forwarded">Zavolat na nepřijaté a přposlané</string>
-  <string name="modify_call_prompt_yes">Ano</string>
-  <string name="modify_call_prompt_no">Ne</string>
-  <string name="modify_call_failure_str">Požadavek pro změnu volání selhal\n</string>
-  <string name="modify_call_option_title">Zvolte typ volání</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Vysílání videa</string>
-  <string name="modify_call_option_vt_rx">Příjem videa</string>
-  <string name="modify_call_option_voice">Pouze hlas</string>
-  <string name="accept_modify_call_request_prompt">Přijmout požadavek ke změně volání?</string>
-  <string name="upgrade_vt_prompt">Chcete povýšit volání na video volání?</string>
-  <string name="upgrade_vt_tx_prompt">Chcete povýšit volání na pouze vysílání videa?</string>
-  <string name="upgrade_vt_rx_prompt">Chcete povýšit volání na pouze přijímání videa?</string>
-  <string name="vt_init_fail_str">Selhalo vysílání videa. Volání se ponižuje na VoLTE\n</string>
-  <string name="onscreenModifyCallText">Změnit volání</string>
-  <string name="onscreenAddParticipant">Přidat účastníka</string>
-  <string name="description_target_answer_video">Přijmout s videem</string>
-  <string name="description_target_answer_tx_video">Přijmout s vysíláním videa</string>
-  <string name="description_target_answer_rx_video">Přijmout s přijímáním videa</string>
-  <string name="description_direction_up_right">Nahoru vpravo</string>
-  <string name="description_direction_up_left">Nahoru vlevo</string>
-  <string name="description_direction_down_left">Dolů vlevo</string>
-  <string name="description_direction_down_right">Dolů vpravo</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 462d5159..7f59a0ed 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Požadavek DIAL změněn na požadavek USSD.</string>
+  <string name="callFailed_dialToSs">Požadavek DIAL změněn na požadavek SS.</string>
+  <string name="callFailed_dialToDial">Požadavek DIAL změněn na požadavek DIAL s jiným číslem.</string>
+  <string name="callFailed_incoming_cb_enabled">Volaná skupina odmítá všechny příchozí hovory.</string>
+  <string name="callUnanswered_forwarded">Zavolat na nepřijaté a přesměrované</string>
+  <string name="modify_call_prompt_yes">Ano</string>
+  <string name="modify_call_prompt_no">Ne</string>
+  <string name="modify_call_failure_str">Požadavek pro změnu volání selhal\n</string>
+  <string name="modify_call_option_title">Vyberte typ volání</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Vysílání videa</string>
+  <string name="modify_call_option_vt_rx">Příjem videa</string>
+  <string name="modify_call_option_voice">Pouze hlas</string>
+  <string name="accept_modify_call_request_prompt">Přijmout požadavek ke změně volání?</string>
+  <string name="upgrade_vt_prompt">Chcete povýšit volání na video volání?</string>
+  <string name="upgrade_vt_tx_prompt">Chcete povýšit volání na pouze vysílání videa?</string>
+  <string name="upgrade_vt_rx_prompt">Chcete povýšit volání na pouze přijímání videa?</string>
+  <string name="onscreenModifyCallText">Změnit volání</string>
+  <string name="onscreenAddParticipant">Přidat účastníka</string>
+  <string name="description_target_answer_video">Přijmout s videem</string>
+  <string name="description_target_answer_tx_video">Přijmout s vysíláním videa</string>
+  <string name="description_target_answer_rx_video">Přijmout s přijímáním videa</string>
+  <string name="description_direction_up_right">Nahoru vpravo</string>
+  <string name="description_direction_up_left">Nahoru vlevo</string>
+  <string name="description_direction_down_left">Dolů vlevo</string>
+  <string name="description_direction_down_right">Dolů vpravo</string>
   <string name="incall_call_type_label_forwarded">Přesměrovaný hovor</string>
   <string name="card_title_dialing_waiting">Vytáčení (čekající\u2026)</string>
   <string name="card_title_waiting_call">Čekající hovor</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Selhalo spuštění pořízení záznamu</string>
   <string name="blacklist_dialog_title">Přidat na černou listinu</string>
   <string name="blacklist_dialog_message">Příští volání z čísla <xliff:g id="number">%s</xliff:g> bude blokováno</string>
-  <string name="sub_no_sim">Není SIM karta</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Zesílení zvuku aktivováno</string>
+  <string name="volume_boost_notify_disabled">Zesílení zvuku zrušeno</string>
+  <string name="volume_boost_notify_unavailable">Zvýšení hlasitosti není k dispozici při použití náhlavní sady</string>
 </resources>
diff --git a/res/values-da/cm_caf.xml b/res/values-da/cm_caf.xml
deleted file mode 100644
index 8476d213..00000000
--- a/res/values-da/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL-anmodning ændret til USSD-anmodning.</string>
-  <string name="callFailed_dialToSs">DIAL-anmodning ændret til SS-anmodning.</string>
-  <string name="callFailed_dialToDial">DIAL-anmodning ændret til DIAL-anmodning med et andet nummer.</string>
-  <string name="callFailed_incoming_cb_enabled">Part har udelukket alle indgående opkald.</string>
-  <string name="callUnanswered_forwarded">Opkald ubesvaret og videresendt</string>
-  <string name="modify_call_prompt_yes">Ja</string>
-  <string name="modify_call_prompt_no">Nej</string>
-  <string name="modify_call_failure_str">Anmodning om ændring af opkald mislykkedes\n</string>
-  <string name="modify_call_option_title">Vælg opkaldstype</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Send video</string>
-  <string name="modify_call_option_vt_rx">Modtag video</string>
-  <string name="modify_call_option_voice">Kun stemme</string>
-  <string name="accept_modify_call_request_prompt">Acceptér anmodning om ændring af opkald?</string>
-  <string name="upgrade_vt_prompt">Vil du opgradere opkaldet til et videoopkald?</string>
-  <string name="upgrade_vt_tx_prompt">Vil du opgradere opkaldet til et videoopkald, hvor du kun sender?</string>
-  <string name="upgrade_vt_rx_prompt">Vil du opgradere opkaldet til et videoopkald, hvor du kun modtager?</string>
-  <string name="vt_init_fail_str">Kunne ikke initialisere videooverførsel. Nedgraderer opkald til VoLTE\n</string>
-  <string name="onscreenModifyCallText">Ændre opkald</string>
-  <string name="onscreenAddParticipant">Tilføj deltager</string>
-  <string name="description_target_answer_video">Svar med video</string>
-  <string name="description_target_answer_tx_video">Svar med TX-video</string>
-  <string name="description_target_answer_rx_video">Svar med RX-video</string>
-  <string name="description_direction_up_right">Op og til højre</string>
-  <string name="description_direction_up_left">Op og til venstre</string>
-  <string name="description_direction_down_left">Ned og til venstre</string>
-  <string name="description_direction_down_right">Ned og til højre</string>
-  <string name="sub_1">SIM-kort 1</string>
-  <string name="sub_2">SIM-kort 2</string>
-</resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 48c278dd..db5aa8f3 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL-anmodning ændret til USSD-anmodning.</string>
+  <string name="callFailed_dialToSs">DIAL-anmodning ændret til SS-anmodning.</string>
+  <string name="callFailed_dialToDial">DIAL-anmodning ændret til DIAL-anmodning med et andet nummer.</string>
+  <string name="callFailed_incoming_cb_enabled">Part har udelukket alle indgående opkald.</string>
+  <string name="callUnanswered_forwarded">Opkald ubesvaret og videresendt</string>
+  <string name="modify_call_prompt_yes">Ja</string>
+  <string name="modify_call_prompt_no">Nej</string>
+  <string name="modify_call_failure_str">Anmodning om ændring af opkald mislykkedes\n</string>
+  <string name="modify_call_option_title">Vælg opkaldstype</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Send video</string>
+  <string name="modify_call_option_vt_rx">Modtag video</string>
+  <string name="modify_call_option_voice">Kun tale</string>
+  <string name="accept_modify_call_request_prompt">Acceptér anmodning om ændring af opkald?</string>
+  <string name="upgrade_vt_prompt">Vil du opgradere opkaldet til et videoopkald?</string>
+  <string name="upgrade_vt_tx_prompt">Vil du opgradere opkaldet til et videoopkald, hvor du kun sender?</string>
+  <string name="upgrade_vt_rx_prompt">Vil du opgradere opkaldet til et videoopkald, hvor du kun modtager?</string>
+  <string name="onscreenModifyCallText">Ændre opkald</string>
+  <string name="onscreenAddParticipant">Tilføj deltager</string>
+  <string name="description_target_answer_video">Svar med video</string>
+  <string name="description_target_answer_tx_video">Svar med TX-video</string>
+  <string name="description_target_answer_rx_video">Svar med RX-video</string>
+  <string name="description_direction_up_right">Op og til højre</string>
+  <string name="description_direction_up_left">Op og til venstre</string>
+  <string name="description_direction_down_left">Ned og til venstre</string>
+  <string name="description_direction_down_right">Ned og til højre</string>
   <string name="incall_call_type_label_forwarded">Viderestillet opkald</string>
   <string name="card_title_dialing_waiting">Ringer op (venter\u2026)</string>
   <string name="card_title_waiting_call">Ventende opkald</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Kunne ikke starte optagelse af opkald</string>
   <string name="blacklist_dialog_title">Føj til sortliste</string>
   <string name="blacklist_dialog_message">Fremtidige opkald fra <xliff:g id="number">%s</xliff:g> vil blive blokeret</string>
-  <string name="sub_no_sim">Intet SIM-kort</string>
+  <string name="sub_1">SIM-kort 1</string>
+  <string name="sub_2">SIM-kort 2</string>
+  <string name="volume_boost_notify_enabled">Lydstyrkeforøgelse er aktiveret</string>
+  <string name="volume_boost_notify_disabled">Lydstyrkeforøgelse er deaktiveret</string>
+  <string name="volume_boost_notify_unavailable">Forstærkning af lydstyrke er ikke tilgængelig, når du bruger headset</string>
 </resources>
diff --git a/res/values-de/cm_caf.xml b/res/values-de/cm_caf.xml
deleted file mode 100644
index 0a68b753..00000000
--- a/res/values-de/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL-Anfrage wurde in USSD-Anfrage umgewandelt.</string>
-  <string name="callFailed_dialToSs">DIAL-Anfrage wurde in SS-Anfrage umgewandelt.</string>
-  <string name="callFailed_dialToDial">DIAL-Anfrage wurde in DIAL-Anfrage mit anderer Nummer umgewandelt.</string>
-  <string name="callFailed_incoming_cb_enabled">Alle eingehenden Anrufe sind auf der Gegenstelle blockiert.</string>
-  <string name="callUnanswered_forwarded">Anruf unbeantwortet und weitergeleitet</string>
-  <string name="modify_call_prompt_yes">Ja</string>
-  <string name="modify_call_prompt_no">Nein</string>
-  <string name="modify_call_failure_str">Änderung des Anruftyps ist fehlgeschlagen\n</string>
-  <string name="modify_call_option_title">Anruftyp auswählen</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Video senden</string>
-  <string name="modify_call_option_vt_rx">Video empfangen</string>
-  <string name="modify_call_option_voice">Nur Sprache</string>
-  <string name="accept_modify_call_request_prompt">Eingehende Anfrage zur Änderung des Anruftyps akzeptieren?</string>
-  <string name="upgrade_vt_prompt">Soll der Anruf zu einem Videoanruf geändert werden?</string>
-  <string name="upgrade_vt_tx_prompt">Soll der Anruf zu einem nur sendenden Videoanruf geändert werden?</string>
-  <string name="upgrade_vt_rx_prompt">Soll der Anruf zu einem nur empfangenden Videoanruf geändert werden?</string>
-  <string name="vt_init_fail_str">Start der Videoverbindung fehlgeschlagen. Der Anruf wird zu einem Sprachanruf geändert\n</string>
-  <string name="onscreenModifyCallText">Anruftyp ändern</string>
-  <string name="onscreenAddParticipant">Teilnehmer hinzufügen</string>
-  <string name="description_target_answer_video">Mit Video antworten</string>
-  <string name="description_target_answer_tx_video">Mit Video antworten (nur senden)</string>
-  <string name="description_target_answer_rx_video">Mit Video antworten (nur empfangen)</string>
-  <string name="description_direction_up_right">Oben rechts</string>
-  <string name="description_direction_up_left">Oben links</string>
-  <string name="description_direction_down_left">Unten links</string>
-  <string name="description_direction_down_right">Unten rechts</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 566505cd..e3352b35 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,30 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL-Anfrage wurde in USSD-Anfrage umgewandelt.</string>
+  <string name="callFailed_dialToSs">DIAL-Anfrage wurde in SS-Anfrage umgewandelt.</string>
+  <string name="callFailed_dialToDial">DIAL-Anfrage wurde in DIAL-Anfrage mit anderer Nummer umgewandelt.</string>
+  <string name="callFailed_incoming_cb_enabled">Alle eingehenden Anrufe sind auf der Gegenstelle blockiert.</string>
+  <string name="callUnanswered_forwarded">Anruf unbeantwortet und weitergeleitet</string>
+  <string name="modify_call_prompt_yes">Ja</string>
+  <string name="modify_call_prompt_no">Nein</string>
+  <string name="modify_call_failure_str">Änderung des Anruftyps ist fehlgeschlagen\n</string>
+  <string name="modify_call_option_title">Anruftyp auswählen</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Video übertragen</string>
+  <string name="modify_call_option_vt_rx">Video empfangen</string>
+  <string name="modify_call_option_voice">Nur Sprache</string>
+  <string name="accept_modify_call_request_prompt">Eingehende Anfrage zur Änderung des Anruftyps akzeptieren?</string>
+  <string name="upgrade_vt_prompt">Soll der Anruf zu einem Videoanruf geändert werden?</string>
+  <string name="onscreenModifyCallText">Anruftyp ändern</string>
+  <string name="onscreenAddParticipant">Teilnehmer hinzufügen</string>
+  <string name="description_target_answer_video">Mit Video antworten</string>
+  <string name="description_target_answer_tx_video">Mit Video antworten (nur senden)</string>
+  <string name="description_target_answer_rx_video">Mit Video antworten (nur empfangen)</string>
+  <string name="description_direction_up_right">Oben rechts</string>
+  <string name="description_direction_up_left">Oben links</string>
+  <string name="description_direction_down_left">Unten links</string>
+  <string name="description_direction_down_right">Unten rechts</string>
   <string name="incall_call_type_label_forwarded">Weitergeleiteter Anruf</string>
   <string name="card_title_dialing_waiting">Rufaufbau (klopft an\u2026)</string>
   <string name="card_title_waiting_call">Wartender Anruf</string>
@@ -24,5 +49,6 @@
   <string name="call_recording_failed_message">Starten der Anrufaufzeichnung fehlgeschlagen</string>
   <string name="blacklist_dialog_title">Zur Sperrliste hinzufügen</string>
   <string name="blacklist_dialog_message">Zukünftige Anrufe von <xliff:g id="number">%s</xliff:g> werden abgewiesen</string>
-  <string name="sub_no_sim">Keine SIM-Karte</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
 </resources>
diff --git a/res/values-el/cm_caf.xml b/res/values-el/cm_caf.xml
deleted file mode 100644
index 9da69eaa..00000000
--- a/res/values-el/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">Αποτυχία αρχικοποίησης μετάδοσης βίντεο. Υποβάθμιση κλήσης σε VoLTE\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 47ad425d..bd27fe54 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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>
@@ -24,5 +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_no_sim">Χωρίς SIM</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-es-rXA/cm_caf.xml b/res/values-es-rXA/cm_caf.xml
deleted file mode 100644
index bf777df8..00000000
--- a/res/values-es-rXA/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Solicitú DIAL modificada a solicitú USSD.</string>
-  <string name="callFailed_dialToSs">Solicitú DIAL modificada a solicitú SS.</string>
-  <string name="callFailed_dialToDial">Solicitú DIAL modificada a DIAL con númberu distintu.</string>
-  <string name="callFailed_incoming_cb_enabled">La multi-conferencia tien prohibíes toles llamaes entrantes.</string>
-  <string name="callUnanswered_forwarded">Llamada non respondida y reunviada</string>
-  <string name="modify_call_prompt_yes">Sí</string>
-  <string name="modify_call_prompt_no">Non</string>
-  <string name="modify_call_failure_str">Falló la solicitú de modificación de llamada\n</string>
-  <string name="modify_call_option_title">Esbillar tipu de llamada</string>
-  <string name="modify_call_option_vt">Videollamada</string>
-  <string name="modify_call_option_vt_tx">Tresmisión de videu</string>
-  <string name="modify_call_option_vt_rx">Recepción de videu</string>
-  <string name="modify_call_option_voice">Namái voz</string>
-  <string name="accept_modify_call_request_prompt">¿Aceutar la solicitú de modificación de llamada?</string>
-  <string name="upgrade_vt_prompt">¿Quies convertir la llamada en videollamada?</string>
-  <string name="upgrade_vt_tx_prompt">¿Quies convertir la llamada en tresmisión de videu?</string>
-  <string name="upgrade_vt_rx_prompt">¿Quies convertir la llamada en recepción de videu?</string>
-  <string name="vt_init_fail_str">Falló l\'anicialización de videollamada. Convirtiendo llamada a VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modificar llamada</string>
-  <string name="onscreenAddParticipant">Amestar participante</string>
-  <string name="description_target_answer_video">Contestar con videollamada</string>
-  <string name="description_target_answer_tx_video">Contestar con tresmisión de videu</string>
-  <string name="description_target_answer_rx_video">Contestar con recepción de videu</string>
-  <string name="description_direction_up_right">Arriba a mandrecha</string>
-  <string name="description_direction_up_left">Arriba a manzorga</string>
-  <string name="description_direction_down_left">Abaxo a manzorga</string>
-  <string name="description_direction_down_right">Abaxo a mandrecha</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml
index 758b340b..5efee72d 100644
--- a/res/values-es-rXA/cm_strings.xml
+++ b/res/values-es-rXA/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Solicitú DIAL modificada a solicitú USSD.</string>
+  <string name="callFailed_dialToSs">Solicitú DIAL modificada a solicitú SS.</string>
+  <string name="callFailed_dialToDial">Solicitú DIAL modificada a DIAL con númberu distintu.</string>
+  <string name="callFailed_incoming_cb_enabled">La multi-conferencia tien prohibíes toles llamaes entrantes.</string>
+  <string name="callUnanswered_forwarded">Llamada non respondida y reunviada</string>
+  <string name="modify_call_prompt_yes">Sí</string>
+  <string name="modify_call_prompt_no">Non</string>
+  <string name="modify_call_failure_str">Falló la solicitú de modificación de llamada\n</string>
+  <string name="modify_call_option_title">Esbillar tipu de llamada</string>
+  <string name="modify_call_option_vt">Videollamada</string>
+  <string name="modify_call_option_vt_tx">Tresmisión de videu</string>
+  <string name="modify_call_option_vt_rx">Recepción de videu</string>
+  <string name="modify_call_option_voice">Namái voz</string>
+  <string name="accept_modify_call_request_prompt">¿Aceutar la solicitú de modificación de llamada?</string>
+  <string name="upgrade_vt_prompt">¿Quies convertir la llamada en videollamada?</string>
+  <string name="upgrade_vt_tx_prompt">¿Quies convertir la llamada en tresmisión de videu?</string>
+  <string name="upgrade_vt_rx_prompt">¿Quies convertir la llamada en recepción de videu?</string>
+  <string name="onscreenModifyCallText">Modificar llamada</string>
+  <string name="onscreenAddParticipant">Amestar participante</string>
+  <string name="description_target_answer_video">Contestar con videollamada</string>
+  <string name="description_target_answer_tx_video">Contestar con tresmisión de videu</string>
+  <string name="description_target_answer_rx_video">Contestar con recepción de videu</string>
+  <string name="description_direction_up_right">Arriba-mandrecha</string>
+  <string name="description_direction_up_left">Arriba-manzorga</string>
+  <string name="description_direction_down_left">Abaxo-manzorga</string>
+  <string name="description_direction_down_right">Abaxo-mandrecha</string>
   <string name="incall_call_type_label_forwarded">Llamada esviada</string>
   <string name="card_title_dialing_waiting">Llamando (esperando\u2026)</string>
   <string name="card_title_waiting_call">Llamada n\'espera</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Hebo un fallu al aniciar la grabación</string>
   <string name="blacklist_dialog_title">Amestar a la llista prieta</string>
   <string name="blacklist_dialog_message">Les llamaes de <xliff:g id="number">%s</xliff:g> van bloquiase</string>
-  <string name="sub_no_sim">Ensin tarxeta SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">L\'amplificación del volume ta activada</string>
+  <string name="volume_boost_notify_disabled">L\'amplificación del volume ta desactivada</string>
+  <string name="volume_boost_notify_unavailable">La potenciación del volume nun ta disponible cuando s\'usen auriculares</string>
 </resources>
diff --git a/res/values-es-rXA/strings.xml b/res/values-es-rXA/strings.xml
index 3724afb4..fb3db147 100644
--- a/res/values-es-rXA/strings.xml
+++ b/res/values-es-rXA/strings.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution, Apache license notifications and license are retained
-  ~ for attribution purposes only.
-
+<!--
   ~ Copyright (C) 2013 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values-es/cm_caf.xml b/res/values-es/cm_caf.xml
deleted file mode 100644
index 775d4c7e..00000000
--- a/res/values-es/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Solicitud DIAL modificada a solicitud USSD.</string>
-  <string name="callFailed_dialToSs">Solicitud DIAL modificada a solicitud SS.</string>
-  <string name="callFailed_dialToDial">Solicitud DIAL modificada a DIAL con número diferente.</string>
-  <string name="callFailed_incoming_cb_enabled">La conferencia tiene prohibidas todas las llamadas entrantes.</string>
-  <string name="callUnanswered_forwarded">Llamada no respondida y reenviada</string>
-  <string name="modify_call_prompt_yes">Sí</string>
-  <string name="modify_call_prompt_no">No</string>
-  <string name="modify_call_failure_str">Falló la solicitud de modificación de llamada\n</string>
-  <string name="modify_call_option_title">Seleccionar tipo de llamada</string>
-  <string name="modify_call_option_vt">Videollamada</string>
-  <string name="modify_call_option_vt_tx">Transmisión de vídeo</string>
-  <string name="modify_call_option_vt_rx">Recepción de vídeo</string>
-  <string name="modify_call_option_voice">Solo voz</string>
-  <string name="accept_modify_call_request_prompt">¿Aceptar la solicitud de modificación de llamada?</string>
-  <string name="upgrade_vt_prompt">¿Estás seguro de que quieres convertir la llamada en videollamada?</string>
-  <string name="upgrade_vt_tx_prompt">¿Estás seguro de que quieres convertir la llamada en transmisión de vídeo?</string>
-  <string name="upgrade_vt_rx_prompt">¿Estás seguro de que quieres convertir la llamada en recepción de vídeo?</string>
-  <string name="vt_init_fail_str">Falló la inicialización de videollamada. Convirtiendo llamada a VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modificar llamada</string>
-  <string name="onscreenAddParticipant">Añadir participante</string>
-  <string name="description_target_answer_video">Contestar con videollamada</string>
-  <string name="description_target_answer_tx_video">Contestar con transmisión de vídeo</string>
-  <string name="description_target_answer_rx_video">Contestar con recepción de vídeo</string>
-  <string name="description_direction_up_right">Arriba-derecha</string>
-  <string name="description_direction_up_left">Arriba-izquierda</string>
-  <string name="description_direction_down_left">Abajo-izquierda</string>
-  <string name="description_direction_down_right">Abajo-derecha</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index f68e6600..0678608d 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Solicitud DIAL modificada a solicitud USSD.</string>
+  <string name="callFailed_dialToSs">Solicitud DIAL modificada a solicitud SS.</string>
+  <string name="callFailed_dialToDial">Solicitud DIAL modificada a DIAL con número diferente.</string>
+  <string name="callFailed_incoming_cb_enabled">La conferencia tiene prohibidas todas las llamadas entrantes.</string>
+  <string name="callUnanswered_forwarded">Llamada no respondida y reenviada</string>
+  <string name="modify_call_prompt_yes">Sí</string>
+  <string name="modify_call_prompt_no">No</string>
+  <string name="modify_call_failure_str">Falló la solicitud de modificación de llamada\n</string>
+  <string name="modify_call_option_title">Seleccionar tipo de llamada</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmisión de vídeo</string>
+  <string name="modify_call_option_vt_rx">Recepción de vídeo</string>
+  <string name="modify_call_option_voice">Solo voz</string>
+  <string name="accept_modify_call_request_prompt">¿Aceptar la solicitud de modificación de llamada?</string>
+  <string name="upgrade_vt_prompt">¿Estás seguro de que quieres convertir la llamada en videollamada?</string>
+  <string name="upgrade_vt_tx_prompt">¿Estás seguro de que quieres convertir la llamada en transmisión de vídeo?</string>
+  <string name="upgrade_vt_rx_prompt">¿Estás seguro de que quieres convertir la llamada en recepción de vídeo?</string>
+  <string name="onscreenModifyCallText">Modificar llamada</string>
+  <string name="onscreenAddParticipant">Añadir participante</string>
+  <string name="description_target_answer_video">Contestar con videollamada</string>
+  <string name="description_target_answer_tx_video">Contestar con transmisión de vídeo</string>
+  <string name="description_target_answer_rx_video">Contestar con recepción de vídeo</string>
+  <string name="description_direction_up_right">Arriba-derecha</string>
+  <string name="description_direction_up_left">Arriba-izquierda</string>
+  <string name="description_direction_down_left">Abajo-izquierda</string>
+  <string name="description_direction_down_right">Abajo-derecha</string>
   <string name="incall_call_type_label_forwarded">Llamada desviada</string>
   <string name="card_title_dialing_waiting">Llamando (esperando\u2026)</string>
   <string name="card_title_waiting_call">Llamada en espera</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Ocurrió un error al iniciar la grabación</string>
   <string name="blacklist_dialog_title">Añadir a la lista negra</string>
   <string name="blacklist_dialog_message">Las llamadas de <xliff:g id="number">%s</xliff:g> serán bloqueadas</string>
-  <string name="sub_no_sim">Sin tarjeta SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Potenciación de volumen habilitada</string>
+  <string name="volume_boost_notify_disabled">Potenciación de volumen deshabilitada</string>
+  <string name="volume_boost_notify_unavailable">La potenciación del volumen no está disponible cuando se utilizan auriculares</string>
 </resources>
diff --git a/res/values-et/cm_strings.xml b/res/values-et/cm_strings.xml
index 753188a6..d847dcf9 100644
--- a/res/values-et/cm_strings.xml
+++ b/res/values-et/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -22,5 +23,4 @@
   <string name="onscreenBlacklistText">Must nimekiri</string>
   <string name="blacklist_dialog_title">Lisa musta nimekirja</string>
   <string name="blacklist_dialog_message">Tulevased kõned numbrilt <xliff:g id="number">%s</xliff:g> blokeeritakse</string>
-  <string name="sub_no_sim">SIM-kaart puudub</string>
 </resources>
diff --git a/res/values-eu/cm_caf.xml b/res/values-eu/cm_caf.xml
deleted file mode 100644
index 57f1050d..00000000
--- a/res/values-eu/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL eskaera USSD eskaerara eraldatu da.</string>
-  <string name="callFailed_dialToSs">DIAL eskaera SS eskaerara eraldatu da.</string>
-  <string name="callFailed_dialToDial">DIAL eskaera zenbaki ezberdindun DIAL eskaerara eraldatu da.</string>
-  <string name="callFailed_incoming_cb_enabled">Konferentziak sartzen diren dei guztiak debekatuta ditu.</string>
-  <string name="callUnanswered_forwarded">Erantzunik gabeko eta birbidalitako deia</string>
-  <string name="modify_call_prompt_yes">Bai</string>
-  <string name="modify_call_prompt_no">Ez</string>
-  <string name="modify_call_failure_str">Deiaren modifikaziorako eskaerak huts egin du\n</string>
-  <string name="modify_call_option_title">Aukeratu dei mota</string>
-  <string name="modify_call_option_vt">Bideodeia</string>
-  <string name="modify_call_option_vt_tx">Bideo igorpena</string>
-  <string name="modify_call_option_vt_rx">Bideo harrera</string>
-  <string name="modify_call_option_voice">Ahotsa bakarrik</string>
-  <string name="accept_modify_call_request_prompt">Deiaren aldaketa eskaera onartu?</string>
-  <string name="upgrade_vt_prompt">Ziur deia bideodei biurtu nahi duzula?</string>
-  <string name="upgrade_vt_tx_prompt">Ziur deia bideo igorpen bihurtu nahi duzula?</string>
-  <string name="upgrade_vt_rx_prompt">Ziur deia bideo harrera bihurtu nahi duzula?</string>
-  <string name="vt_init_fail_str">Bideodeiaren hastapenak huts egin du. Deia VoLTE bihurtzen\n</string>
-  <string name="onscreenModifyCallText">Deia eraldatu</string>
-  <string name="onscreenAddParticipant">Partaidea gehitu</string>
-  <string name="description_target_answer_video">Bideodei bidez erantzun</string>
-  <string name="description_target_answer_tx_video">Bideo transmisio bidez erantzun</string>
-  <string name="description_target_answer_rx_video">Bideo harrera bidez erantzun</string>
-  <string name="description_direction_up_right">Goi-eskuma</string>
-  <string name="description_direction_up_left">Goi-ezkerra</string>
-  <string name="description_direction_down_left">Behe-ezkerra</string>
-  <string name="description_direction_down_right">Behe-eskuma</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-eu/cm_strings.xml b/res/values-eu/cm_strings.xml
index 41c8cddb..49c71cfd 100644
--- a/res/values-eu/cm_strings.xml
+++ b/res/values-eu/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -22,5 +23,4 @@
   <string name="onscreenBlacklistText">Zerrenda beltza</string>
   <string name="blacklist_dialog_title">Zerrenda beltzera gehitu</string>
   <string name="blacklist_dialog_message">Etorkizunean <xliff:g id="number">%s</xliff:g> -(r)en deiak blokeatu egingo dira</string>
-  <string name="sub_no_sim">SIM-ik ez</string>
 </resources>
diff --git a/res/values-fi/cm_caf.xml b/res/values-fi/cm_caf.xml
deleted file mode 100644
index 4227ec2e..00000000
--- a/res/values-fi/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL-pyyntö muutettiin USSD-pyynnöksi.</string>
-  <string name="callFailed_dialToSs">DIAL-pyyntö muutettiin SS-pyynnöksi.</string>
-  <string name="callFailed_dialToDial">DIAL-pyyntö muutettiin DIAL-pyynnöksi eri numerolla.</string>
-  <string name="callFailed_incoming_cb_enabled">Ryhmä on estänyt kaikki tulevat puhelut.</string>
-  <string name="callUnanswered_forwarded">Puheluun ei vastattu ja se siirrettiin</string>
-  <string name="modify_call_prompt_yes">Kyllä</string>
-  <string name="modify_call_prompt_no">Ei</string>
-  <string name="modify_call_failure_str">Puhelun muuttamispyyntö epäonnistui\n</string>
-  <string name="modify_call_option_title">Valitse puhelun tyyppi</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Videon lähetys</string>
-  <string name="modify_call_option_vt_rx">Videon vastaanotto</string>
-  <string name="modify_call_option_voice">Vain ääni</string>
-  <string name="accept_modify_call_request_prompt">Hyväksy puhelun muuttamispyyntö?</string>
-  <string name="upgrade_vt_prompt">Haluatko vaihtaa puhelun videopuheluksi?</string>
-  <string name="upgrade_vt_tx_prompt">Haluatko vaihtaa puhelun videon lähetykseksi?</string>
-  <string name="upgrade_vt_rx_prompt">Haluatko vaihtaa puhelun videon vastaanottamiseksi?</string>
-  <string name="vt_init_fail_str">Videon välittäminen epäonnistui. Alennetaan puhelu VoLTE:ksi\n</string>
-  <string name="onscreenModifyCallText">Muokkaa puhelua</string>
-  <string name="onscreenAddParticipant">Lisää osallistuja</string>
-  <string name="description_target_answer_video">Vastaa videolla</string>
-  <string name="description_target_answer_tx_video">Vastaa TX-videolla</string>
-  <string name="description_target_answer_rx_video">Vastaa RX-videolla</string>
-  <string name="description_direction_up_right">Ylös oikealle</string>
-  <string name="description_direction_up_left">Ylös vasemmalle</string>
-  <string name="description_direction_down_left">Alas vasemmalle</string>
-  <string name="description_direction_down_right">Alas oikealle</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 0225dc16..874ab6bd 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL-pyyntö muutettiin USSD-pyynnöksi.</string>
+  <string name="callFailed_dialToSs">DIAL-pyyntö muutettiin SS-pyynnöksi.</string>
+  <string name="callFailed_dialToDial">DIAL-pyyntö muutettiin DIAL-pyynnöksi eri numerolla.</string>
+  <string name="callFailed_incoming_cb_enabled">Ryhmä on estänyt kaikki tulevat puhelut.</string>
+  <string name="callUnanswered_forwarded">Puheluun ei vastattu ja se siirrettiin</string>
+  <string name="modify_call_prompt_yes">Kyllä</string>
+  <string name="modify_call_prompt_no">Ei</string>
+  <string name="modify_call_failure_str">Puhelun muuttamispyyntö epäonnistui\n</string>
+  <string name="modify_call_option_title">Valitse puhelun tyyppi</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Videon lähetys</string>
+  <string name="modify_call_option_vt_rx">Videon vastaanotto</string>
+  <string name="modify_call_option_voice">Vain ääni</string>
+  <string name="accept_modify_call_request_prompt">Hyväksy puhelun muuttamispyyntö?</string>
+  <string name="upgrade_vt_prompt">Haluatko vaihtaa puhelun videopuheluksi?</string>
+  <string name="upgrade_vt_tx_prompt">Haluatko vaihtaa puhelun videon lähetykseksi?</string>
+  <string name="upgrade_vt_rx_prompt">Haluatko vaihtaa puhelun videon vastaanottamiseksi?</string>
+  <string name="onscreenModifyCallText">Muokkaa puhelua</string>
+  <string name="onscreenAddParticipant">Lisää osallistuja</string>
+  <string name="description_target_answer_video">Vastaa videolla</string>
+  <string name="description_target_answer_tx_video">Vastaa TX-videolla</string>
+  <string name="description_target_answer_rx_video">Vastaa RX-videolla</string>
+  <string name="description_direction_up_right">Ylös oikealle</string>
+  <string name="description_direction_up_left">Ylös vasemmalle</string>
+  <string name="description_direction_down_left">Alas vasemmalle</string>
+  <string name="description_direction_down_right">Alas oikealle</string>
   <string name="incall_call_type_label_forwarded">Siirretty puhelu</string>
   <string name="card_title_dialing_waiting">Soitetaan (odotetaan\u2026)</string>
   <string name="card_title_waiting_call">Odottava puhelu</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Puhelun nauhoitus epäonnistui</string>
   <string name="blacklist_dialog_title">Lisää mustalle listalle</string>
   <string name="blacklist_dialog_message">Tulevat puhelut numerosta <xliff:g id="number">%s</xliff:g> estetään</string>
-  <string name="sub_no_sim">Ei SIMiä</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Äänenvoimakkuuden tehostaminen käytössä</string>
+  <string name="volume_boost_notify_disabled">Äänenvoimakkuuden tehostaminen pois käytöstä</string>
+  <string name="volume_boost_notify_unavailable">Äänenvoimakkuuden tehostus ei käytettävissä kun kuulokkeet käytössä</string>
 </resources>
diff --git a/res/values-fr/cm_caf.xml b/res/values-fr/cm_caf.xml
deleted file mode 100644
index 3890624c..00000000
--- a/res/values-fr/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Requête d\'appel modifiée pour USSD.</string>
-  <string name="callFailed_dialToSs">Requête d\'appel modifiée pour SS.</string>
-  <string name="callFailed_dialToDial">Requête d\'appel modifiée pour appeler avec un numéro différent.</string>
-  <string name="callFailed_incoming_cb_enabled">Le groupe 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>
-  <string name="modify_call_prompt_no">Non</string>
-  <string name="modify_call_failure_str">La demande visant à modifier l\'appel à échouée\n</string>
-  <string name="modify_call_option_title">Sélectionnez le type d\'appel</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Transmission vidéo</string>
-  <string name="modify_call_option_vt_rx">Réception vidéo</string>
-  <string name="modify_call_option_voice">Voix uniquement</string>
-  <string name="accept_modify_call_request_prompt">Accepter la demande de modification d\'appel ?</string>
-  <string name="upgrade_vt_prompt">Voulez-vous passer de l\'appel vocal à l\'appel vidéo ?</string>
-  <string name="upgrade_vt_tx_prompt">Voulez-vous passer de l\'appel vidéo à l\'appel vocal ?</string>
-  <string name="upgrade_vt_rx_prompt">Voulez-vous recevoir uniquement l\'appel vocal à la place de l\'appel vidéo ?</string>
-  <string name="vt_init_fail_str">L\'initialisation de la transmission vidéo a échoué. Déclassement de l\'appel à VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modifiez l\'appel</string>
-  <string name="onscreenAddParticipant">Ajouter un participant</string>
-  <string name="description_target_answer_video">Répondre avec vidéo</string>
-  <string name="description_target_answer_tx_video">Répondre avec vidéo TX</string>
-  <string name="description_target_answer_rx_video">Répondre avec vidéo RX</string>
-  <string name="description_direction_up_right">En haut à droite</string>
-  <string name="description_direction_up_left">En haut à gauche</string>
-  <string name="description_direction_down_left">En bas à gauche</string>
-  <string name="description_direction_down_right">En bas à droite</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 79cf6289..48467893 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="modify_call_prompt_yes">Oui</string>
+  <string name="modify_call_prompt_no">Non</string>
+  <string name="onscreenModifyCallText">Modifier l\'appel</string>
+  <string name="onscreenAddParticipant">Ajouter un participant</string>
+  <string name="description_direction_up_right">En haut à droite</string>
   <string name="incall_call_type_label_forwarded">Appel renvoyé</string>
   <string name="card_title_dialing_waiting">Composition (patientez\u2026)</string>
   <string name="card_title_waiting_call">Appel en attente</string>
@@ -24,5 +30,6 @@
   <string name="call_recording_failed_message">Impossible de démarrer l\'enregistrement de l\'appel</string>
   <string name="blacklist_dialog_title">Ajouter à la liste noire</string>
   <string name="blacklist_dialog_message">Les futures appels de <xliff:g id="number">%s</xliff:g> seront bloqués</string>
-  <string name="sub_no_sim">Aucune carte SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
 </resources>
diff --git a/res/values-hu/cm_caf.xml b/res/values-hu/cm_caf.xml
deleted file mode 100644
index 5078d6af..00000000
--- a/res/values-hu/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL kérés módosítva USSD kérésre.</string>
-  <string name="callFailed_dialToSs">DIAL kérés módosítva SS kérésre.</string>
-  <string name="callFailed_dialToDial">DIAL kérés módosítva DIAL kérésre egy másik számmal.</string>
-  <string name="callFailed_incoming_cb_enabled">A fél elutasított minden bejövő hívást.</string>
-  <string name="callUnanswered_forwarded">Hívja a megválaszolatlan és továbbított</string>
-  <string name="modify_call_prompt_yes">Igen</string>
-  <string name="modify_call_prompt_no">Nem</string>
-  <string name="modify_call_failure_str">Kérés módosítása sikertelen\n</string>
-  <string name="modify_call_option_title">Válassza ki a hívás típusát</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Videótovábbítás</string>
-  <string name="modify_call_option_vt_rx">Videófogadás</string>
-  <string name="modify_call_option_voice">Csak hang</string>
-  <string name="accept_modify_call_request_prompt">Elfogadja a hívás módosítási kérelmet?</string>
-  <string name="upgrade_vt_prompt">Szeretné videó beszélgetésként folytatni a hívást?</string>
-  <string name="upgrade_vt_tx_prompt">Szeretné, ha a másik fél látná önt hívás közben?</string>
-  <string name="upgrade_vt_rx_prompt">Szeretné, ha csak ön látná a másik félt hívás közben?</string>
-  <string name="vt_init_fail_str">Sikertelen VT inicializálás. Hívás visszaminősítése VoLTE-re\n</string>
-  <string name="onscreenModifyCallText">Hívás módosítása</string>
-  <string name="onscreenAddParticipant">Résztvevő hozzáadása</string>
-  <string name="description_target_answer_video">Válasz videóval</string>
-  <string name="description_target_answer_tx_video">Válasz TX videóval</string>
-  <string name="description_target_answer_rx_video">Válasz RX videóval</string>
-  <string name="description_direction_up_right">Fel jobb</string>
-  <string name="description_direction_up_left">Fel bal</string>
-  <string name="description_direction_down_left">Le bal</string>
-  <string name="description_direction_down_right">Le jobb</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index c1c2889d..005e603d 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL kérés módosítva USSD kérésre.</string>
+  <string name="callFailed_dialToSs">DIAL kérés módosítva SS kérésre.</string>
+  <string name="callFailed_dialToDial">DIAL kérés módosítva DIAL kérésre egy másik számmal.</string>
+  <string name="callFailed_incoming_cb_enabled">A fél elutasított minden bejövő hívást.</string>
+  <string name="callUnanswered_forwarded">A hívás megválaszolatlan és továbbított</string>
+  <string name="modify_call_prompt_yes">Igen</string>
+  <string name="modify_call_prompt_no">Nem</string>
+  <string name="modify_call_failure_str">Kérés módosítása sikertelen\n</string>
+  <string name="modify_call_option_title">Válassza ki a hívás típusát</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Videótovábbítás</string>
+  <string name="modify_call_option_vt_rx">Videófogadás</string>
+  <string name="modify_call_option_voice">Csak hang</string>
+  <string name="accept_modify_call_request_prompt">Elfogadja a hívás módosítási kérelmet?</string>
+  <string name="upgrade_vt_prompt">Szeretné videó beszélgetésként folytatni a hívást?</string>
+  <string name="upgrade_vt_tx_prompt">Szeretné, ha a másik fél látná önt hívás közben?</string>
+  <string name="upgrade_vt_rx_prompt">Szeretné, ha csak ön látná a másik félt hívás közben?</string>
+  <string name="onscreenModifyCallText">Hívás módosítása</string>
+  <string name="onscreenAddParticipant">Résztvevő hozzáadása</string>
+  <string name="description_target_answer_video">Válasz videóval</string>
+  <string name="description_target_answer_tx_video">Válasz TX videóval</string>
+  <string name="description_target_answer_rx_video">Válasz RX videóval</string>
+  <string name="description_direction_up_right">Fel jobb</string>
+  <string name="description_direction_up_left">Fel bal</string>
+  <string name="description_direction_down_left">Le bal</string>
+  <string name="description_direction_down_right">Le jobb</string>
   <string name="incall_call_type_label_forwarded">Átirányított hívás</string>
   <string name="card_title_dialing_waiting">Tárcsázás (várakozás\u2026)</string>
   <string name="card_title_waiting_call">Várakozó hívás</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Nem sikerült a felvételt elindítani</string>
   <string name="blacklist_dialog_title">Hozzáadás a tiltólistához</string>
   <string name="blacklist_dialog_message"><xliff:g id="number">%s</xliff:g> hívásai blokkolva lesznek</string>
-  <string name="sub_no_sim">Nincs SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Extra hangerő engedélyezve</string>
+  <string name="volume_boost_notify_disabled">Extra hangerő letiltva</string>
+  <string name="volume_boost_notify_unavailable">Extra hangerő nem elérhető fejhallgató használatakor</string>
 </resources>
diff --git a/res/values-in/cm_caf.xml b/res/values-in/cm_caf.xml
deleted file mode 100644
index d7058cda..00000000
--- a/res/values-in/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Permintaan DIAL dimodifikasi ke permintaan USSD.</string>
-  <string name="callFailed_dialToSs">Permintaan DIAL dimodifikasi ke permintaan SS.</string>
-  <string name="callFailed_dialToDial">Permintaan DIAL dimodifikasi ke DIAL dengan nomor yang berbeda.</string>
-  <string name="callFailed_incoming_cb_enabled">Party telah melarang semua panggilan masuk.</string>
-  <string name="callUnanswered_forwarded">Panggilan tidak terjawab dan diteruskan</string>
-  <string name="modify_call_prompt_yes">Ya</string>
-  <string name="modify_call_prompt_no">Tidak</string>
-  <string name="modify_call_failure_str">Permintaan untuk memodifikasi panggilan gagal\n</string>
-  <string name="modify_call_option_title">Pilih jenis panggilan</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Video dikirim</string>
-  <string name="modify_call_option_vt_rx">Video diterima</string>
-  <string name="modify_call_option_voice">Hanya suara</string>
-  <string name="accept_modify_call_request_prompt">Terima permintaan untuk memodifikasi panggilan?</string>
-  <string name="upgrade_vt_prompt">Apakah anda ingin meng-upgrade panggilan menjadi panggilan video?</string>
-  <string name="upgrade_vt_tx_prompt">Apakah anda ingin meng-upgrade panggilan menjadi panggilan hanya kirim-video?</string>
-  <string name="upgrade_vt_rx_prompt">Apakah anda ingin meng-upgrade panggilan menjadi panggilan hanya terima-video?</string>
-  <string name="vt_init_fail_str">Inisialisasi video kirim gagal. Menurunkan panggilan ke VoLTE\n</string>
-  <string name="onscreenModifyCallText">Ubah panggilan</string>
-  <string name="onscreenAddParticipant">Tambah peserta</string>
-  <string name="description_target_answer_video">Jawab dengan video</string>
-  <string name="description_target_answer_tx_video">Jawab dengan TX video</string>
-  <string name="description_target_answer_rx_video">Jawab dengan RX video</string>
-  <string name="description_direction_up_right">Atas kanan</string>
-  <string name="description_direction_up_left">Atas kiri</string>
-  <string name="description_direction_down_left">Bawah kiri</string>
-  <string name="description_direction_down_right">Bawah kanan</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 3dae73e2..0a0e2ea5 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Permintaan DIAL dimodifikasi ke permintaan USSD.</string>
+  <string name="callFailed_dialToSs">Permintaan DIAL dimodifikasi ke permintaan SS.</string>
+  <string name="callFailed_dialToDial">Permintaan DIAL dimodifikasi ke DIAL dengan nomor yang berbeda.</string>
+  <string name="callFailed_incoming_cb_enabled">Party telah melarang semua panggilan masuk.</string>
+  <string name="callUnanswered_forwarded">Panggilan tidak terjawab dan dialihkan</string>
+  <string name="modify_call_prompt_yes">Ya</string>
+  <string name="modify_call_prompt_no">Tidak</string>
+  <string name="modify_call_failure_str">Permintaan untuk memodifikasi panggilan gagal\n</string>
+  <string name="modify_call_option_title">Pilih jenis panggilan</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmisi video</string>
+  <string name="modify_call_option_vt_rx">Menerima video</string>
+  <string name="modify_call_option_voice">Hanya suara</string>
+  <string name="accept_modify_call_request_prompt">Terima permintaan untuk memodifikasi panggilan?</string>
+  <string name="upgrade_vt_prompt">Apakah anda ingin mengubah panggilan menjadi panggilan video?</string>
+  <string name="upgrade_vt_tx_prompt">Apakah anda ingin mengubah panggilan menjadi panggilan kirim video saja?</string>
+  <string name="upgrade_vt_rx_prompt">Apakah anda ingin mengubah panggilan menjadi panggilan terima video saja?</string>
+  <string name="onscreenModifyCallText">Ubah panggilan</string>
+  <string name="onscreenAddParticipant">Tambah peserta</string>
+  <string name="description_target_answer_video">Jawab dengan video</string>
+  <string name="description_target_answer_tx_video">Jawab dengan video TX</string>
+  <string name="description_target_answer_rx_video">Jawab dengan video RX</string>
+  <string name="description_direction_up_right">Kanan atas</string>
+  <string name="description_direction_up_left">Kiri atas</string>
+  <string name="description_direction_down_left">Kiri bawah</string>
+  <string name="description_direction_down_right">Kanan bawah</string>
   <string name="incall_call_type_label_forwarded">Panggilan diteruskan</string>
   <string name="card_title_dialing_waiting">Memanggil (menunggu\u2026)</string>
   <string name="card_title_waiting_call">Panggilan tunggu</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Gagal memulai rekaman panggilan</string>
   <string name="blacklist_dialog_title">Tambahkan ke blacklist</string>
   <string name="blacklist_dialog_message">Panggilan mendatang dari <xliff:g id="number">%s</xliff:g> akan diblokir</string>
-  <string name="sub_no_sim">Tidak ada SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Peningkatan volume diaktifkan</string>
+  <string name="volume_boost_notify_disabled">Peningkatan volume dinonaktifkan</string>
+  <string name="volume_boost_notify_unavailable">Volume tambahan tidak tersedia ketika menggunakan headset</string>
 </resources>
diff --git a/res/values-it/cm_caf.xml b/res/values-it/cm_caf.xml
deleted file mode 100644
index ab59c05d..00000000
--- a/res/values-it/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Richiesta DIAL modificata in richiesta USSD.</string>
-  <string name="callFailed_dialToSs">Richiesta DIAL modificata in richiesta SS.</string>
-  <string name="callFailed_dialToDial">Richiesta DIAL modificata in richiesta DIAL con numero differente.</string>
-  <string name="callFailed_incoming_cb_enabled">Il corrispondente ha bloccato tutte le chiamate in arrivo.</string>
-  <string name="callUnanswered_forwarded">Chiamata non risposta e inoltrata</string>
-  <string name="modify_call_prompt_yes">Si</string>
-  <string name="modify_call_prompt_no">No</string>
-  <string name="modify_call_failure_str">Richiesta di modifica della chiamata non riuscita\n</string>
-  <string name="modify_call_option_title">Seleziona il tipo di chiamata</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Trasmissione video</string>
-  <string name="modify_call_option_vt_rx">Ricezione video</string>
-  <string name="modify_call_option_voice">Solo voce</string>
-  <string name="accept_modify_call_request_prompt">Accettare la richiesta di modifica della chiamata?</string>
-  <string name="upgrade_vt_prompt">Modificare la chiamata voce in chiamata video?</string>
-  <string name="upgrade_vt_tx_prompt">Modificare la chiamata voce in chiamata video (per la sola trasmissione)?</string>
-  <string name="upgrade_vt_rx_prompt">Modificare la chiamata voce in chiamata video (per la sola ricezione)?</string>
-  <string name="vt_init_fail_str">Inizializzazione trasmissione video non riuscita. Declassamento chiamata a VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modifica chiamata</string>
-  <string name="onscreenAddParticipant">Aggiungi partecipante</string>
-  <string name="description_target_answer_video">Rispondi con video</string>
-  <string name="description_target_answer_tx_video">Rispondere con video TX</string>
-  <string name="description_target_answer_rx_video">Rispondere con video RX</string>
-  <string name="description_direction_up_right">Alto destra</string>
-  <string name="description_direction_up_left">Alto sinistra</string>
-  <string name="description_direction_down_left">Basso sinistra</string>
-  <string name="description_direction_down_right">Basso destra</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 9610e837..0584d6c2 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Richiesta DIAL modificata in richiesta USSD.</string>
+  <string name="callFailed_dialToSs">Richiesta DIAL modificata in richiesta SS.</string>
+  <string name="callFailed_dialToDial">Richiesta DIAL modificata in richiesta DIAL con un numero differente.</string>
+  <string name="callFailed_incoming_cb_enabled">Il corrispondente ha bloccato tutte le chiamate in arrivo.</string>
+  <string name="callUnanswered_forwarded">Chiamata non risposta e inoltrata</string>
+  <string name="modify_call_prompt_yes">Si</string>
+  <string name="modify_call_prompt_no">No</string>
+  <string name="modify_call_failure_str">Richiesta di modifica della chiamata fallita\n</string>
+  <string name="modify_call_option_title">Seleziona il tipo di chiamata</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Trasmissione video</string>
+  <string name="modify_call_option_vt_rx">Ricezione video</string>
+  <string name="modify_call_option_voice">Solo voce</string>
+  <string name="accept_modify_call_request_prompt">Accettare la richiesta di modificare la chiamata?</string>
+  <string name="upgrade_vt_prompt">Vuoi modificare la chiamata in una videochiamata?</string>
+  <string name="upgrade_vt_tx_prompt">Modificare la chiamata voce in chiamata video (per la sola trasmissione)?</string>
+  <string name="upgrade_vt_rx_prompt">Modificare la chiamata voce in chiamata video (per la sola ricezione)?</string>
+  <string name="onscreenModifyCallText">Modifica chiamata</string>
+  <string name="onscreenAddParticipant">Aggiungi partecipante</string>
+  <string name="description_target_answer_video">Rispondi con video</string>
+  <string name="description_target_answer_tx_video">Rispondi con video TX</string>
+  <string name="description_target_answer_rx_video">Rispondi con video RX</string>
+  <string name="description_direction_up_right">Alto destra</string>
+  <string name="description_direction_up_left">Alto sinistra</string>
+  <string name="description_direction_down_left">Basso sinistra</string>
+  <string name="description_direction_down_right">Basso destra</string>
   <string name="incall_call_type_label_forwarded">Chiamata inoltrata</string>
   <string name="card_title_dialing_waiting">Composizione (attendere\u2026)</string>
   <string name="card_title_waiting_call">Chiamata in attesa</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Impossibile avviare la registrazione della chiamata</string>
   <string name="blacklist_dialog_title">Aggiungi alla blacklist</string>
   <string name="blacklist_dialog_message">Le prossime chiamate provenienti dal <xliff:g id="number">%s</xliff:g> saranno bloccate</string>
-  <string name="sub_no_sim">Nessuna SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Amplificazione volume attivata</string>
+  <string name="volume_boost_notify_disabled">Amplificazione volume disattivata</string>
+  <string name="volume_boost_notify_unavailable">L\'amplificazione del volume non è disponibile quando utilizzi gli auricolari</string>
 </resources>
diff --git a/res/values-iw/cm_caf.xml b/res/values-iw/cm_caf.xml
deleted file mode 100644
index 74bcc24d..00000000
--- a/res/values-iw/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">התחלת שידור הסרטונים נכשלה. מוריד שיחה ל-VoLTE\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 2f2577c4..2ee86754 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,4 @@
   <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_no_sim">אין SIM</string>
 </resources>
diff --git a/res/values-ja/cm_caf.xml b/res/values-ja/cm_caf.xml
deleted file mode 100644
index 83e3c5ce..00000000
--- a/res/values-ja/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">ビデオの送信を初期化できませんでした。通話をVoLTEにダウングレード中\n</string>
-  <string name="onscreenModifyCallText">通話を変更</string>
-  <string name="onscreenAddParticipant">参加者を追加</string>
-  <string name="description_target_answer_video">ビデオで応答</string>
-  <string name="description_target_answer_tx_video">XTビデオで応答</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index e309ca96..41f94c71 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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">XTビデオで応答</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>
@@ -24,5 +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_no_sim">SIMがありません</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-ko/cm_caf.xml b/res/values-ko/cm_caf.xml
deleted file mode 100644
index 3263fa35..00000000
--- a/res/values-ko/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">비디오 전송 초기화 실패. VoLTE로 전환합니다\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 2c201667..5b9e8b10 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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>
@@ -24,5 +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_no_sim">SIM 없음</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-ku/cm_caf.xml b/res/values-ku/cm_caf.xml
deleted file mode 100644
index b44f5ddd..00000000
--- a/res/values-ku/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">ئامادەکردنی ناردنی ڤیدیۆ سەرکەوتو نەبوو، گێڕانەوە بۆ پەیوەندی VoLTE\n</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="sub_1">سیمکارتی 1</string>
-  <string name="sub_2">سیمکارتی 2</string>
-</resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index dd18a44b..67d202e4 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,4 @@
   <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_no_sim">سیمکارد نییه‌</string>
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index b23e028c..3798e9de 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution, Apache license notifications and license are retained
-  ~ for attribution purposes only.
-
+<!--
   ~ Copyright (C) 2013 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 0bb86855..6bec44d3 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 2e4d0abf..20397cc0 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution, Apache license notifications and license are retained
-  ~ for attribution purposes only.
-
+<!--
   ~ Copyright (C) 2013 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,6 +64,7 @@
   <string name="notification_dialing">Gëtt gewielt</string>
   <string name="notification_missedCallTitle">Verpassten Uruff</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_missedCall_call_back">Zréckuruffen</string>
@@ -124,6 +122,7 @@
   <string name="description_image_button_zero">null</string>
   <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_call_muted">Uruff stomm geschalt.</string>
   <string name="description_target_answer">Äntweren</string>
   <string name="description_target_send_sms">SMS schécken</string>
diff --git a/res/values-lt/cm_caf.xml b/res/values-lt/cm_caf.xml
deleted file mode 100644
index 09c90e8c..00000000
--- a/res/values-lt/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL užklausa pakeista į USSD prašymą.</string>
-  <string name="callFailed_dialToSs">DIAL užklausa pakeista į SS prašymą.</string>
-  <string name="callFailed_dialToDial">DIAL užklausa pakeista į DIAL su skirtingu numeriu.</string>
-  <string name="callFailed_incoming_cb_enabled">Šalis uždraudė visus įeinančius skambučius.</string>
-  <string name="callUnanswered_forwarded">Skambutis neatsakytas ir peradresuotas</string>
-  <string name="modify_call_prompt_yes">Taip</string>
-  <string name="modify_call_prompt_no">Ne</string>
-  <string name="modify_call_failure_str">Prašymas pakeisti skambutį nepavyko\n</string>
-  <string name="modify_call_option_title">Pasirinkti skambučio tipą</string>
-  <string name="modify_call_option_vt">VP</string>
-  <string name="modify_call_option_vt_tx">Vaizdo perdavimo</string>
-  <string name="modify_call_option_vt_rx">Vaizdo gavimo</string>
-  <string name="modify_call_option_voice">Tik balso</string>
-  <string name="accept_modify_call_request_prompt">Priimti prašymą pakeisti skambutį?</string>
-  <string name="upgrade_vt_prompt">Ar norite atnaujinti į vaizdo skambutį?</string>
-  <string name="upgrade_vt_tx_prompt">Ar norite atnaujinti į vaizdo perdavimo skambutį?</string>
-  <string name="upgrade_vt_rx_prompt">Ar norite atnaujinti į vaizdo gavimo skambutį?</string>
-  <string name="vt_init_fail_str">Vaizdo perdavimo iniciacija nepavyko. Skambutis perjungiamas į VoLTE\n</string>
-  <string name="onscreenModifyCallText">Pakeisti skambutį</string>
-  <string name="onscreenAddParticipant">Pridėti dalyvį</string>
-  <string name="description_target_answer_video">Atsiliepti su vaizdu</string>
-  <string name="description_target_answer_tx_video">Atsiliepti su vaizdo perdavimu</string>
-  <string name="description_target_answer_rx_video">Atsiliepti su vaizdo gavimu</string>
-  <string name="description_direction_up_right">Viršus dešinė</string>
-  <string name="description_direction_up_left">Viršus kairė</string>
-  <string name="description_direction_down_left">Apačia kairė</string>
-  <string name="description_direction_down_right">Apačia dešinė</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index e3bc4575..7b59febc 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,7 @@
   <string name="call_recording_failed_message">Nepavyko pradėti skambučio įrašymo</string>
   <string name="blacklist_dialog_title">Pridėti į juodąjį sąrašą</string>
   <string name="blacklist_dialog_message">Skambučiai iš <xliff:g id="number">%s</xliff:g> bus blokuojami</string>
-  <string name="sub_no_sim">Nėra SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_unavailable">Papildomas garsumas nepasiekiamas, kai naudojama laisvų rankų įranga</string>
 </resources>
diff --git a/res/values-nb/cm_caf.xml b/res/values-nb/cm_caf.xml
deleted file mode 100644
index 34dbf0e7..00000000
--- a/res/values-nb/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL forespørsel endret til USSD forespørsel.</string>
-  <string name="callFailed_dialToSs">DIAL forespørsel endret til SS forespørsel.</string>
-  <string name="callFailed_dialToDial">DIAL forespørsel endret til DIAL med annet nummer.</string>
-  <string name="callFailed_incoming_cb_enabled">Alle innkommende anrop er sperret.</string>
-  <string name="callUnanswered_forwarded">Ubesvarte og videresendte anrop</string>
-  <string name="modify_call_prompt_yes">Ja</string>
-  <string name="modify_call_prompt_no">Nei</string>
-  <string name="modify_call_failure_str">Forespørsel om å endre samtale feilet\n</string>
-  <string name="modify_call_option_title">Velg type oppringing</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Video sending</string>
-  <string name="modify_call_option_vt_rx">Video mottak</string>
-  <string name="modify_call_option_voice">Kun stemme</string>
-  <string name="accept_modify_call_request_prompt">Godta forespørsel om å endre samtale?</string>
-  <string name="upgrade_vt_prompt">Vil du oppgradere samtalen din til videosamtale?</string>
-  <string name="upgrade_vt_tx_prompt">Vil du oppgradere samtalen til kun videosamtale?</string>
-  <string name="upgrade_vt_rx_prompt">Vil du oppgradere samtalen til kun videosamtale?</string>
-  <string name="vt_init_fail_str">Kunne ikke starte videosamtale. Nedgraderer samtalen til VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modifiser samtale</string>
-  <string name="onscreenAddParticipant">Legg til deltaker</string>
-  <string name="description_target_answer_video">Svar med video</string>
-  <string name="description_target_answer_tx_video">Svar med TX video</string>
-  <string name="description_target_answer_rx_video">Svar med RX video</string>
-  <string name="description_direction_up_right">Opp til høyre</string>
-  <string name="description_direction_up_left">Opp til venstre</string>
-  <string name="description_direction_down_left">Ned til venstre</string>
-  <string name="description_direction_down_right">Ned til høyre</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index d3194da6..7cc9903b 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL forespørsel endret til USSD forespørsel.</string>
+  <string name="callFailed_dialToSs">DIAL forespørsel endret til SS forespørsel.</string>
+  <string name="callFailed_dialToDial">DIAL forespørsel endret til DIAL med annet nummer.</string>
+  <string name="callFailed_incoming_cb_enabled">Alle innkommende anrop er sperret.</string>
+  <string name="callUnanswered_forwarded">Ubesvarte og videresendte anrop</string>
+  <string name="modify_call_prompt_yes">Ja</string>
+  <string name="modify_call_prompt_no">Nei</string>
+  <string name="modify_call_failure_str">Forespørsel om å endre samtale feilet\n</string>
+  <string name="modify_call_option_title">Velg type oppringing</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Video sending</string>
+  <string name="modify_call_option_vt_rx">Video mottak</string>
+  <string name="modify_call_option_voice">Kun stemme</string>
+  <string name="accept_modify_call_request_prompt">Godta forespørsel om å endre samtale?</string>
+  <string name="upgrade_vt_prompt">Vil du oppgradere samtalen din til videosamtale?</string>
+  <string name="upgrade_vt_tx_prompt">Vil du oppgradere samtalen til kun videosending?</string>
+  <string name="upgrade_vt_rx_prompt">Vil du oppgradere samtalen til kun videomottak?</string>
+  <string name="onscreenModifyCallText">Modifiser samtale</string>
+  <string name="onscreenAddParticipant">Legg til deltaker</string>
+  <string name="description_target_answer_video">Svar med video</string>
+  <string name="description_target_answer_tx_video">Svar med TX video</string>
+  <string name="description_target_answer_rx_video">Svar med RX video</string>
+  <string name="description_direction_up_right">Opp til høyre</string>
+  <string name="description_direction_up_left">Opp til venstre</string>
+  <string name="description_direction_down_left">Ned til venstre</string>
+  <string name="description_direction_down_right">Ned høyre</string>
   <string name="incall_call_type_label_forwarded">Videresendt samtale</string>
   <string name="card_title_dialing_waiting">Ringer (venter\u2026)</string>
   <string name="card_title_waiting_call">Ventende samtale</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Kunne ikke starte opptak av samtalen</string>
   <string name="blacklist_dialog_title">Legg til i blokkeringsliste</string>
   <string name="blacklist_dialog_message">Fremtidige samtaler fra <xliff:g id="number">%s</xliff:g> vil bli blokkert</string>
-  <string name="sub_no_sim">Ingen SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Volum boost er aktivert</string>
+  <string name="volume_boost_notify_disabled">Volum boost er deaktivert</string>
+  <string name="volume_boost_notify_unavailable">Ekstra volum er ikke tilgjengelig når du bruker et hodesett</string>
 </resources>
diff --git a/res/values-nl/cm_caf.xml b/res/values-nl/cm_caf.xml
deleted file mode 100644
index 30a6b426..00000000
--- a/res/values-nl/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL-verzoek veranderd naar USSD-verzoek.</string>
-  <string name="callFailed_dialToSs">DIAL-verzoek veranderd naar SS-verzoek.</string>
-  <string name="callFailed_dialToDial">DIAL-verzoek veranderd naar DIAL met ander nummer.</string>
-  <string name="callFailed_incoming_cb_enabled">Andere partij blokkeert alle oproepen.</string>
-  <string name="callUnanswered_forwarded">Gesprek onbeantwoord en doorgeschakeld</string>
-  <string name="modify_call_prompt_yes">Ja</string>
-  <string name="modify_call_prompt_no">Nee</string>
-  <string name="modify_call_failure_str">Verzoek om oproep te wijzigen mislukt\n</string>
-  <string name="modify_call_option_title">Soort gesprek</string>
-  <string name="modify_call_option_vt">Video</string>
-  <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 oproep 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>
-  <string name="vt_init_fail_str">Kan geen videogesprek starten. Overschakelen naar VoLTE\n</string>
-  <string name="onscreenModifyCallText">Gesprek veranderen</string>
-  <string name="onscreenAddParticipant">Deelnemer toevoegen</string>
-  <string name="description_target_answer_video">Beantwoorden met video</string>
-  <string name="description_target_answer_tx_video">Beantwoorden met alleen-verzenden-video</string>
-  <string name="description_target_answer_rx_video">Beantwoorden met alleen-ontvangen-video</string>
-  <string name="description_direction_up_right">Boven rechts</string>
-  <string name="description_direction_up_left">Boven links</string>
-  <string name="description_direction_down_left">Onder links</string>
-  <string name="description_direction_down_right">Onder rechts</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index d67fb641..ac63ba54 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">DIAL-verzoek veranderd naar USSD-verzoek.</string>
+  <string name="callFailed_dialToSs">DIAL-verzoek veranderd naar SS-verzoek.</string>
+  <string name="callFailed_dialToDial">DIAL-verzoek veranderd naar DIAL met ander nummer.</string>
+  <string name="callFailed_incoming_cb_enabled">Andere partij blokkeert alle oproepen.</string>
+  <string name="callUnanswered_forwarded">Gesprek onbeantwoord en doorgeschakeld</string>
+  <string name="modify_call_prompt_yes">Ja</string>
+  <string name="modify_call_prompt_no">Nee</string>
+  <string name="modify_call_failure_str">Verzoek om oproep te wijzigen mislukt\n</string>
+  <string name="modify_call_option_title">Soort gesprek</string>
+  <string name="modify_call_option_vt">Video verzenden</string>
+  <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 oproep 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>
+  <string name="onscreenModifyCallText">Gesprek veranderen</string>
+  <string name="onscreenAddParticipant">Deelnemer toevoegen</string>
+  <string name="description_target_answer_video">Beantwoorden met video</string>
+  <string name="description_target_answer_tx_video">Beantwoorden met alleen-verzenden-video</string>
+  <string name="description_target_answer_rx_video">Beantwoorden met alleen-ontvangen-video</string>
+  <string name="description_direction_up_right">Boven rechts</string>
+  <string name="description_direction_up_left">Boven links</string>
+  <string name="description_direction_down_left">Onder links</string>
+  <string name="description_direction_down_right">Onder rechts</string>
   <string name="incall_call_type_label_forwarded">Doorgeschakeld gesprek</string>
   <string name="card_title_dialing_waiting">Bellen (wachten\u2026)</string>
   <string name="card_title_waiting_call">Wachtgesprek</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Gespreksopname starten mislukt</string>
   <string name="blacklist_dialog_title">Toevoegen aan zwarte lijst</string>
   <string name="blacklist_dialog_message">Oproepen van <xliff:g id="number">%s</xliff:g> worden geblokkeerd</string>
-  <string name="sub_no_sim">Geen SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Volumeversterker ingeschakeld</string>
+  <string name="volume_boost_notify_disabled">Volumeversterker uitgeschakeld</string>
+  <string name="volume_boost_notify_unavailable">Volumeversterker niet beschikbaar bij gebruik van een koptelefoon</string>
 </resources>
diff --git a/res/values-pl/cm_caf.xml b/res/values-pl/cm_caf.xml
deleted file mode 100644
index c464382a..00000000
--- a/res/values-pl/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Żądanie DIAL zmodyfikowane na USSD.</string>
-  <string name="callFailed_dialToSs">Żądanie DIAL zmodyfikowane na SS.</string>
-  <string name="callFailed_dialToDial">Żądanie DIAL zmodyfikowane na DIAL z innym numerem.</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 (przesyłanie obrazu)?</string>
-  <string name="upgrade_vt_rx_prompt">Czy chcesz aktywować funkcję wideorozmowy (odbieranie obrazu)?</string>
-  <string name="vt_init_fail_str">Nie udało się zainicjować wideorozmowy. Przywracanie połączenia VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modyfikowanie połączeń</string>
-  <string name="onscreenAddParticipant">Dodaj uczestnika</string>
-  <string name="description_target_answer_video">Odpowiedz wideo</string>
-  <string name="description_target_answer_tx_video">Odpowiedz wideo TX</string>
-  <string name="description_target_answer_rx_video">Odpowiedz wideo RX</string>
-  <string name="description_direction_up_right">Na górze po prawej</string>
-  <string name="description_direction_up_left">Na górze po lewej</string>
-  <string name="description_direction_down_left">Na dole po lewej</string>
-  <string name="description_direction_down_right">Na dole po prawej</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 9a93b4a6..20333d8b 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,7 @@
   <string name="call_recording_failed_message">Nie udało się rozpocząć nagrywania</string>
   <string name="blacklist_dialog_title">Dodaj do czarnej listy</string>
   <string name="blacklist_dialog_message">Przyszłe połączenia od  <xliff:g id="number">%s</xliff:g> będą blokowane</string>
-  <string name="sub_no_sim">Brak karty SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</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-pt-rBR/cm_caf.xml b/res/values-pt-rBR/cm_caf.xml
deleted file mode 100644
index a86dba7c..00000000
--- a/res/values-pt-rBR/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Pedido de DISCAGEM modificado para requisição USSD.</string>
-  <string name="callFailed_dialToSs">Pedido de DISCAGEM modificado para requisição SS.</string>
-  <string name="callFailed_dialToDial">Pedido de DISCAGEM modificado para DISCAGEM com número diferente.</string>
-  <string name="callFailed_incoming_cb_enabled">Todas as chamadas recebidas foram bloqueadas por terceiros.</string>
-  <string name="callUnanswered_forwarded">Chamada não respondida e reencaminhada</string>
-  <string name="modify_call_prompt_yes">Sim</string>
-  <string name="modify_call_prompt_no">Não</string>
-  <string name="modify_call_failure_str">Falha na requisição para modificar chamada\n</string>
-  <string name="modify_call_option_title">Selecione o tipo de chamada</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Transmissão de vídeo</string>
-  <string name="modify_call_option_vt_rx">Recepção de vídeo</string>
-  <string name="modify_call_option_voice">Somente voz</string>
-  <string name="accept_modify_call_request_prompt">Aceitar requisição para modificar chamada?</string>
-  <string name="upgrade_vt_prompt">Você gostara de atualizar a chamada para chamada de vídeo?</string>
-  <string name="upgrade_vt_tx_prompt">Você gostaria de atualizar a chamada para somente transmissão de vídeo?</string>
-  <string name="upgrade_vt_rx_prompt">Você gostaria de atualizar a chamada para somente recepção de vídeo?</string>
-  <string name="vt_init_fail_str">Falha na inicialização de transmissão de vídeo. Rebaixando chamada para VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modificar chamada</string>
-  <string name="onscreenAddParticipant">Adicionar participante</string>
-  <string name="description_target_answer_video">Resposta com vídeo</string>
-  <string name="description_target_answer_tx_video">Responder com transmissão de vídeo</string>
-  <string name="description_target_answer_rx_video">Responder com recepção de vídeo</string>
-  <string name="description_direction_up_right">Cima direito</string>
-  <string name="description_direction_up_left">Cima esquerdo</string>
-  <string name="description_direction_down_left">Baixo esquerdo</string>
-  <string name="description_direction_down_right">Baixo direito</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index ac297d8e..93fa9196 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Pedido de DISCAGEM modificado para requisição USSD.</string>
+  <string name="callFailed_dialToSs">Pedido de DISCAGEM modificado para requisição SS.</string>
+  <string name="callFailed_dialToDial">Pedido de DISCAGEM modificado para DISCAGEM com número diferente.</string>
+  <string name="callFailed_incoming_cb_enabled">Todas as chamadas recebidas foram bloqueadas por terceiros.</string>
+  <string name="callUnanswered_forwarded">Chamada não respondida e reencaminhada</string>
+  <string name="modify_call_prompt_yes">Sim</string>
+  <string name="modify_call_prompt_no">Não</string>
+  <string name="modify_call_failure_str">Falha na requisição para modificar chamada\n</string>
+  <string name="modify_call_option_title">Selecione o tipo de chamada</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmissão de vídeo</string>
+  <string name="modify_call_option_vt_rx">Recepção de vídeo</string>
+  <string name="modify_call_option_voice">Somente voz</string>
+  <string name="accept_modify_call_request_prompt">Aceitar requisição para modificar a chamada?</string>
+  <string name="upgrade_vt_prompt">Você gostara de atualizar a chamada para chamada de vídeo?</string>
+  <string name="upgrade_vt_tx_prompt">Você gostaria de atualizar a chamada para somente transmissão de vídeo?</string>
+  <string name="upgrade_vt_rx_prompt">Você gostaria de atualizar a chamada para somente recepção de vídeo?</string>
+  <string name="onscreenModifyCallText">Modificar chamada</string>
+  <string name="onscreenAddParticipant">Adicionar participante</string>
+  <string name="description_target_answer_video">Responder com vídeo</string>
+  <string name="description_target_answer_tx_video">Responder com transmissão de vídeo</string>
+  <string name="description_target_answer_rx_video">Responder com recepção de vídeo</string>
+  <string name="description_direction_up_right">Cima direito</string>
+  <string name="description_direction_up_left">Cima esquerdo</string>
+  <string name="description_direction_down_left">Baixo esquerdo</string>
+  <string name="description_direction_down_right">Baixo direito</string>
   <string name="incall_call_type_label_forwarded">Chamada encaminhada</string>
   <string name="card_title_dialing_waiting">Discando (waiting\u2026)</string>
   <string name="card_title_waiting_call">Chamada em espera</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Falha ao iniciar a gravação de chamadas</string>
   <string name="blacklist_dialog_title">Adicionar à Lista Negra</string>
   <string name="blacklist_dialog_message">Futuras chamadas de <xliff:g id="number">%s</xliff:g> serão bloqueadas</string>
-  <string name="sub_no_sim">Sem SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Ganho de volume ativado</string>
+  <string name="volume_boost_notify_disabled">Ganho de volume desativado</string>
+  <string name="volume_boost_notify_unavailable">Ganho de volume não está disponível enquanto usando fone de ouvido</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_caf.xml b/res/values-pt-rPT/cm_caf.xml
deleted file mode 100644
index bc081a07..00000000
--- a/res/values-pt-rPT/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Pedido de marcação modificado para USSD.</string>
-  <string name="callFailed_dialToSs">Pedido de marcação modificado para SS.</string>
-  <string name="callFailed_dialToDial">Pedido de marcação modificado para marcar com número diferente.</string>
-  <string name="callFailed_incoming_cb_enabled">Multi-conferência barrou todas as chamadas recebidas.</string>
-  <string name="callUnanswered_forwarded">Chamada não respondida e reencaminhada</string>
-  <string name="modify_call_prompt_yes">Sim</string>
-  <string name="modify_call_prompt_no">Não</string>
-  <string name="modify_call_failure_str">Pedido para modificar chamada fracassou\n</string>
-  <string name="modify_call_option_title">Selecionar o tipo de chamada</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Transmissão de vídeo</string>
-  <string name="modify_call_option_vt_rx">Receção de vídeo</string>
-  <string name="modify_call_option_voice">Apenas voz</string>
-  <string name="accept_modify_call_request_prompt">Aceitar o pedido para modificar a chamada?</string>
-  <string name="upgrade_vt_prompt">Gostaria de converter a chamada em videochamada?</string>
-  <string name="upgrade_vt_tx_prompt">Gostaria de converter a chamada em videochamada de transmissão?</string>
-  <string name="upgrade_vt_rx_prompt">Gostaria de converter a chamada em videochamada de receção?</string>
-  <string name="vt_init_fail_str">Videochamada falhou.Convertendo para VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modificar a chamada</string>
-  <string name="onscreenAddParticipant">Adicionar participante</string>
-  <string name="description_target_answer_video">Responder com vídeo</string>
-  <string name="description_target_answer_tx_video">Responder com vídeo TX</string>
-  <string name="description_target_answer_rx_video">Responder com vídeo RX</string>
-  <string name="description_direction_up_right">Em cima à direita</string>
-  <string name="description_direction_up_left">Em cima à esquerda</string>
-  <string name="description_direction_down_left">Em baixo à esquerda</string>
-  <string name="description_direction_down_right">Em baixo à direita</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 477de9cd..cbaf27da 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Pedido de marcação modificado em USSD.</string>
+  <string name="callFailed_dialToSs">Pedido de marcação modificado em SS.</string>
+  <string name="callFailed_dialToDial">Pedido de marcação modificado para marcar com número diferente.</string>
+  <string name="callFailed_incoming_cb_enabled">Todas as chamadas recebidas em multi-conferência estao barradas.</string>
+  <string name="callUnanswered_forwarded">Chamada não respondida e reencaminhada</string>
+  <string name="modify_call_prompt_yes">Sim</string>
+  <string name="modify_call_prompt_no">Não</string>
+  <string name="modify_call_failure_str">Pedido para modificar chamada falhou\n</string>
+  <string name="modify_call_option_title">Selecionar o tipo de chamada</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Transmissão de vídeo</string>
+  <string name="modify_call_option_vt_rx">Receção de vídeo</string>
+  <string name="modify_call_option_voice">Apenas voz</string>
+  <string name="accept_modify_call_request_prompt">Aceitar o pedido para modificar a chamada?</string>
+  <string name="upgrade_vt_prompt">Gostaria de converter a chamada em video chamada?</string>
+  <string name="upgrade_vt_tx_prompt">Gostaria de converter a chamada em video chamada de transmissão?</string>
+  <string name="upgrade_vt_rx_prompt">Gostaria de converter a chamada em video chamada de receção?</string>
+  <string name="onscreenModifyCallText">Modificar a chamada</string>
+  <string name="onscreenAddParticipant">Adicionar participante</string>
+  <string name="description_target_answer_video">Responder com vídeo</string>
+  <string name="description_target_answer_tx_video">Responder com vídeo TX</string>
+  <string name="description_target_answer_rx_video">Responder com vídeo RX</string>
+  <string name="description_direction_up_right">Em cima à direita</string>
+  <string name="description_direction_up_left">Em cima à esquerda</string>
+  <string name="description_direction_down_left">Em baixo à esquerda</string>
+  <string name="description_direction_down_right">Em baixo à direita</string>
   <string name="incall_call_type_label_forwarded">Chamada reencaminhada</string>
   <string name="card_title_dialing_waiting">A marcar (aguarde\u2026)</string>
   <string name="card_title_waiting_call">Chamada em espera</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Falha ao iniciar a gravação de chamadas</string>
   <string name="blacklist_dialog_title">Adicionar à lista negra</string>
   <string name="blacklist_dialog_message">Futuras chamadas de <xliff:g id="number">%s</xliff:g> serão bloqueadas</string>
-  <string name="sub_no_sim">Sem SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Volume extra ativado</string>
+  <string name="volume_boost_notify_disabled">Volume extra desativado</string>
+  <string name="volume_boost_notify_unavailable">O volume extra não está disponível quando utilizar um auricular</string>
 </resources>
diff --git a/res/values-ro/cm_caf.xml b/res/values-ro/cm_caf.xml
deleted file mode 100644
index c38b9239..00000000
--- a/res/values-ro/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Cerere APEL modificată în cerere USSD.</string>
-  <string name="callFailed_dialToSs">Cerere APEL modificată în cerere SS.</string>
-  <string name="callFailed_dialToDial">Cerere APEL modificată în APEL cu număr diferit.</string>
-  <string name="callFailed_incoming_cb_enabled">Apelatul a blocat toate apelurile primite.</string>
-  <string name="callUnanswered_forwarded">Apel nerăspuns și transmis mai departe</string>
-  <string name="modify_call_prompt_yes">Da</string>
-  <string name="modify_call_prompt_no">Nu</string>
-  <string name="modify_call_failure_str">Cererea de modificare a apelului a eșuat\n</string>
-  <string name="modify_call_option_title">Selectează tipul de apel</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Transmisie video</string>
-  <string name="modify_call_option_vt_rx">Recepție video</string>
-  <string name="modify_call_option_voice">Doar voce</string>
-  <string name="accept_modify_call_request_prompt">Acceptă cererea de modificare a apelului?</string>
-  <string name="upgrade_vt_prompt">Vrei să transformi apelul în apel video?</string>
-  <string name="upgrade_vt_tx_prompt">Vrei să transformi apelul doar în transmisie video?</string>
-  <string name="upgrade_vt_rx_prompt">Vrei să transformi apelul doar în recepție video?</string>
-  <string name="vt_init_fail_str">Inițializarea transmisiei video a eșuat. Se transformă apelul în VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modificare apel</string>
-  <string name="onscreenAddParticipant">Adaugă participant</string>
-  <string name="description_target_answer_video">Răspunde cu video</string>
-  <string name="description_target_answer_tx_video">Răspunde cu TX video</string>
-  <string name="description_target_answer_rx_video">Răspunde cu RX video</string>
-  <string name="description_direction_up_right">Sus dreapta</string>
-  <string name="description_direction_up_left">Sus stânga</string>
-  <string name="description_direction_down_left">Jos stânga</string>
-  <string name="description_direction_down_right">Jos dreapta</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 35166dfa..464c47c5 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,4 @@
   <string name="call_recording_failed_message">Înregistrarea apelului a eșuat</string>
   <string name="blacklist_dialog_title">Adaugă la lista neagră</string>
   <string name="blacklist_dialog_message">Viitoarele apeluri de la <xliff:g id="number">%s</xliff:g> vor fi blocate</string>
-  <string name="sub_no_sim">Niciun SIM</string>
 </resources>
diff --git a/res/values-ru/cm_caf.xml b/res/values-ru/cm_caf.xml
deleted file mode 100644
index 3c97310e..00000000
--- a/res/values-ru/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">Не удалось инициализировать видеозвонок. Переход в режим VoLTE...\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 58976412..4af70d9b 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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>
@@ -24,5 +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_no_sim">Нет SIM-карты</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-si/cm_caf.xml b/res/values-si/cm_caf.xml
deleted file mode 100644
index cb814096..00000000
--- a/res/values-si/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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">වීඩියෝ</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="vt_init_fail_str">වීඩියෝ සම්ප්‍රේෂණය ඇරඹීමට අසමත්විය. ඇමතුම VoLTE බවට පහත්ශ්‍රේණි කෙරේ\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index 2c36a64c..ce20e049 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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>
@@ -24,5 +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_no_sim">SIM පතක් නැත</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-sk/cm_caf.xml b/res/values-sk/cm_caf.xml
deleted file mode 100644
index 1668a907..00000000
--- a/res/values-sk/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">Požiadavka DIAL bola upravená na požiadavku USSD.</string>
-  <string name="callFailed_dialToSs">Požiadavka DIAL bola upravená na požiadavku SS.</string>
-  <string name="callFailed_dialToDial">Požiadavka DIAL bola upravená na požiadavku DIAL s iným číslom.</string>
-  <string name="callFailed_incoming_cb_enabled">Strana má zamlčané všetky prichádzajúce hovory.</string>
-  <string name="callUnanswered_forwarded">Hovor bol neprijatý a presmerovaný</string>
-  <string name="modify_call_prompt_yes">Áno</string>
-  <string name="modify_call_prompt_no">Nie</string>
-  <string name="modify_call_failure_str">Požiadavka na úpravu hovoru zlyhala\n</string>
-  <string name="modify_call_option_title">Vyberte typ hovoru</string>
-  <string name="modify_call_option_vt">Videohovor</string>
-  <string name="modify_call_option_vt_tx">Vysielanie videa</string>
-  <string name="modify_call_option_vt_rx">Príjem videa</string>
-  <string name="modify_call_option_voice">Iba hlas</string>
-  <string name="accept_modify_call_request_prompt">Prijať požiadavku na zmenu hovoru?</string>
-  <string name="upgrade_vt_prompt">Chcete zmeniť tento hovor na videohovor?</string>
-  <string name="upgrade_vt_tx_prompt">Chcete zmeniť tento hovor na vysielanie videa?</string>
-  <string name="upgrade_vt_rx_prompt">Chcete zmeniť tento hovor na príjem videa?</string>
-  <string name="vt_init_fail_str">Vysielanie videa zlyhalo. Zmena hovoru na VoLTE\n</string>
-  <string name="onscreenModifyCallText">Zmeniť hovor</string>
-  <string name="onscreenAddParticipant">Pridať účastníka</string>
-  <string name="description_target_answer_video">Prijať s videom</string>
-  <string name="description_target_answer_tx_video">Prijať vysielanie videa</string>
-  <string name="description_target_answer_rx_video">Prijať s prijímaním videa</string>
-  <string name="description_direction_up_right">Vpravo hore</string>
-  <string name="description_direction_up_left">Vľavo hore</string>
-  <string name="description_direction_down_left">Vľavo dole</string>
-  <string name="description_direction_down_right">Vpravo dole</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 4f3adb31..39647488 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">Požiadavka DIAL bola upravená na požiadavku USSD.</string>
+  <string name="callFailed_dialToSs">Požiadavka DIAL bola upravená na požiadavku SS.</string>
+  <string name="callFailed_dialToDial">Požiadavka DIAL bola upravená na požiadavku DIAL s iným číslom.</string>
+  <string name="callFailed_incoming_cb_enabled">Strana blokuje všetky prichádzajúce hovory.</string>
+  <string name="callUnanswered_forwarded">Hovor bol neprijatý a presmerovaný</string>
+  <string name="modify_call_prompt_yes">Áno</string>
+  <string name="modify_call_prompt_no">Nie</string>
+  <string name="modify_call_failure_str">Požiadavka na úpravu hovoru zlyhala\n</string>
+  <string name="modify_call_option_title">Vyberte typ hovoru</string>
+  <string name="modify_call_option_vt">Prenos videa</string>
+  <string name="modify_call_option_vt_tx">Vysielanie videa</string>
+  <string name="modify_call_option_vt_rx">Príjem videa</string>
+  <string name="modify_call_option_voice">Iba hlas</string>
+  <string name="accept_modify_call_request_prompt">Prijať požiadavku na úpravu hovoru?</string>
+  <string name="upgrade_vt_prompt">Chcete zmeniť tento hovor na videohovor?</string>
+  <string name="upgrade_vt_tx_prompt">Chcete zmeniť tento hovor iba na vysielanie videa?</string>
+  <string name="upgrade_vt_rx_prompt">Chcete zmeniť tento hovor iba na príjem videa?</string>
+  <string name="onscreenModifyCallText">Upraviť hovor</string>
+  <string name="onscreenAddParticipant">Pridať účastníka</string>
+  <string name="description_target_answer_video">Prijať s videom</string>
+  <string name="description_target_answer_tx_video">Prijať s vysielaním videa</string>
+  <string name="description_target_answer_rx_video">Prijať s príjmom videa</string>
+  <string name="description_direction_up_right">Vpravo hore</string>
+  <string name="description_direction_up_left">Vľavo hore</string>
+  <string name="description_direction_down_left">Vľavo dole</string>
+  <string name="description_direction_down_right">Vpravo dole</string>
   <string name="incall_call_type_label_forwarded">Presmerovaný hovor</string>
   <string name="card_title_dialing_waiting">Vytáčanie (čakanie\u2026)</string>
   <string name="card_title_waiting_call">Čakajúci hovor</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Spustenie nahrávania hovoru zlyhalo</string>
   <string name="blacklist_dialog_title">Pridať na čiernu listinu</string>
   <string name="blacklist_dialog_message">Ďalšie prichádzajúce hovory z <xliff:g id="number">%s</xliff:g> budú blokované</string>
-  <string name="sub_no_sim">Žiadna SIM</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Zosilnenie hlasitosti je povolené</string>
+  <string name="volume_boost_notify_disabled">Zosilnenie hlasitosti je zakázané</string>
+  <string name="volume_boost_notify_unavailable">Vyššia hlasitosť nie je k dispozícii pri používaní slúchadiel</string>
 </resources>
diff --git a/res/values-sr/cm_caf.xml b/res/values-sr/cm_caf.xml
deleted file mode 100644
index 3f37f591..00000000
--- a/res/values-sr/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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">ВС</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="vt_init_fail_str">Покретање видео преноса није успело. Деградација позива на VoLTE\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 61d3d154..7aab63fc 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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">ВС</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>
@@ -24,5 +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_no_sim">Нема SIM картице</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-sv/cm_caf.xml b/res/values-sv/cm_caf.xml
deleted file mode 100644
index d2adeb97..00000000
--- a/res/values-sv/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL-begäran ändrades till USSD-begäran.</string>
-  <string name="callFailed_dialToSs">DIAL-begäran ändrades till SS-begäran.</string>
-  <string name="callFailed_dialToDial">DIAL-begäran ändrades till DIAL-begäran med annat nummer.</string>
-  <string name="callFailed_incoming_cb_enabled">Parten har spärrat alla inkommande samtal.</string>
-  <string name="callUnanswered_forwarded">Samtalet obesvarat och vidarebefordrat</string>
-  <string name="modify_call_prompt_yes">Ja</string>
-  <string name="modify_call_prompt_no">Nej</string>
-  <string name="modify_call_failure_str">Begäran att modifiera samtal misslyckades\n</string>
-  <string name="modify_call_option_title">Välj typ av samtal</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Videosändning</string>
-  <string name="modify_call_option_vt_rx">Videomottagning</string>
-  <string name="modify_call_option_voice">Endast röst</string>
-  <string name="accept_modify_call_request_prompt">Godkänn begäran att modifiera samtal?</string>
-  <string name="upgrade_vt_prompt">Vill du uppgradera samtalet till ett videosamtal?</string>
-  <string name="upgrade_vt_tx_prompt">Vill du uppgradera samtalet till samtal med enbart videosändning?</string>
-  <string name="upgrade_vt_rx_prompt">Vill du uppgradera samtalet till samtal med enbart videomottagning?</string>
-  <string name="vt_init_fail_str">Initiering av videosändning misslyckades. Nedgraderar samtal till VoLTE\n</string>
-  <string name="onscreenModifyCallText">Modifiera samtal</string>
-  <string name="onscreenAddParticipant">Lägg till deltagare</string>
-  <string name="description_target_answer_video">Svara med video</string>
-  <string name="description_target_answer_tx_video">Svara med TX-video</string>
-  <string name="description_target_answer_rx_video">Svara med RX-video</string>
-  <string name="description_direction_up_right">Uppe till höger</string>
-  <string name="description_direction_up_left">Uppe till vänster</string>
-  <string name="description_direction_down_left">Nere till vänster</string>
-  <string name="description_direction_down_right">Nere till höger</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index a2353e04..8114ed2b 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,4 @@
   <string name="call_recording_failed_message">Det gick inte att starta samtalsinspelning</string>
   <string name="blacklist_dialog_title">Lägg till svartlistan</string>
   <string name="blacklist_dialog_message">Kommande samtal från <xliff:g id="number">%s</xliff:g> kommer att blockeras</string>
-  <string name="sub_no_sim">Inget SIM</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 84a846fc..41d1ef59 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution, Apache license notifications and license are retained
-  ~ for attribution purposes only.
-
+<!--
   ~ Copyright (C) 2013 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values-th/cm_caf.xml b/res/values-th/cm_caf.xml
deleted file mode 100644
index 2adda2a9..00000000
--- a/res/values-th/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">เตรียมการส่งวิดีโอล้มเหลว กำลังลดระดับไปยัง VoLTE\n</string>
-  <string name="onscreenModifyCallText">แก้ไขสาย</string>
-  <string name="onscreenAddParticipant">เพิ่มผู้เข้าร่วม</string>
-  <string name="description_target_answer_video">ตอบด้วยวิดีโอ</string>
-  <string name="description_target_answer_tx_video">ตอบด้วย TX video</string>
-  <string name="description_target_answer_rx_video">ตอบด้วย RX video</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="sub_1">ซิม 1</string>
-  <string name="sub_2">ซิม 2</string>
-</resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index a6726f42..d0200a32 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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 video</string>
+  <string name="description_target_answer_rx_video">ตอบด้วย RX video</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>
@@ -24,5 +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_no_sim">ไม่มีซิม</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-tr/cm_caf.xml b/res/values-tr/cm_caf.xml
deleted file mode 100644
index ebbfdff9..00000000
--- a/res/values-tr/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">ARAMA isteği USSD isteğine dönüştürüldü.</string>
-  <string name="callFailed_dialToSs">ARAMA isteği SS isteğine dönüştürüldü.</string>
-  <string name="callFailed_dialToDial">ARAMA isteği başka bir numarayla ARAMA isteğine dönüştürüldü.</string>
-  <string name="callFailed_incoming_cb_enabled">Grup bütün gelen aramaları engelledi.</string>
-  <string name="callUnanswered_forwarded">Çağrı cevaplanmayıp yönlendirildi</string>
-  <string name="modify_call_prompt_yes">Evet</string>
-  <string name="modify_call_prompt_no">Hayır</string>
-  <string name="modify_call_failure_str">Çağrı değiştirme isteği yapılamadı\n</string>
-  <string name="modify_call_option_title">Arama türü seçin</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="modify_call_option_vt_tx">Video aktarımı</string>
-  <string name="modify_call_option_vt_rx">Video alımı</string>
-  <string name="modify_call_option_voice">Yalnızca ses</string>
-  <string name="accept_modify_call_request_prompt">Çağrı değiştirme isteği kabul edilsin mi?</string>
-  <string name="upgrade_vt_prompt">Sesli görüşmeden görüntülü görüşmeye geçmek ister misiniz?</string>
-  <string name="upgrade_vt_tx_prompt">Sesli görüşmeden sadece görüntü aktarmalı görüşmeye  geçmek ister misiniz?</string>
-  <string name="upgrade_vt_rx_prompt">Sesli görüşmeden sadece görüntü alımlı görüşmeye geçmek ister misiniz?</string>
-  <string name="vt_init_fail_str">Video aktarımı başlatılamadı. Çağrı VoLTE\'ye geçiriliyor\n</string>
-  <string name="onscreenModifyCallText">Çağrıda değişiklik yap</string>
-  <string name="onscreenAddParticipant">Katılımcı ekle</string>
-  <string name="description_target_answer_video">Video ile cevap ver</string>
-  <string name="description_target_answer_tx_video">TX video ile cevap ver</string>
-  <string name="description_target_answer_rx_video">RX video ile cevap ver</string>
-  <string name="description_direction_up_right">Yukarı sağ</string>
-  <string name="description_direction_up_left">Yukarı sol</string>
-  <string name="description_direction_down_left">Aşağı sol</string>
-  <string name="description_direction_down_right">Aşağı sağ</string>
-  <string name="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index ebe512e7..0ae93f5d 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,6 +17,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="callFailed_dialToUssd">ARAMA isteği USSD isteğine dönüştürüldü.</string>
+  <string name="callFailed_dialToSs">ARAMA isteği SS isteğine dönüştürüldü.</string>
+  <string name="callFailed_dialToDial">ARAMA isteği başka bir numarayla ARAMA isteğine dönüştürüldü.</string>
+  <string name="callFailed_incoming_cb_enabled">Grup bütün gelen aramaları engelledi.</string>
+  <string name="callUnanswered_forwarded">Çağrı cevaplanmayıp yönlendirildi</string>
+  <string name="modify_call_prompt_yes">Evet</string>
+  <string name="modify_call_prompt_no">Hayır</string>
+  <string name="modify_call_failure_str">Çağrı değiştirme isteği yapılamadı\n</string>
+  <string name="modify_call_option_title">Arama türünü seçin</string>
+  <string name="modify_call_option_vt">VT</string>
+  <string name="modify_call_option_vt_tx">Video aktarımı</string>
+  <string name="modify_call_option_vt_rx">Video alımı</string>
+  <string name="modify_call_option_voice">Sadece ses</string>
+  <string name="accept_modify_call_request_prompt">Çağrı değiştirme isteği kabul edilsin mi?</string>
+  <string name="upgrade_vt_prompt">Sesli görüşmeden görüntülü görüşmeye geçmek ister misiniz?</string>
+  <string name="upgrade_vt_tx_prompt">Sesli görüşmeden sadece görüntü aktarmalı görüşmeye geçmek ister misiniz?</string>
+  <string name="upgrade_vt_rx_prompt">Sesli görüşmeden sadece görüntü alımlı görüşmeye geçmek ister misiniz?</string>
+  <string name="onscreenModifyCallText">Çağrıyı değiştir</string>
+  <string name="onscreenAddParticipant">Katılımcı ekle</string>
+  <string name="description_target_answer_video">Video ile cevap ver</string>
+  <string name="description_target_answer_tx_video">TX video ile cevap ver</string>
+  <string name="description_target_answer_rx_video">RX video ile cevap ver</string>
+  <string name="description_direction_up_right">Yukarı sağ</string>
+  <string name="description_direction_up_left">Yukarı sol</string>
+  <string name="description_direction_down_left">Aşağı sol</string>
+  <string name="description_direction_down_right">Aşağı sağ</string>
   <string name="incall_call_type_label_forwarded">Yönlendirilmiş çağrı</string>
   <string name="card_title_dialing_waiting">Aranıyor (bekliyor\u2026)</string>
   <string name="card_title_waiting_call">Arama bekleniyor</string>
@@ -24,5 +51,9 @@
   <string name="call_recording_failed_message">Arama ses kaydı başlatılamadı</string>
   <string name="blacklist_dialog_title">Kara listeye ekle</string>
   <string name="blacklist_dialog_message"><xliff:g id="number">%s</xliff:g> numarasından gelecek çağrılar engellenecek</string>
-  <string name="sub_no_sim">SIM yok</string>
+  <string name="sub_1">SIM 1</string>
+  <string name="sub_2">SIM 2</string>
+  <string name="volume_boost_notify_enabled">Ses güçlendirici etkinleştirildi</string>
+  <string name="volume_boost_notify_disabled">Ses güçlendirici devre dışı bırakıldı</string>
+  <string name="volume_boost_notify_unavailable">Kulaklık kullanılırken fazladan ses kullanılamaz</string>
 </resources>
diff --git a/res/values-uk/cm_caf.xml b/res/values-uk/cm_caf.xml
deleted file mode 100644
index b28b5458..00000000
--- a/res/values-uk/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">Не вдалося ініціалізувати відеодзвінок. Перехід в режим VoLTE\n</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="sub_1">SIM 1</string>
-  <string name="sub_2">SIM 2</string>
-</resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 3e0076dd..46e7ed42 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -24,5 +25,4 @@
   <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_no_sim">Немає SIM-карти</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_caf.xml b/res/values-zh-rCN/cm_caf.xml
deleted file mode 100644
index d7710c8b..00000000
--- a/res/values-zh-rCN/cm_caf.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">视频传输初始化失败。通话降级到 VoLTE\n</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="sub_1">SIM 卡 1</string>
-  <string name="sub_2">SIM 卡 2</string>
-</resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 66444f3a..b0c77436 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -16,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">用传出视频应答</string>
+  <string name="description_target_answer_rx_video">用接收视频应答</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>
@@ -24,5 +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_no_sim">无 SIM 卡</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-rHK/cm_caf.xml b/res/values-zh-rHK/cm_caf.xml
deleted file mode 100644
index c0fcec2f..00000000
--- a/res/values-zh-rHK/cm_caf.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="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="vt_init_fail_str">視訊傳輸初始化失敗。調降至 VoLTE 的通話模式\n</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="sub_1">SIM 卡 1</string>
-  <string name="sub_2">SIM 卡 2</string>
-</resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 248182eb..57f065fb 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -22,5 +23,4 @@
   <string name="onscreenBlacklistText">黑名單</string>
   <string name="blacklist_dialog_title">新增到黑名單</string>
   <string name="blacklist_dialog_message">未來從 <xliff:g id="number">%s</xliff:g> 的電話將列入黑名單</string>
-  <string name="sub_no_sim">沒有 SIM 卡</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_caf.xml b/res/values-zh-rTW/cm_caf.xml
deleted file mode 100644
index 969d845c..00000000
--- a/res/values-zh-rTW/cm_caf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2014 The CyanogenMod 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="callFailed_dialToUssd">DIAL 請求已修改為 USSD 請求。</string>
-  <string name="modify_call_prompt_yes">是</string>
-  <string name="modify_call_prompt_no">否</string>
-  <string name="modify_call_option_vt">VT</string>
-  <string name="upgrade_vt_tx_prompt">是否將通話升級到僅傳出視訊通話？</string>
-  <string name="sub_1">SIM 卡 1</string>
-  <string name="sub_2">SIM 卡 2</string>
-</resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index d17545be..155116ad 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--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.
@@ -19,5 +20,4 @@
   <string name="incall_call_type_label_forwarded">已轉發通話</string>
   <string name="onscreenBlacklistText">黑名單</string>
   <string name="blacklist_dialog_title">新增至黑名單</string>
-  <string name="sub_no_sim">沒有 SIM 卡</string>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index f84117b7..d0b5e593 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      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.
@@ -15,6 +16,57 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- In-call screen: call failure reason (call modified to USSD request) -->
+    <string name="callFailed_dialToUssd">DIAL request modified to USSD request.</string>
+    <!-- In-call screen: call failure reason (call modified to SS request) -->
+    <string name="callFailed_dialToSs">DIAL request modified to SS request.</string>
+    <!-- In-call screen: call failure reason (call modified to call with modified data) -->
+    <string name="callFailed_dialToDial">DIAL request modified to DIAL with different number.</string>
+
+    <!-- In-call screen: call failure reason (call denied because call barring is ON on MT side ) -->
+    <string name="callFailed_incoming_cb_enabled">Party has barred all incoming calls.</string>
+    <!-- In-call screen: status label for an incoming call that is not answered and forwarded  -->
+    <string name="callUnanswered_forwarded">Call unanswered and forwarded</string>
+
+    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call -->
+    <string name="modify_call_prompt_yes">Yes</string>
+    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call-->
+    <string name="modify_call_prompt_no">No</string>
+    <!-- In-call screen: Modify call request failure. -->
+    <string name="modify_call_failure_str">Request to modify call failed\n</string>
+
+    <!-- In-call screen: Modify Call Options for IMS call -->
+    <string name="modify_call_option_title">Select type of call</string>
+    <string name="modify_call_option_vt">VT</string>
+    <string name="modify_call_option_vt_tx">Video transmit</string>
+    <string name="modify_call_option_vt_rx">Video receive</string>
+    <string name="modify_call_option_voice">Voice only</string>
+
+    <!-- In-call screen: Incoming Modify Call for IMS call -->
+    <string name="accept_modify_call_request_prompt">Accept request to modify call?</string>
+    <string name="upgrade_vt_prompt">Would you like to upgrade the call to video call?</string>
+    <string name="upgrade_vt_tx_prompt">Would you like to upgrade the call to video transmit only call?</string>
+    <string name="upgrade_vt_rx_prompt">Would you like to upgrade the call to video receive only call?</string>
+
+    <!-- Text for the onscreen "Modify call" button -->
+    <string name="onscreenModifyCallText">Modify call</string>
+
+    <!-- Text for the onscreen "Add Participant" button -->
+    <string name="onscreenAddParticipant">Add participant</string>
+
+    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_target_answer_video">Answer with video</string>
+    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_target_answer_tx_video">Answer with TX video</string>
+    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_target_answer_rx_video">Answer with RX video</string>
+
+    <!-- Description of the answer directions in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_direction_up_right">Up right</string>
+    <string name="description_direction_up_left">Up left</string>
+    <string name="description_direction_down_left">Down left</string>
+    <string name="description_direction_down_right">Down right</string>
+
     <!-- In-call screen: "call type" indication for a forwarded call [CHAR LIMIT=30] -->
     <string name="incall_call_type_label_forwarded">Forwarded call</string>
 
@@ -35,7 +87,12 @@
     <string name="blacklist_dialog_title">Add to blacklist</string>
     <string name="blacklist_dialog_message">Future calls from <xliff:g id="number">%s</xliff:g> will be blocked</string>
 
-    <!-- CallCardFragement operator names -->
-    <string name="sub_no_sim">No SIM</string>
-    <string name="multi_sim_entry_format" translatable="false"><xliff:g id="operator">%1$s</xliff:g>-<xliff:g id="index">%2$d</xliff:g></string>
+    <!-- Set Subscription screen: label sub 1 -->
+    <string name="sub_1">SIM 1</string>
+    <!-- Set Subscription screen: label sub 2 -->
+    <string name="sub_2">SIM 2</string>
+
+    <string name="volume_boost_notify_enabled">Volume boost is enabled</string>
+    <string name="volume_boost_notify_disabled">Volume boost is disabled</string>
+    <string name="volume_boost_notify_unavailable">Extra volume is not available when using a headset</string>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100644
index 00000000..8ec084d4
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Copyright (c) 2014, The Linux Foundation. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources>
+    <!-- Dismiss the Keyguard screen when there is active call. -->
+    <bool name="config_incall_dismiss_keyguard">true</bool>
+    <bool name="volume_boost_enabled">false</bool>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3bb5cf33..04691718 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution, Apache license notifications and license are retained
-  ~ for attribution purposes only.
-
+<!--
   ~ Copyright (C) 2013 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,18 +64,8 @@
     <string name="callFailed_outOfService">Out of service area</string>
     <!-- In-call screen: call failure reason (call denied because of current FDN setting) -->
     <string name="callFailed_fdn_only">Outgoing calls are restricted by FDN.</string>
-    <!-- In-call screen: call failure reason (call modified to USSD request) -->
-    <string name="callFailed_dialToUssd">DIAL request modified to USSD request.</string>
-    <!-- In-call screen: call failure reason (call modified to SS request) -->
-    <string name="callFailed_dialToSs">DIAL request modified to SS request.</string>
-    <!-- In-call screen: call failure reason (call modified to call with modified data) -->
-    <string name="callFailed_dialToDial">DIAL request modified to DIAL with different number.</string>
     <!-- In-call screen: call failure reason (call denied because call barring is on) -->
     <string name="callFailed_cb_enabled">You can\'t make outgoing calls while call barring is on.</string>
-    <!-- In-call screen: call failure reason (call denied because call barring is ON on MT side ) -->
-    <string name="callFailed_incoming_cb_enabled">Party has barred all incoming calls.</string>
-    <!-- In-call screen: status label for an incoming call that is not answered and forwarded  -->
-    <string name="callUnanswered_forwarded">Call unanswered and forwarded</string>
     <!-- In-call screen: call failure reason (call denied because domain specific access control is on) -->
     <string name="callFailed_dsac_restricted">All calls are restricted by access control.</string>
     <!-- In-call screen: call failure reason (Emergency call denied because domain specific access control is on)-->
@@ -126,28 +113,6 @@
          for a text widget that lets the user enter the digits that should
          replace the "wild" character. -->
     <string name="wild_prompt_str">Replace wild character with</string>
-    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call -->
-    <string name="modify_call_prompt_yes">Yes</string>
-    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call-->
-    <string name="modify_call_prompt_no">No</string>
-    <!-- In-call screen: Modify call request failure. -->
-    <string name="modify_call_failure_str">Request to modify call failed\n</string>
-
-    <!-- In-call screen: Modify Call Options for IMS call -->
-    <string name="modify_call_option_title">Select type of call</string>
-    <string name="modify_call_option_vt">VT</string>
-    <string name="modify_call_option_vt_tx">Video transmit</string>
-    <string name="modify_call_option_vt_rx">Video receive</string>
-    <string name="modify_call_option_voice">Voice only</string>
-
-    <!-- In-call screen: Incoming Modify Call for IMS call -->
-    <string name="accept_modify_call_request_prompt">Accept request to modify call?</string>
-    <string name="upgrade_vt_prompt">Would you like to upgrade the call to video call?</string>
-    <string name="upgrade_vt_tx_prompt">Would you like to upgrade the call to video transmit only call?</string>
-    <string name="upgrade_vt_rx_prompt">Would you like to upgrade the call to video receive only call?</string>
-
-    <!-- In-call screen: VT call dpl init failure. -->
-    <string name="vt_init_fail_str">Video transmit initialization failed. Downgrading call to VoLTE\n</string>
 
     <!-- In-call screen: status label for a conference call -->
     <string name="caller_manage_header">Conference call <xliff:g id="conf_call_time">%s</xliff:g></string>
@@ -285,8 +250,6 @@
     <string name="onscreenHoldText">Hold</string>
     <!-- Text for the onscreen "End call" button -->
     <string name="onscreenEndCallText">End</string>
-    <!-- Text for the onscreen "Modify call" button -->
-    <string name="onscreenModifyCallText">Modify call</string>
     <!-- Text for the onscreen "Show Dialpad" button -->
     <string name="onscreenShowDialpadText">Dialpad</string>
     <!-- Text for the onscreen "Mute" button -->
@@ -307,8 +270,6 @@
     <!-- Text for the onscreen "Video call" button used to change a voice call
          to a video call. [CHAR LIMIT=10] -->
     <string name="onscreenVideoCallText">Video call</string>
-    <!-- Text for the onscreen "Add Participant" button -->
-    <string name="onscreenAddParticipant">Add participant</string>
 
     <!-- For incoming calls, this is a string we can get from a CDMA network instead of
          the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
@@ -492,22 +453,11 @@
 
     <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
     <string name="description_target_answer">Answer</string>
-    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_target_answer_video">Answer with video</string>
-    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_target_answer_tx_video">Answer with TX video</string>
-    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_target_answer_rx_video">Answer with RX video</string>
     <!-- Description of the send_sms target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
     <string name="description_target_send_sms">Send SMS</string>
     <!-- Description of the decline on target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
     <string name="description_target_decline">Decline</string>
 
-    <!-- Description of the answer directions in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_direction_up_right">Up right</string>
-    <string name="description_direction_up_left">Up left</string>
-    <string name="description_direction_down_left">Down left</string>
-    <string name="description_direction_down_right">Down right</string>
     <!-- Description of the up direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
     <string name="description_direction_up">Slide up for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
     <!-- Description of the left direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
@@ -617,9 +567,4 @@
     <string name="dialpad_star_letters"></string>
     <!--  Do not translate. -->
     <string name="dialpad_pound_letters"></string>
-
-    <!-- Set Subscription screen: label sub 1 -->
-    <string name="sub_1">SIM 1</string>
-    <!-- Set Subscription screen: label sub 2 -->
-    <string name="sub_2">SIM 2</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3fb2bb28..8854c79b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -131,6 +131,13 @@
         <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>
 
+    <!-- Theme for the MsimInCallActivity activity.  This theme is set after the view
+         of the activity is drawn. -->
+    <style name="InCallScreenWithActionBar" parent="@android:style/Theme.Holo">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
+    </style>
+
     <style name="InCallDialpadTableRowStyle">
         <item name="android:layout_height">0dp</item>
         <item name="android:layout_weight">1</item>
diff --git a/src/com/android/incallui/AnswerFragment.java b/src/com/android/incallui/AnswerFragment.java
index 4302920d..93573459 100644
--- a/src/com/android/incallui/AnswerFragment.java
+++ b/src/com/android/incallui/AnswerFragment.java
@@ -104,6 +104,9 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
 
     @Override
     public void showAnswerUi(boolean show) {
+        if (show && getActivity() != null && getActivity() instanceof InCallActivity) {
+            ((InCallActivity) getActivity()).displayManageConferencePanel(false);
+        }
         getView().setVisibility(show ? View.VISIBLE : View.GONE);
 
         Log.d(this, "Show answer UI: " + show);
diff --git a/src/com/android/incallui/CallButtonPresenter.java b/src/com/android/incallui/CallButtonPresenter.java
index 12b92f13..d76c3e99 100644
--- a/src/com/android/incallui/CallButtonPresenter.java
+++ b/src/com/android/incallui/CallButtonPresenter.java
@@ -44,6 +44,8 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
     private boolean mAutomaticallyMuted = false;
     private boolean mPreviousMuteState = false;
 
+    private int mPreviousSub = 0;
+
     private boolean mShowGenericMerge = false;
     private boolean mShowManageConference = false;
     private boolean mShowButtonsIfIdle = true;
@@ -213,9 +215,9 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         // Automatically mute the current call
         mAutomaticallyMuted = true;
         mPreviousMuteState = AudioModeProvider.getInstance().getMute();
+        mPreviousSub = mCall.getSubscription();
         // Simulate a click on the mute button
-        muteClicked(true);
-
+        CallCommandClient.getInstance().muteInternal(true);
         CallCommandClient.getInstance().addCall();
     }
 
@@ -370,8 +372,11 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
             updateExtraButtonRow();
 
             boolean canRecord = CallRecorder.getInstance().isEnabled() &&
-                    CallList.getInstance().getActiveCall() != null;
+                CallList.getInstance().getActiveCall() != null;
             ui.showRecording(canRecord);
+        } else {
+            ui.enableAddParticipant(false);
+            ui.showModifyCall(false);
         }
     }
 
@@ -395,12 +400,16 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
 
     public void refreshMuteState() {
         // Restore the previous mute state
+        if (mAutomaticallyMuted) {
+            CallCommandClient.getInstance().updateMuteState(
+                    mPreviousSub, mPreviousMuteState);
+        }
         if (mAutomaticallyMuted &&
                 AudioModeProvider.getInstance().getMute() != mPreviousMuteState) {
             if (getUi() == null) {
                 return;
             }
-            muteClicked(mPreviousMuteState);
+            CallCommandClient.getInstance().muteInternal(mPreviousMuteState);
         }
         mAutomaticallyMuted = false;
     }
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index b46fe229..cfa73fa6 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -21,12 +21,18 @@
 package com.android.incallui;
 
 import android.animation.LayoutTransition;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.media.AudioManager;
 import android.os.Bundle;
 import static android.telephony.TelephonyManager.SIM_STATE_ABSENT;
 import android.telephony.MSimTelephonyManager;
+import android.telephony.TelephonyManager;
 import android.os.SystemProperties;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
@@ -37,8 +43,10 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.android.services.telephony.common.AudioMode;
 import com.android.services.telephony.common.Call;
@@ -65,6 +73,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private TextView mSubscriptionId;
     private ViewGroup mSupplementaryInfoContainer;
     private TextView mCallRecordingTimer;
+    private Button mVBButton;
+    private AudioManager mAudioManager;
+    private Toast mVBNotify;
+    private boolean mVBEnabled;
 
     // Secondary caller info
     private ViewStub mSecondaryCallInfo;
@@ -84,6 +96,11 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private static final int IMS_AUDIO_OUTPUT_DEFAULT = 0;
     private static final int IMS_AUDIO_OUTPUT_DISABLE_SPEAKER = 1;
 
+    private static final int TTY_MODE_OFF = 0;
+    private static final int TTY_MODE_HCO = 2;
+
+    private static final String VOLUME_BOOST = "volume_boost";
+
     /**
      * Controls audio route for VT calls.
      * 0 - Use the default audio routing strategy.
@@ -157,8 +174,16 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        mAudioManager = (AudioManager) getActivity()
+                .getSystemService(Context.AUDIO_SERVICE);
     }
 
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mVBEnabled = activity.getResources().getBoolean(R.bool.volume_boost_enabled);
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -208,6 +233,14 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         transition.enableTransitionType(LayoutTransition.CHANGING);
         transition.setAnimateParentHierarchy(false);
         transition.setDuration(200);
+
+        if (mVBEnabled) {
+            mVBButton = (Button) view.findViewById(R.id.volumeBoost);
+            if (null != mVBButton) {
+                mVBButton.setOnClickListener(mVBListener);
+                mVBButton.setVisibility(View.INVISIBLE);
+            }
+        }
     }
 
     @Override
@@ -305,14 +338,15 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         if (tm.isMultiSimEnabled() && !(tm.getMultiSimConfiguration()
                 == MSimTelephonyManager.MultiSimVariants.DSDA)) {
+            final String multiSimName = "perferred_name_sub";
             int subscription = getPresenter().getActiveSubscription();
-            String operatorName = tm.getSimState(subscription) != SIM_STATE_ABSENT
-                    ? tm.getNetworkOperatorName(subscription) : getString(R.string.sub_no_sim);
-            String sub = getString(R.string.multi_sim_entry_format, operatorName,
-                    subscription + 1);
 
-            if (subscription != -1) {
-                showSubscriptionInfo(sub);
+            if ((subscription != -1) && (!isSipCall)
+                    && MSimTelephonyManager.getDefault().getSimState(subscription)
+                            != TelephonyManager.SIM_STATE_ABSENT) {
+                final String simName = Settings.System.getString(getActivity()
+                        .getContentResolver(), multiSimName + (subscription + 1));
+                showSubscriptionInfo(simName);
             }
         }
 
@@ -372,6 +406,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         // States other than disconnected not yet supported
         callStateLabel = getCallStateLabelFromState(state, cause, isWaitingForRemoteSide);
 
+        if (mVBEnabled) {
+            updateVBbyCall(state);
+        }
+
         Log.v(this, "setCallState " + callStateLabel);
         Log.v(this, "DisconnectCause " + cause);
         Log.v(this, "bluetooth on " + bluetoothOn);
@@ -815,4 +853,85 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private void loge(String msg) {
         Log.e(this, msg);
     }
+
+    private OnClickListener mVBListener = new OnClickListener() {
+        @Override
+        public void onClick(View view) {
+            if (isVBAvailable()) {
+                switchVBStatus();
+            }
+
+            updateVBButton();
+            showVBNotify();
+        }
+    };
+
+    private boolean isVBAvailable() {
+        int mode = AudioModeProvider.getInstance().getAudioMode();
+
+        int settingsTtyMode = Settings.Secure.getInt(getActivity().getContentResolver(),
+                Settings.Secure.PREFERRED_TTY_MODE, TTY_MODE_OFF);
+
+        return (mode == AudioMode.EARPIECE || mode == AudioMode.SPEAKER
+                || settingsTtyMode == TTY_MODE_HCO);
+    }
+
+    private void switchVBStatus() {
+        if (mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
+            mAudioManager.setParameters(VOLUME_BOOST + "=off");
+        } else {
+            mAudioManager.setParameters(VOLUME_BOOST + "=on");
+        }
+    }
+
+    private void updateVBButton() {
+        if (isVBAvailable()) {
+            if (mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
+                mVBButton.setBackgroundResource(R.drawable.volume_in_boost_sel);
+            } else {
+                mVBButton.setBackgroundResource(R.drawable.volume_in_boost_nor);
+            }
+        } else {
+            mVBButton.setBackgroundResource(R.drawable.volume_in_boost_unavailable);
+        }
+    }
+
+    private void showVBNotify() {
+        if (mVBNotify != null) {
+            mVBNotify.cancel();
+        }
+
+        int textResId;
+
+        if (isVBAvailable()) {
+            if (mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
+                textResId = R.string.volume_boost_notify_enabled;
+            } else {
+                textResId = R.string.volume_boost_notify_disabled;
+            }
+        } else {
+            textResId = R.string.volume_boost_notify_unavailable;
+        }
+
+        mVBNotify = Toast.makeText(getActivity(), textResId, Toast.LENGTH_SHORT);
+        mVBNotify.show();
+    }
+
+    private void updateVBbyCall(int state) {
+        // If there is Ims call, disable volume boost
+        boolean hasImsCall = CallUtils.hasImsCall(CallList.getInstance());
+
+        updateVBButton();
+
+        if (Call.State.ACTIVE == state && !hasImsCall) {
+            mVBButton.setVisibility(View.VISIBLE);
+        } else if (Call.State.DISCONNECTED == state || Call.State.IDLE == state) {
+            if (!CallList.getInstance().existsLiveCall()
+                    && mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
+                mVBButton.setVisibility(View.INVISIBLE);
+
+                mAudioManager.setParameters(VOLUME_BOOST + "=off");
+            }
+        }
+    }
 }
diff --git a/src/com/android/incallui/CallCommandClient.java b/src/com/android/incallui/CallCommandClient.java
index f55c9d8d..d6f89d8a 100644
--- a/src/com/android/incallui/CallCommandClient.java
+++ b/src/com/android/incallui/CallCommandClient.java
@@ -114,6 +114,31 @@ public class CallCommandClient {
         }
     }
 
+    public void muteInternal(boolean onOff) {
+        Log.i(this, "muteInternal: " + onOff);
+        if (mCommandService == null) {
+            Log.e(this, "Cannot mute call; CallCommandService == null");
+            return;
+        }
+        try {
+            mCommandService.muteInternal(onOff);
+        } catch (RemoteException e) {
+            Log.e(this, "Error muting phone.", e);
+        }
+     }
+
+    public void updateMuteState(int sub, boolean muted) {
+        if (mCommandService == null) {
+            Log.e(this, "Cannot updateMuteState; CallCommandService == null");
+            return;
+        }
+        try {
+            mCommandService.updateMuteState(sub, muted);
+        } catch (RemoteException e) {
+            Log.e(this, "Error updateMuteState.", e);
+        }
+    }
+
     public void hold(int callId, boolean onOff) {
         Log.i(this, "hold call(" + onOff + "): " + callId);
         if (mCommandService == null) {
@@ -358,6 +383,32 @@ public class CallCommandClient {
         }
     }
 
+    public void setSubInConversation(int subscriptionId) {
+        Log.i(this, "set conversation sub = " + subscriptionId);
+        if (mCommandService == null) {
+            Log.e(this, "Cannot set conversation Sub; CallCommandService == null");
+            return;
+        }
+        try {
+            mCommandService.setSubInConversation(subscriptionId);
+        } catch (RemoteException e) {
+            Log.e(this, "Error setSubInConversation.", e);
+        }
+    }
+
+    public void setActiveAndConversationSub(int subscriptionId) {
+        Log.i(this, "setActiveAndConversationSub = " + subscriptionId);
+        if (mCommandService == null) {
+            Log.e(this, "Cannot set active Sub; CallCommandService == null");
+            return;
+        }
+        try {
+            mCommandService.setActiveAndConversationSub(subscriptionId);
+        } catch (RemoteException e) {
+            Log.e(this, "Error setActiveSub.", e);
+        }
+    }
+
     public int getActiveSubscription() {
         int subscriptionId = MSimConstants.INVALID_SUBSCRIPTION;
 
diff --git a/src/com/android/incallui/CallHandlerService.java b/src/com/android/incallui/CallHandlerService.java
index b1ff2c6c..29e4fb5f 100644
--- a/src/com/android/incallui/CallHandlerService.java
+++ b/src/com/android/incallui/CallHandlerService.java
@@ -17,7 +17,9 @@
 package com.android.incallui;
 
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -54,7 +56,9 @@ public class CallHandlerService extends Service {
 
     private static final int LARGEST_MSG_ID = ON_SUPP_SERVICE_FAIL;
 
+    private static final String VOLUME_BOOST = "volume_boost";
 
+    private AudioManager mAudioManager;
     private CallList mCallList;
     private Handler mMainHandler;
     private Object mHandlerInitLock = new Object();
@@ -68,6 +72,7 @@ public class CallHandlerService extends Service {
     public void onCreate() {
         Log.i(TAG, "onCreate");
         super.onCreate();
+        mAudioManager = (AudioManager) getSystemService (Context.AUDIO_SERVICE);
 
         synchronized(mHandlerInitLock) {
             if (mMainHandler == null) {
@@ -322,12 +327,17 @@ public class CallHandlerService extends Service {
             case ON_AUDIO_MODE:
                 Log.i(TAG, "ON_AUDIO_MODE: " +
                         AudioMode.toString(msg.arg1) + ", muted (" + (msg.arg2 == 1) + ")");
+
+                updateVBStatus(msg.arg1);
+
                 mAudioModeProvider.onAudioModeChange(msg.arg1, msg.arg2 == 1);
                 break;
             case ON_SUPPORTED_AUDIO_MODE:
                 Log.i(TAG, "ON_SUPPORTED_AUDIO_MODE: " + AudioMode.toString(
                         msg.arg1));
 
+                updateVBStatus(msg.arg1);
+
                 mAudioModeProvider.onSupportedAudioModeChange(msg.arg1);
                 break;
             case ON_BRING_TO_FOREGROUND:
@@ -360,4 +370,20 @@ public class CallHandlerService extends Service {
                 break;
         }
     }
+
+    /**
+     * Whenever call audio device change, turn off volume boost function.
+     * */
+    private void updateVBStatus(int newMode) {
+        /* When normal call audio mode changed, disable the volume boost */
+        if (!(newMode == AudioMode.EARPIECE || newMode == AudioMode.BLUETOOTH
+                || newMode == AudioMode.WIRED_HEADSET || newMode == AudioMode.SPEAKER)) {
+            return;
+        }
+
+        if (newMode != mAudioModeProvider.getAudioMode()
+                && mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
+            mAudioManager.setParameters(VOLUME_BOOST + "=off");
+        }
+    }
 }
diff --git a/src/com/android/incallui/CallList.java b/src/com/android/incallui/CallList.java
index e9cab0da..b8371e3b 100644
--- a/src/com/android/incallui/CallList.java
+++ b/src/com/android/incallui/CallList.java
@@ -116,6 +116,10 @@ public class CallList {
         // will switch active sub to a wrong sub(which is not ringing)
         if (MSimTelephonyManager.getDefault().isMultiSimEnabled())
             CallCommandClient.getInstance().setActiveSubscription(call.getSubscription());
+        // will switch active sub to to a incorrect sub(which is not ringing)
+        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {
+            CallCommandClient.getInstance().setActiveSubscription(call.getSubscription());
+        }
         updateActiveSuscription();
 
         updateCallInMap(call);
@@ -548,6 +552,16 @@ public class CallList {
         }
     }
 
+    public boolean existsConnectedCall(int subscription) {
+        for (Call call : mCallMap.values()) {
+            if (!isCallDead(call) && call.getState() != Call.State.DISCONNECTED
+                    && call.getSubscription() == subscription) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Returns true, if any voice call in ACTIVE on the provided subscription.
      */
@@ -564,15 +578,24 @@ public class CallList {
      * This method checks whether any other subscription currently has active voice
      * call other than current active subscription, if yes it makes that other
      * subscription as active subscription i.e user visible subscription.
+     * @param retainLch  whether to retain the LCH state of the other active sub
      */
-    public boolean switchToOtherActiveSubscription() {
+    public boolean switchToOtherActiveSubscription(boolean retainLch) {
         int activeSub = getActiveSubscription();
         boolean subSwitched = false;
 
         for (int i = 0; i < MSimTelephonyManager.getDefault().getPhoneCount(); i++) {
             if ((i != activeSub) && existsLiveCall(i)) {
-                Log.i(this, "switchToOtherActiveSubscription, sub = " + i);
+                Log.i(this, "switchToOtherActiveSubscription, sub = " + i +
+                        " retainLch = " + retainLch);
                 subSwitched = true;
+                if (retainLch) {
+                    CallCommandClient.getInstance().setSubInConversation(
+                            MSimConstants.INVALID_SUBSCRIPTION);
+                    CallCommandClient.getInstance().setActiveSubscription(i);
+                } else {
+                    CallCommandClient.getInstance().setActiveAndConversationSub(i);
+                }
                 setActiveSubscription(i);
                 break;
             }
diff --git a/src/com/android/incallui/CallerInfo.java b/src/com/android/incallui/CallerInfo.java
index ea6ebd9f..187c8b71 100644
--- a/src/com/android/incallui/CallerInfo.java
+++ b/src/com/android/incallui/CallerInfo.java
@@ -23,6 +23,7 @@ import android.graphics.drawable.Drawable;
 import android.location.Country;
 import android.location.CountryDetector;
 import android.net.Uri;
+import android.os.Bundle;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.PhoneLookup;
@@ -275,7 +276,7 @@ public class CallerInfo {
         // or if it is the voicemail number.  If it is either, take a
         // shortcut and skip the query.
         if (PhoneNumberUtils.isLocalEmergencyNumber(number, context)) {
-            return new CallerInfo().markAsEmergency(context);
+            return new CallerInfo().markAsEmergency(context, number);
         } else if (PhoneNumberUtils.isVoiceMailNumber(number)) {
             return new CallerInfo().markAsVoiceMail();
         }
@@ -379,8 +380,9 @@ public class CallerInfo {
     // should set the phone number to the dialed number and name to
     // 'Emergency Number' and let the UI make the decision about what
     // should be displayed.
-    /* package */ CallerInfo markAsEmergency(Context context) {
-        phoneNumber = context.getString(R.string.emergency_call_dialog_number_for_display);
+    /* package */ CallerInfo markAsEmergency(Context context, String number) {
+        phoneNumber = context.getString(R.string.emergency_call_dialog_number_for_display) + " "
+                + number;
         photoResource = R.drawable.picture_emergency;
         mIsEmergency = true;
         return this;
@@ -516,7 +518,22 @@ public class CallerInfo {
      */
     public void updateGeoDescription(Context context, String fallbackNumber) {
         String number = TextUtils.isEmpty(phoneNumber) ? fallbackNumber : phoneNumber;
-        geoDescription = getGeoDescription(context, number);
+        Uri CONTENT_URI = Uri.parse("content://geocoded_location/location");
+        String METHOD_QUERY = "getLocation";
+        String RESULT_ADDRESS = "location";
+        String address = null;
+        if (context.getContentResolver().acquireProvider(CONTENT_URI) != null) {
+            Bundle result = context.getContentResolver().call(CONTENT_URI, METHOD_QUERY, number,
+                    null);
+            if (result != null) {
+                address = result.getString(RESULT_ADDRESS);
+            }
+        }
+        if (address != null) {
+            geoDescription = address;
+        } else {
+            geoDescription = getGeoDescription(context, number);
+        }
     }
 
     /**
diff --git a/src/com/android/incallui/CallerInfoAsyncQuery.java b/src/com/android/incallui/CallerInfoAsyncQuery.java
index c09baf21..b642ed41 100644
--- a/src/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/src/com/android/incallui/CallerInfoAsyncQuery.java
@@ -229,7 +229,7 @@ public class CallerInfoAsyncQuery {
                 if (cw.event == EVENT_EMERGENCY_NUMBER) {
                     // Note we're setting the phone number here (refer to javadoc
                     // comments at the top of CallerInfo class).
-                    mCallerInfo = new CallerInfo().markAsEmergency(mQueryContext);
+                    mCallerInfo = new CallerInfo().markAsEmergency(mQueryContext, cw.number);
                 } else if (cw.event == EVENT_VOICEMAIL_NUMBER) {
                     mCallerInfo = new CallerInfo().markAsVoiceMail();
                 } else {
diff --git a/src/com/android/incallui/DialpadFragment.java b/src/com/android/incallui/DialpadFragment.java
index 236b38c9..84f03e90 100644
--- a/src/com/android/incallui/DialpadFragment.java
+++ b/src/com/android/incallui/DialpadFragment.java
@@ -19,6 +19,7 @@ package com.android.incallui;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
 import android.text.method.DialerKeyListener;
 import android.util.AttributeSet;
@@ -182,21 +183,29 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
 
             // find the character
             char c = (char) lookup(event, content);
-
-            // if not a long press, and parent onKeyDown accepts the input
-            if (event.getRepeatCount() == 0 && super.onKeyDown(view, content, keyCode, event)) {
-
-                boolean keyOK = ok(getAcceptedChars(), c);
-
-                // if the character is a valid dtmf code, start playing the tone and send the
-                // code.
-                if (keyOK) {
-                    Log.d(this, "DTMFKeyListener reading '" + c + "' from input.");
-                    getPresenter().processDtmf(c);
-                } else {
-                    Log.d(this, "DTMFKeyListener rejecting '" + c + "' from input.");
+            if (mDtmfDialerField != null) {
+                String str = mDtmfDialerField.getText().toString();
+                // if not a long press, and parent onKeyDown accepts the input
+                if (event.getRepeatCount() == 0 && super.onKeyDown(view, content, keyCode, event)) {
+
+                    boolean keyOK = ok(getAcceptedChars(), c);
+
+                    // if the character is a valid dtmf code, start playing the tone and send the
+                    // code.
+                    if (keyOK) {
+                        Log.d(this, "DTMFKeyListener reading '" + c + "' from input.");
+                        if (PhoneNumberUtils.is12Key(c)) {
+                            Log.d(this, "updating display and sending dtmf tone for '" + c + "'");
+                            CallCommandClient.getInstance().playDtmfTone(c, false);
+                        } else {
+                            Log.d(this, "ignoring dtmf request for '" + c + "'");
+                        }
+                    } else {
+                        mDtmfDialerField.setText(str);
+                        Log.d(this, "DTMFKeyListener rejecting '" + c + "' from input.");
+                    }
+                    return true;
                 }
-                return true;
             }
             return false;
         }
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index 25cf76ed..6d461254 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -148,6 +148,16 @@ public class InCallActivity extends Activity {
                 false, mSettingsObserver);
         updateSettings();
 
+        // Handle the Intent we were launched with, but only if this is the
+        // the very first time we're being launched (ie. NOT if we're being
+        // re-initialized after previously being shut down.)
+        // Once we're up and running, any future Intents we need
+        // to handle will come in via the onNewIntent() method.
+        if (icicle == null) {
+            Log.d(this, "this is our very first launch, checking intent...");
+            internalResolveIntent(getIntent());
+        }
+
         Log.d(this, "onCreate(): exit");
     }
 
@@ -182,6 +192,11 @@ public class InCallActivity extends Activity {
             registerReceiver(mLidStateChangeReceiver, new IntentFilter(
                     WindowManagerPolicy.ACTION_LID_STATE_CHANGED));
         }
+
+        final Call call = CallList.getInstance().getIncomingCall();
+        if (call != null) {
+            CallCommandClient.getInstance().setSystemBarNavigationEnabled(false);
+        }
     }
 
     // onPause is guaranteed to be called when the InCallActivity goes
@@ -199,6 +214,8 @@ public class InCallActivity extends Activity {
         mDialpadFragment.onDialerKeyUp(null);
 
         InCallPresenter.getInstance().onUiShowing(false);
+
+        CallCommandClient.getInstance().setSystemBarNavigationEnabled(true);
     }
 
     @Override
@@ -581,6 +598,8 @@ public class InCallActivity extends Activity {
             mConferenceManagerFragment.setVisible(true);
             mConferenceManagerShown = true;
             updateSystemBarTranslucency();
+        } else {
+            mConferenceManagerFragment.setVisible(false);
         }
     }
 
@@ -753,8 +772,7 @@ public class InCallActivity extends Activity {
         Log.d(this, "maybeShowErrorDialogOnDisconnect: Call=" + call);
 
         if (!isFinishing() && call != null) {
-            final int resId = getResIdForDisconnectCause(call.getDisconnectCause(),
-                    call.getSuppServNotification());
+            final int resId = getResIdForDisconnectCause(call);
             if (resId != INVALID_RES_ID) {
                 showErrorDialog(resId);
             }
@@ -857,26 +875,18 @@ public class InCallActivity extends Activity {
         mDialog.show();
     }
 
-    private int getResIdForDisconnectCause(Call.DisconnectCause cause,
-            Call.SsNotification notification) {
+    private int getResIdForDisconnectCause(Call call) {
+        Call.DisconnectCause cause = call.getDisconnectCause();
         int resId = INVALID_RES_ID;
 
         if (cause == Call.DisconnectCause.INCOMING_MISSED) {
-            // If the network sends SVC Notification then this dialog will be displayed
-            // in case of B when the incoming call at B is not answered and gets forwarded
-            // to C
-            if (notification != null && notification.notificationType == 1 &&
-                    notification.code ==
-                    Call.SsNotification.MT_CODE_ADDITIONAL_CALL_FORWARDED) {
+            if (call.wasAdditionalCallForwarded()) {
                 resId = R.string.callUnanswered_forwarded;
             }
         } else if (cause == Call.DisconnectCause.CALL_BARRED) {
             // When call is disconnected with this code then it can either be barring from
             // MO side or MT side.
-            // In MT case, if network sends SVC Notification then this dialog will be
-            // displayed when A is calling B & incoming is barred on B.
-            if (notification != null && notification.notificationType == 0 &&
-                    notification.code == Call.SsNotification.MO_CODE_INCOMING_CALLS_BARRED) {
+            if (call.isRemoteIncomingCallBarringEnabled()) {
                 resId = R.string.callFailed_incoming_cb_enabled;
             } else {
                 resId = R.string.callFailed_cb_enabled;
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index 5204d22b..e328169c 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
  * Not a Contribution, Apache license notifications and license are retained
  * for attribution purposes only.
  *
@@ -100,6 +100,8 @@ public class InCallPresenter implements CallList.Listener {
 
     private boolean isImsMediaInitialized = false;
 
+    private Call.DisconnectCause mLastDisconnectCause = Call.DisconnectCause.UNKNOWN;
+
     public static synchronized InCallPresenter getInstance() {
         if (sInCallPresenter == null) {
             sInCallPresenter = new InCallPresenter();
@@ -173,9 +175,11 @@ public class InCallPresenter implements CallList.Listener {
         final boolean doFinish = (mInCallActivity != null && isActivityStarted());
         Log.i(this, "Hide in call UI: " + doFinish);
 
-        if ((mCallList != null) && !(mCallList.existsLiveCall(mCallList.getActiveSubscription()))
-                && mCallList.switchToOtherActiveSubscription()) {
-            return;
+        if ((mCallList != null) && !(mCallList.existsLiveCall(mCallList.getActiveSubscription()))) {
+            Log.d(this, "Switch active sub. Last disc cause = " + mLastDisconnectCause);
+            boolean retainLch = (mLastDisconnectCause == Call.DisconnectCause.NORMAL)
+                    ? true: false;
+            if (mCallList.switchToOtherActiveSubscription(retainLch)) return;
         }
 
         if (doFinish) {
@@ -364,7 +368,12 @@ public class InCallPresenter implements CallList.Listener {
             if (newState != InCallState.DISCONNECTING) {
                 mInCallActivity.updateSystemBarTranslucency();
             }
+        }
 
+        // Get the config whether we need to dismiss the keyguard screen, Google design is true.
+        boolean shouldDismissKeyguard = (mInCallActivity != null &&
+                mInCallActivity.getResources().getBoolean(R.bool.config_incall_dismiss_keyguard));
+        if (isActivityStarted() && shouldDismissKeyguard) {
             final boolean hasCall = callList.getActiveOrBackgroundCall() != null ||
                     callList.getOutgoingCall() != null;
             mInCallActivity.dismissKeyguard(hasCall);
@@ -406,13 +415,18 @@ public class InCallPresenter implements CallList.Listener {
      */
     @Override
     public void onDisconnect(Call call) {
+        mLastDisconnectCause = (call != null ) ? call.getDisconnectCause():
+                Call.DisconnectCause.UNKNOWN;
         hideDialpadForDisconnect();
         maybeShowErrorDialogOnDisconnect(call);
 
         // We need to do the run the same code as onCallListChange.
         onCallListChange(CallList.getInstance());
 
-        if (isActivityStarted()) {
+        // Get the config whether we need to dismiss the keyguard screen, Google design is true.
+        boolean shouldDismissKeyguard = (mInCallActivity != null &&
+                mInCallActivity.getResources().getBoolean(R.bool.config_incall_dismiss_keyguard));
+        if (isActivityStarted() && shouldDismissKeyguard) {
             mInCallActivity.dismissKeyguard(false);
         }
     }
@@ -673,6 +687,21 @@ public class InCallPresenter implements CallList.Listener {
         }
     }
 
+    private void switchActiveSubIfNeed() {
+        Log.d(this, "startOrFinishUi call list:" + mCallList);
+        if (mCallList != null) {
+            int activeSub = mCallList.getActiveSubscription();
+            boolean hasActiveCall = mCallList.existsConnectedCall(activeSub);
+            Log.d(this, "startOrFinishUi active sub : " + activeSub);
+            Log.d(this, "has connected call in active sub:" + hasActiveCall);
+            if (!hasActiveCall) {
+                Log.d(this, "switch sub in non-dsda, cause " + mLastDisconnectCause);
+                boolean retainLch = mLastDisconnectCause == Call.DisconnectCause.NORMAL;
+                mCallList.switchToOtherActiveSubscription(retainLch);
+            }
+        }
+    }
+
     /**
      * When the state of in-call changes, this is the first method to get called. It determines if
      * the UI needs to be started or finished depending on the new state and does it.
@@ -680,6 +709,12 @@ public class InCallPresenter implements CallList.Listener {
     private InCallState startOrFinishUi(InCallState newState) {
         Log.d(this, "startOrFinishUi: " + mInCallState + " -> " + newState);
 
+        // If there is a CS call in sub2, and there is a SIP call in sub1
+        // disconnected, INCALL state will be got in non-dsda, so need switch
+        // active sub
+        if (newState == InCallState.INCALL) {
+            switchActiveSubIfNeed();
+        }
         // TODO: Consider a proper state machine implementation
 
         // If the state isn't changing, we have already done any starting/stopping of
diff --git a/src/com/android/incallui/MSimAnswerFragment.java b/src/com/android/incallui/MSimAnswerFragment.java
index 92ff5c2c..e3077e0b 100644
--- a/src/com/android/incallui/MSimAnswerFragment.java
+++ b/src/com/android/incallui/MSimAnswerFragment.java
@@ -102,6 +102,9 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter,
 
     @Override
     public void showAnswerUi(boolean show) {
+        if (show && getActivity() != null && getActivity() instanceof MSimInCallActivity) {
+            ((MSimInCallActivity) getActivity()).displayManageConferencePanel(false);
+        }
         getView().setVisibility(show ? View.VISIBLE : View.GONE);
 
         Log.d(this, "Show answer UI: " + show);
@@ -155,6 +158,8 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter,
                 if (mGlowpad != null) {
                     mGlowpad.startPing();
                 }
+                dismissCannedResponsePopup();
+                getPresenter().onDismissDialog();
             }
         });
         mCannedResponsePopup = builder.create();
@@ -239,6 +244,13 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter,
                         getPresenter().onDismissDialog();
                     }
                 })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialogInterface) {
+                        dismissCustomMessagePopup();
+                        getPresenter().onDismissDialog();
+                    }
+                })
                 .setTitle(R.string.respond_via_sms_custom_message);
         mCustomMessagePopup = builder.create();
 
diff --git a/src/com/android/incallui/MSimAnswerPresenter.java b/src/com/android/incallui/MSimAnswerPresenter.java
index f813e65a..424d71b5 100644
--- a/src/com/android/incallui/MSimAnswerPresenter.java
+++ b/src/com/android/incallui/MSimAnswerPresenter.java
@@ -41,10 +41,15 @@ public class MSimAnswerPresenter extends Presenter<MSimAnswerPresenter.AnswerUi>
         super.onUiReady(ui);
 
         final CallList calls = CallList.getInstance();
-        final Call call = calls.getIncomingCall();
-        // TODO: change so that answer presenter never starts up if it's not incoming.
-        if (call != null) {
-            processIncomingCall(call);
+        for (int i = 0; i < MSimTelephonyManager.getDefault().getPhoneCount(); i++) {
+            Call call = calls.getCallWithState(Call.State.INCOMING, 0, i);
+            if (call == null) {
+                call = calls.getCallWithState(Call.State.CALL_WAITING, 0, i);
+            }
+            // TODO: change so that answer presenter never starts up if it's not incoming.
+            if (call != null) {
+                processIncomingCall(call);
+            }
         }
 
         // Listen for incoming calls.
@@ -56,13 +61,14 @@ public class MSimAnswerPresenter extends Presenter<MSimAnswerPresenter.AnswerUi>
     public void onUiUnready(AnswerUi ui) {
         super.onUiUnready(ui);
 
-        int subscription = CallList.getInstance().getActiveSubscription();
         CallList.getInstance().removeListener(this);
 
         // This is necessary because the activity can be destroyed while an incoming call exists.
         // This happens when back button is pressed while incoming call is still being shown.
-        if (mCallId[subscription] != Call.INVALID_CALL_ID) {
-            CallList.getInstance().removeCallUpdateListener(mCallId[subscription], this);
+        for (int i = 0; i < MSimTelephonyManager.getDefault().getPhoneCount(); i++) {
+            if (mCallId[i] != Call.INVALID_CALL_ID) {
+                CallList.getInstance().removeCallUpdateListener(mCallId[i], this);
+            }
         }
         CallList.getInstance().removeActiveSubChangeListener(this);
     }
@@ -137,6 +143,7 @@ public class MSimAnswerPresenter extends Presenter<MSimAnswerPresenter.AnswerUi>
     public void onAnswer(int callType) {
         int subscription = CallList.getInstance().getActiveSubscription();
         if (mCallId[subscription] == Call.INVALID_CALL_ID) {
+            Log.d(this, "onAnswer sub = " + subscription);
             return;
         }
 
@@ -198,6 +205,8 @@ public class MSimAnswerPresenter extends Presenter<MSimAnswerPresenter.AnswerUi>
         } else if ((call == null) && (calls.existsLiveCall(subscription))) {
             Log.i(TAG, "Hide incoming for call id: " + mCallId[subscription] + " " + this);
             getUi().showAnswerUi(false);
+        } else {
+            Log.i(TAG, "No incoming call present for sub = " + subscription + " " + this);
         }
     }
 }
diff --git a/src/com/android/incallui/MSimInCallActivity.java b/src/com/android/incallui/MSimInCallActivity.java
index a216d8d0..cb2ac5b6 100644
--- a/src/com/android/incallui/MSimInCallActivity.java
+++ b/src/com/android/incallui/MSimInCallActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
  * Not a Contribution.
  *
  * Copyright (C) 2006 The Android Open Source Project
@@ -24,7 +24,9 @@ import android.app.FragmentTransaction;
 import android.app.ActionBar.Tab;
 import android.content.res.TypedArray;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.telephony.MSimTelephonyManager;
+import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -45,6 +47,10 @@ 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);
@@ -55,9 +61,9 @@ public class MSimInCallActivity extends InCallActivity {
         // Have the WindowManager filter out touch events that are "too fat".
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
                 | WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
 
+        setTheme(R.style.InCallScreenWithActionBar);
         requestWindowFeature(Window.FEATURE_ACTION_BAR);
 
         getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
@@ -142,13 +148,20 @@ public class MSimInCallActivity extends InCallActivity {
         for (int i = 0; i < phoneCount; i++) {
             mDsdaTabLayout[i] = getLayoutInflater()
                     .inflate(R.layout.msim_tab_sub_info, null);
+            if (MSimTelephonyManager.getDefault().getSimState(i)
+                    == TelephonyManager.SIM_STATE_ABSENT) {
+                ((ImageView)mDsdaTabLayout[i].findViewById(R.id.tabSubIcon))
+                    .setVisibility(View.INVISIBLE);
+                ((TextView)mDsdaTabLayout[i].findViewById(R.id.tabSubText))
+                    .setVisibility(View.INVISIBLE);
+            } else {
+                ((ImageView)mDsdaTabLayout[i].findViewById(R.id.tabSubIcon))
+                        .setBackground(icons.getDrawable(i));
 
-            ((ImageView)mDsdaTabLayout[i].findViewById(R.id.tabSubIcon))
-                    .setBackground(icons.getDrawable(i));
-
-            ((TextView)mDsdaTabLayout[i].findViewById(R.id.tabSubText))
-                    .setText(subString[i]);
-
+                ((TextView)mDsdaTabLayout[i].findViewById(R.id.tabSubText))
+                        .setText(Settings.System.getString(getContentResolver(),
+                                MULTI_SIM_NAME[i]));
+            }
             mDsdaTab[i] = bar.newTab().setCustomView(mDsdaTabLayout[i])
                     .setTabListener(new TabListener(i));
         }
@@ -182,6 +195,7 @@ public class MSimInCallActivity extends InCallActivity {
             bar.addTab(mDsdaTab[subscription], subscription, false);
         }
         mDsdaTabAdd[subscription] = true;
+        Log.d(this, "addDsdaTab, subscription = " + subscription + " tab count = " + tabCount);
     }
 
     private void removeDsdaTab(int subscription) {
@@ -195,6 +209,7 @@ public class MSimInCallActivity extends InCallActivity {
                 return;
             }
         }
+        Log.d(this, "removeDsdaTab, subscription = " + subscription + " tab count = " + tabCount);
     }
 
     private void updateDsdaTabSelection() {
@@ -217,9 +232,15 @@ public class MSimInCallActivity extends InCallActivity {
 
         public void onTabSelected(Tab tab, FragmentTransaction ft) {
             ActionBar bar = getActionBar();
-
-            if (CallList.getInstance().existsLiveCall(mSubscription)) {
-                CallCommandClient.getInstance().setActiveSubscription(mSubscription);
+            int tabCount = bar.getTabCount();
+            //Don't setActiveSubscription if tab count is 1.This is to avoid
+            //setting active subscription automatically when call on one sub
+            //ends and it's corresponding tab is removed.For such cases active
+            //subscription will be set by InCallPresenter.attemptFinishActivity.
+            if (tabCount != TAB_COUNT_ONE && CallList.getInstance().existsLiveCall(mSubscription)
+                    && (CallList.getInstance().getActiveSubscription() != mSubscription)) {
+                Log.i(this, "setactivesub " + mSubscription);
+                CallCommandClient.getInstance().setActiveAndConversationSub(mSubscription);
             }
         }
 
diff --git a/src/com/android/incallui/MediaHandler.java b/src/com/android/incallui/MediaHandler.java
index dbf35562..f31403ea 100644
--- a/src/com/android/incallui/MediaHandler.java
+++ b/src/com/android/incallui/MediaHandler.java
@@ -80,6 +80,7 @@ public class MediaHandler extends Handler {
     public static final int PLAYER_STOP_EVENT = 4;
     public static final int DISPLAY_MODE_EVT = 5;
     public static final int PEER_RESOLUTION_CHANGE_EVT = 6;
+    public static final int STOP_READY_EVT = 9;
 
     protected final RegistrantList mDisplayModeEventRegistrants
             = new RegistrantList();
@@ -128,6 +129,7 @@ public class MediaHandler extends Handler {
         void onStartReadyEvent();
         void onPeerResolutionChangeEvent();
         void onPlayerStateChanged(int state);
+        void onStopReadyEvent();
     }
 
     static {
@@ -287,11 +289,18 @@ public class MediaHandler extends Handler {
                 }
                 break;
             case START_READY_EVT:
-                Log.d(TAG, "Received START_READY_EVT. Camera frames can be sent now");
+                Log.d(TAG, "Received START_READY_EVT. Camera recording can be started");
                 if (mMediaEventListener != null) {
                     mMediaEventListener.onStartReadyEvent();
                 }
                 break;
+
+            case STOP_READY_EVT:
+                Log.d(TAG, "Received STOP_READY_EVT");
+                if (mMediaEventListener != null) {
+                    mMediaEventListener.onStopReadyEvent();
+                }
+                break;
             case DISPLAY_MODE_EVT:
                 mUIOrientationMode = nativeGetUIOrientationMode();
                 processUIOrientationMode();
diff --git a/src/com/android/incallui/ProximitySensor.java b/src/com/android/incallui/ProximitySensor.java
index f3a7a9c0..01ba1ce2 100644
--- a/src/com/android/incallui/ProximitySensor.java
+++ b/src/com/android/incallui/ProximitySensor.java
@@ -18,7 +18,10 @@ package com.android.incallui;
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.database.ContentObserver;
+import android.os.Handler;
 import android.os.PowerManager;
+import android.provider.Settings;
 
 import com.android.incallui.AudioModeProvider.AudioModeListener;
 import com.android.incallui.InCallPresenter.InCallState;
@@ -40,7 +43,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
     private static final String TAG = ProximitySensor.class.getSimpleName();
 
     private final PowerManager mPowerManager;
-    private final PowerManager.WakeLock mProximityWakeLock;
+    private PowerManager.WakeLock mProximityWakeLock;
     private final AudioModeProvider mAudioModeProvider;
     private final AccelerometerListener mAccelerometerListener;
     private final ProximityListener mProximityListener;
@@ -48,28 +51,51 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
     private boolean mUiShowing = false;
     private boolean mIsPhoneOffhook = false;
     private boolean mDialpadVisible;
+    private Context mContext;
 
     // True if the keyboard is currently *not* hidden
     // Gets updated whenever there is a Configuration change
     private boolean mIsHardKeyboardOpen;
 
+    private ContentObserver settingsObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            updateProximitySensorBySetting();
+        }
+    };
+
     public ProximitySensor(Context context, AudioModeProvider audioModeProvider) {
+        mContext = context;
         mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
 
-        if (mPowerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
-            mProximityWakeLock = mPowerManager.newWakeLock(
-                    PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG);
-        } else {
-            mProximityWakeLock = null;
-        }
-        Log.d(this, "onCreate: mProximityWakeLock: ", mProximityWakeLock);
-
         mAccelerometerListener = new AccelerometerListener(context, this);
         mProximityListener = new ProximityListener(context);
         mAudioModeProvider = audioModeProvider;
+        context.getContentResolver().registerContentObserver(Settings.System.CONTENT_URI, true,
+                settingsObserver);
+        updateProximitySensorBySetting();
+        Log.d(this, "onCreate: mProximityWakeLock: ", mProximityWakeLock);
         mAudioModeProvider.addListener(this);
     }
 
+    private void updateProximitySensorBySetting() {
+        boolean featureEnabled = Settings.System.getInt(mContext.getContentResolver(),
+                "proximity_sensor", 1) == 1;
+        if (featureEnabled
+                && mProximityWakeLock == null
+                && mPowerManager
+                        .isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
+            mProximityWakeLock = mPowerManager.newWakeLock(
+                    PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG);
+            updateProximitySensorMode();
+        } else if (!featureEnabled && mProximityWakeLock != null) {
+            if (mProximityWakeLock.isHeld()) {
+                mProximityWakeLock.release();
+            }
+            mProximityWakeLock = null;
+        }
+    }
+
     public void tearDown() {
         mAudioModeProvider.removeListener(this);
 
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 19595b82..7ecd732f 100644..100755
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -28,6 +28,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
+import android.provider.Settings;
 import android.text.TextUtils;
 
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
@@ -45,6 +46,8 @@ 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,
@@ -327,7 +330,14 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         }
 
         // set the content
-        builder.setContentText(mContext.getString(contentResId));
+        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));
+            contentText +=  "  (" + name + ")";
+        }
+        builder.setContentText(contentText);
         builder.setSmallIcon(iconResId);
         builder.setContentTitle(contentTitle);
         builder.setLargeIcon(largeIcon);
diff --git a/src/com/android/incallui/VideoCallPanel.java b/src/com/android/incallui/VideoCallPanel.java
index f0b8816c..86bc9495 100644
--- a/src/com/android/incallui/VideoCallPanel.java
+++ b/src/com/android/incallui/VideoCallPanel.java
@@ -70,6 +70,7 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
     private TextureView mCameraPreview;
     private SurfaceTexture mCameraSurface;
     private SurfaceTexture mFarEndSurface;
+    private boolean mCanReleaseFarEndSurface = false;
     private ImageView mCameraPicker;
     private final Resize mResize = new Resize();
 
@@ -92,6 +93,16 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
     // For eg. VT_RX call will not need camera
     private boolean mCameraNeeded = false;
 
+    // Flag to indicate if recording can be started
+    private boolean mStartReceived = false;
+
+    /*
+     * Flag to indicate whether recording has started or not
+     * False: recording hasn't started
+     * True: recording has started
+     */
+    private boolean mIsRecordingStarted = false;
+
     /**
     * This class implements the zoom listener for zoomControl
     */
@@ -114,16 +125,9 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
             if (cameraState == CameraState.PREVIEW_STARTED) {
                 // If camera is already capturing stop preview, reset the
                 // parameters and then start preview again
-                try {
-                    mVideoCallManager.stopCameraRecording();
-                    mVideoCallManager.stopCameraPreview();
-                    initializeCameraParams();
-                    mVideoCallManager.startCameraPreview(mCameraSurface);
-                    mVideoCallManager.startCameraRecording();
-                } catch (IOException ioe) {
-                    loge("Exception onParamReadyEvent stopping and starting preview "
-                            + ioe.toString());
-                }
+                stopRecordingAndPreview();
+                initializeCameraParams();
+                startPreviewAndRecording();
             }
         }
 
@@ -145,7 +149,25 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
 
         @Override
         public void onStartReadyEvent() {
-         // NO-OP
+            if (DBG) {
+                log("onStartReadyEvent mCameraNeeded=" + mCameraNeeded + " CameraSurface= "
+                        + mCameraSurface + " camera state = "
+                        + mVideoCallManager.getCameraState());
+            }
+
+            mStartReceived = true;
+
+            if (mCameraNeeded && mCameraSurface != null) {
+                // startCameraRecording (@ Camerahandler.java) does camera
+                // preview_started state check.
+                startCameraRecording();
+            }
+        }
+
+        @Override
+        public void onStopReadyEvent() {
+            if (DBG) log("onStopReadyEvent");
+            mStartReceived = false;
         }
 
         @Override
@@ -228,8 +250,6 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
         // Set media event listener
         mVideoCallManager.setMediaEventListener(new MediaEventListener());
         mVideoCallManager.setCvoEventListener(new CvoListener());
-
-        releaseCachedSurfaces();
     }
 
     // The function must be called from the parent's onDestroy function.
@@ -335,7 +355,7 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
     }
 
     /**
-     * This method crates the camera object if camera is not disabled
+     * This method creates the camera object if camera is not disabled
      *
      * @param cameraId ID of the front or the back camera
      * @return Camera instance on success, null otherwise
@@ -355,7 +375,34 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
      * This method disconnect and releases the camera
      */
     private void closeCamera() {
-            mVideoCallManager.closeCamera();
+        mVideoCallManager.closeCamera();
+        mIsRecordingStarted = false;
+    }
+
+    /**
+     * This method stops the camera recording
+     */
+    private void stopCameraRecording() {
+        // stop recording only if it has started
+        if (!mIsRecordingStarted) {
+            log("camera recording hasn't started so no need to stop it");
+            return;
+        }
+
+        mVideoCallManager.stopCameraRecording();
+        mIsRecordingStarted = false;
+    }
+
+    /**
+     * This method starts the camera recording
+     */
+    private void startCameraRecording() {
+        if (mStartReceived) {
+            mVideoCallManager.startCameraRecording();
+            mIsRecordingStarted = true;
+        } else {
+            log("waiting for START_READY. Deferring camera recording");
+        }
     }
 
     /**
@@ -364,7 +411,7 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
     private void startPreviewAndRecording() {
         try {
             mVideoCallManager.startCameraPreview(mCameraSurface);
-            mVideoCallManager.startCameraRecording();
+            startCameraRecording();
         } catch (IOException ioe) {
             closeCamera();
             loge("Exception startPreviewAndRecording, " + ioe.toString());
@@ -375,7 +422,7 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
      * This method stops the camera recording and preview
      */
     private void stopRecordingAndPreview() {
-        mVideoCallManager.stopCameraRecording();
+        stopCameraRecording();
         mVideoCallManager.stopCameraPreview();
     }
 
@@ -396,7 +443,7 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
 
             // Use cached surface texture.
             if (DBG) log("Video surface texture created");
-            if (mFarEndSurface==null) {
+            if (mFarEndSurface == null) {
                 log("Caching video surface texture.");
                 mFarEndSurface = surface;
             } else {
@@ -405,22 +452,26 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
             }
 
             mVideoCallManager.setFarEndSurface(mFarEndSurface);
+            mCanReleaseFarEndSurface = false;
         }
     }
 
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        boolean relaseSurface = true;
         if (surface.equals(mCameraPreview.getSurfaceTexture())) {
             if (DBG) log("CameraPreview surface texture destroyed");
             stopRecordingAndPreview();
             closeCamera();
             mCameraSurface = null;
-            return true;
+            relaseSurface = true;
         } else if (surface.equals(mFarEndView.getSurfaceTexture())) {
-            if (DBG) log("FarEndView surface texture destroyed");
-            return false;
+            if (DBG) log("FarEndView surface texture destroyed, CanReleaseFarEndSurface=" +
+                        mCanReleaseFarEndSurface);
+            relaseSurface = mCanReleaseFarEndSurface;
+            if (relaseSurface) setFarEndNull();
         }
-        return true;
+        return relaseSurface;
     }
 
     @Override
@@ -677,9 +728,21 @@ public class VideoCallPanel extends RelativeLayout implements TextureView.Surfac
     }
 
     private void releaseCachedSurfaces() {
-        release(mFarEndSurface);
-        mFarEndSurface = null;
-        mVideoCallManager.setFarEndSurface(mFarEndSurface);
+        log("releaseCachedSurfaces");
+
+        mCanReleaseFarEndSurface = true;
+        if (mFarEndView==null || !mFarEndView.isAvailable()) {
+            release(mFarEndSurface);
+            setFarEndNull();
+        }
+    }
+
+    private void setFarEndNull() {
+        log("setFarEndNull, " + mFarEndSurface);
+        if (mFarEndSurface != null) {
+            mFarEndSurface = null;
+            mVideoCallManager.setFarEndSurface(mFarEndSurface);
+        }
     }
 
     public void startOrientationListener(boolean start) {
author	Brint E. Kriebel <bekit@cyngn.com>	2014-10-01 00:03:36 -0700
committer	Brint E. Kriebel <bekit@cyngn.com>	2014-10-01 00:03:36 -0700
commit	ef26510a17c1b8ada4f3c767d080ce486673efeb (patch)
tree	9adc5d3df5cd63de0333261a417f7785f2398eff
parent	c386047a0efcafccf3ae9619e64bcd7be91d84a0 (diff)
parent	f8af471aff524c1b92dd81534df62e1042b63a93 (diff)
download	android_packages_apps_InCallUI-ef26510a17c1b8ada4f3c767d080ce486673efeb.tar.gz android_packages_apps_InCallUI-ef26510a17c1b8ada4f3c767d080ce486673efeb.tar.bz2 android_packages_apps_InCallUI-ef26510a17c1b8ada4f3c767d080ce486673efeb.zip