diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fa13adf..92d6d94 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,6 +40,7 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
     <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
     <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
     <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
@@ -281,7 +282,7 @@
                   android:configChanges="keyboardHidden"
                   android:exported="false"
                   android:process="com.android.incallui"
-                  android:screenOrientation="sensor" >
+                  android:screenOrientation="nosensor" >
         </activity>
 
         <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
@@ -294,7 +295,8 @@
         </receiver>
 
         <service android:name="com.android.incallui.InCallServiceImpl"
-                 android:process="com.android.incallui">
+                 android:process="com.android.incallui"
+                 android:permission="android.permission.BIND_INCALL_SERVICE" >
             <intent-filter>
                 <action android:name="android.telecomm.InCallService"/>
             </intent-filter>
diff --git a/res/drawable-hdpi/ic_delete_wht_24dp.png b/res/drawable-hdpi/ic_delete_wht_24dp.png
new file mode 100644
index 0000000..9fb43b0
--- /dev/null
+++ b/res/drawable-hdpi/ic_delete_wht_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_handle.png b/res/drawable-hdpi/ic_handle.png
new file mode 100644
index 0000000..34310aa
--- /dev/null
+++ b/res/drawable-hdpi/ic_handle.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_delete_dk.png b/res/drawable-hdpi/ic_menu_delete_dk.png
deleted file mode 100644
index 2960449..0000000
--- a/res/drawable-hdpi/ic_menu_delete_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_delete_wht_24dp.png b/res/drawable-mdpi/ic_delete_wht_24dp.png
new file mode 100644
index 0000000..c903fd1
--- /dev/null
+++ b/res/drawable-mdpi/ic_delete_wht_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_handle.png b/res/drawable-mdpi/ic_handle.png
new file mode 100644
index 0000000..81a67ba
--- /dev/null
+++ b/res/drawable-mdpi/ic_handle.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_delete_dk.png b/res/drawable-mdpi/ic_menu_delete_dk.png
deleted file mode 100644
index 9db8403..0000000
--- a/res/drawable-mdpi/ic_menu_delete_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_delete_wht_24dp.png b/res/drawable-xhdpi/ic_delete_wht_24dp.png
new file mode 100644
index 0000000..be1ee4d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_delete_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_handle.png b/res/drawable-xhdpi/ic_handle.png
new file mode 100644
index 0000000..0ad8392
--- /dev/null
+++ b/res/drawable-xhdpi/ic_handle.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_delete_dk.png b/res/drawable-xhdpi/ic_menu_delete_dk.png
deleted file mode 100644
index 61b762f..0000000
--- a/res/drawable-xhdpi/ic_menu_delete_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_delete_wht_24dp.png b/res/drawable-xxhdpi/ic_delete_wht_24dp.png
new file mode 100644
index 0000000..eb63792
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_delete_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_handle.png b/res/drawable-xxhdpi/ic_handle.png
new file mode 100644
index 0000000..d07a1d0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_handle.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_delete_dk.png b/res/drawable-xxhdpi/ic_menu_delete_dk.png
deleted file mode 100644
index 88445fc..0000000
--- a/res/drawable-xxhdpi/ic_menu_delete_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/empty_call_log.png b/res/drawable-xxxhdpi/empty_call_log.png
new file mode 100644
index 0000000..fbac1e4
--- /dev/null
+++ b/res/drawable-xxxhdpi/empty_call_log.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/empty_contacts.png b/res/drawable-xxxhdpi/empty_contacts.png
new file mode 100644
index 0000000..5893965
--- /dev/null
+++ b/res/drawable-xxxhdpi/empty_contacts.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/empty_speeddial.png b/res/drawable-xxxhdpi/empty_speeddial.png
new file mode 100644
index 0000000..dc7f8ae
--- /dev/null
+++ b/res/drawable-xxxhdpi/empty_speeddial.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/fab_blue.png b/res/drawable-xxxhdpi/fab_blue.png
new file mode 100644
index 0000000..1dd8a92
--- /dev/null
+++ b/res/drawable-xxxhdpi/fab_blue.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/fab_ic_call.png b/res/drawable-xxxhdpi/fab_ic_call.png
new file mode 100644
index 0000000..7af3396
--- /dev/null
+++ b/res/drawable-xxxhdpi/fab_ic_call.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/fab_ic_dial.png b/res/drawable-xxxhdpi/fab_ic_dial.png
new file mode 100644
index 0000000..9361aa8
--- /dev/null
+++ b/res/drawable-xxxhdpi/fab_ic_dial.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_call_arrow.png b/res/drawable-xxxhdpi/ic_call_arrow.png
new file mode 100644
index 0000000..8243c25
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_call_arrow.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_card_phone.png b/res/drawable-xxxhdpi/ic_card_phone.png
new file mode 100644
index 0000000..a938659
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_card_phone.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_delete_wht_24dp.png b/res/drawable-xxxhdpi/ic_delete_wht_24dp.png
new file mode 100644
index 0000000..2f250f6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_delete_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_handle.png b/res/drawable-xxxhdpi/ic_handle.png
new file mode 100644
index 0000000..72641c7
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_handle.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_results_phone.png b/res/drawable-xxxhdpi/ic_results_phone.png
new file mode 100644
index 0000000..395652c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_results_phone.png
Binary files differ
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index 347e9d4..cbbfb85 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -16,6 +16,6 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/dialer_accent_color">
+    android:color="@color/floating_action_button_touch_tint">
     <item android:drawable="@drawable/fab_blue" />
 </ripple>
diff --git a/res/drawable/ic_calllog_delete.xml b/res/drawable/ic_calllog_delete.xml
index e81da9a..2f9f0ae 100644
--- a/res/drawable/ic_calllog_delete.xml
+++ b/res/drawable/ic_calllog_delete.xml
@@ -15,6 +15,6 @@
 -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_menu_delete_dk"
+    android:src="@drawable/ic_delete_wht_24dp"
     android:gravity="center"
     android:tint="@color/actionbar_icon_color" />
diff --git a/res/drawable/ic_voicemail_seek_handle.xml b/res/drawable/ic_voicemail_seek_handle.xml
new file mode 100644
index 0000000..a6f02be
--- /dev/null
+++ b/res/drawable/ic_voicemail_seek_handle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 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
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/ic_handle"
+        android:autoMirrored="true"
+        android:tint="@color/actionbar_background_color" >
+</bitmap>
\ No newline at end of file
diff --git a/res/drawable/seek_bar_thumb.xml b/res/drawable/seek_bar_thumb.xml
deleted file mode 100644
index e301d1f..0000000
--- a/res/drawable/seek_bar_thumb.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true">
-        <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-            <!-- First item is the outer transparent sphere. -->
-            <item>
-                <shape
-                    android:shape="oval"
-                >
-                    <size
-                        android:width="16dip"
-                        android:height="16dip"
-                    />
-                    <solid
-                        android:color="#44cecece"
-                    />
-                </shape>
-            </item>
-            <!-- Second item is the inner almost-opaque sphere.
-                 Seems to derive its size from the outer, a size element doesn't change anything.
-                 Looks like using left, right, top and bottom on the item is best to fix inner sphere. -->
-            <item
-                android:left="3dip"
-                android:right="3dip"
-                android:top="3dip"
-                android:bottom="3dip"
-            >
-                <shape
-                    android:shape="oval"
-                >
-                    <solid
-                        android:color="@color/background_dialer_list_items"
-                    />
-                </shape>
-            </item>
-        </layer-list>
-    </item>
-
-    <!-- Do not show the thumb when disabled -->
-    <item android:drawable="@android:color/transparent" />
-</selector>
\ No newline at end of file
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 4dcffb1..761f352 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -65,8 +65,9 @@
                 android:id="@+id/quick_contact_photo"
                 android:layout_width="@dimen/contact_photo_size"
                 android:layout_height="@dimen/contact_photo_size"
+                android:paddingTop="2dp"
                 android:nextFocusRight="@id/primary_action_view"
-                android:layout_alignParentStart="true"
+                android:layout_gravity="top"
                 android:focusable="true"
                 />
             <LinearLayout
@@ -118,6 +119,7 @@
                         android:layout_height="@dimen/call_provider_small_icon_size"
                         android:layout_marginEnd="@dimen/call_log_icon_margin"
                         android:layout_gravity="center_vertical"
+                        android:tint="?attr/call_log_secondary_text_color"
                         android:scaleType="centerInside"
                         />
                     <TextView
@@ -137,9 +139,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/call_log_icon_margin"
                 android:src="@drawable/ic_card_phone"
                 android:tint="@color/recent_call_log_item_phone_icon_tint"
                 android:alpha="0.3"
+                android:importantForAccessibility="no"
                 android:visibility="gone"
                 />
         </LinearLayout>
diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index fbf71f6..c4126e4 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -18,42 +18,50 @@
 
 <!-- Can't use merge here because this is referenced via a ViewStub -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:id="@+id/badge_container">
+    android:id="@+id/badge_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <View android:layout_width="match_parent"
-          android:layout_height="1px"
-          android:layout_marginStart="@dimen/call_log_outer_margin"
-          android:layout_marginEnd="@dimen/call_log_outer_margin"
-          android:background="@color/favorite_contacts_separator_color"/>
+        android:layout_height="1px"
+        android:background="@color/favorite_contacts_separator_color" />
 
     <LinearLayout android:id="@+id/badge_link_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingStart="@dimen/call_log_outer_margin"
-                  android:paddingEnd="@dimen/call_log_outer_margin"
-                  android:paddingTop="0dip"
-                  android:paddingBottom="0dip"
-                  android:background="?android:attr/selectableItemBackground"
-                  android:clickable="true">
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:id="@+id/badge_image"
-                   android:padding="@dimen/call_log_outer_margin"/>
-        <TextView android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:id="@+id/badge_text"
-                  android:textColor="@color/dialpad_primary_text_color"
-                  android:layout_gravity="center_vertical"
-                  android:layout_weight="1"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/call_log_outer_margin"
+        android:paddingEnd="@dimen/call_log_outer_margin"
+        android:paddingTop="@dimen/call_log_item_extra_padding_vertical"
+        android:paddingBottom="@dimen/call_log_item_extra_padding_vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true">
+
+        <ImageView android:id="@+id/badge_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tint="@color/dialpad_primary_text_color"
+            android:padding="@dimen/call_log_outer_margin" />
+
+        <TextView android:id="@+id/badge_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/call_log_start_margin"
+            android:textColor="@color/dialpad_primary_text_color"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1" />
+
         <ImageView android:id="@+id/dismiss_button"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:paddingTop="8dip"
-                   android:src="@drawable/ic_close_dk"
-                   android:background="?android:attr/selectableItemBackground"
-                   android:visibility="gone"
-                   android:contentDescription="@string/description_dismiss"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/call_log_icon_margin"
+            android:src="@drawable/ic_close_dk"
+            android:tint="@color/recent_call_log_item_phone_icon_tint"
+            android:alpha="0.3"
+            android:background="?android:attr/selectableItemBackground"
+            android:visibility="gone"
+            android:contentDescription="@string/description_dismiss" />
+
     </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/phone_disambig_item.xml b/res/layout/phone_disambig_item.xml
index a097ce7..27bbda1 100755
--- a/res/layout/phone_disambig_item.xml
+++ b/res/layout/phone_disambig_item.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -39,4 +40,4 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textDirection="ltr" />
 
-</LinearLayout>
+</view>
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index b1daab8..f274a9d 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -56,6 +56,7 @@
             android:paddingBottom="@dimen/contact_tile_text_bottom_padding"
             android:layout_alignParentBottom="true"
             android:orientation="vertical" >
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -96,6 +97,7 @@
                     android:ellipsize="marquee"
                     android:textAlignment="viewStart" />
         </LinearLayout>
+
         <View
             android:id="@+id/contact_tile_push_state"
             android:layout_width="match_parent"
@@ -107,7 +109,7 @@
         <ImageButton
             android:id="@id/contact_tile_secondary_button"
             android:src="@drawable/overflow_thumbnail"
-            android:background="?android:attr/selectableItemBackground"
+            android:background="@drawable/item_background_material_dark"
             android:layout_height="@dimen/contact_tile_info_button_height_and_width"
             android:layout_width="@dimen/contact_tile_info_button_height_and_width"
             android:paddingLeft="4dp"
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
index 500ed96..54d0c59 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/playback_layout.xml
@@ -64,7 +64,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:progressDrawable="@drawable/seekbar_drawable"
-            android:thumb="@drawable/seek_bar_thumb"
+            android:thumb="@drawable/ic_voicemail_seek_handle"
             android:thumbOffset="8dip"
             android:progress="0"
             android:paddingStart="8dip"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3f5808e..c0b3e16 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Speel stadiger."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Begin of laat wag speel."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Oproepinstellings"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Luitone, stemboodskapinstellings, VoIP-oproepe, ens."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Algemene instellings"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kontakvertoning, klanke en vinnige antwoorde"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opsies vir wys van kontakte"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Klanke en vibreer"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Foon-luitoon"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibreer ook vir oproepe"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Belbladklanke"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Ander"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Vinnige antwoorde"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Oproepinstellings"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Stemboodskapdiens, oproep wat wag en ander"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2a03f13..45eddbc 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"በዝግታ አጫውት።"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"መልሰህ አጫውትን አስጀምር ወይም ለአፍታ አቁም።"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"፣ "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"የጥሪ ቅንብሮች"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"የጥሪ ቅላጼዎች፣ የድምጽ መልዕክት ቅንብሮች፣ VoIP መደወል፣ ወዘተ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"አጠቃላይ ቅንብሮች"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"የእውቂያ ማሳየት፣ ድምጾች እና ፈጣን ምላሾች"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"የእውቂያ ማሳያ አማራጮች"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"ድምጾች እና ንዝረት"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"የስልክ ጥሪ ቅላጼ"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"እንዲሁም ለጥሪዎችም ንዘር"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"የመደወያ ሰሌዳ ቅላጼዎች"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"ሌላ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ፈጣን ምላሾች"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"የጥሪ ቅንብሮች"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"የድምጽ መልዕክት፣ ጥሪን መጠበቅ፣ እና ሌሎች"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4392b2d..66e5a13 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"تشغيل أقل سرعة."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"بدء التشغيل أو إيقافه مؤقتًا."</string>
     <string name="list_delimeter" msgid="4571593167738725100">"، "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"إعدادات المكالمات"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"‏نغمات الرنين وإعدادات البريد الصوتي والاتصال عبر VoIP، وما إلى ذلك"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"الإعدادات العامة"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"عرض جهات الاتصال والأصوات والردود السريعة"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"خيارات عرض جهات الاتصال"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"نغمة رنين الهاتف"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"غير ذلك"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"الردود السريعة"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"إعدادات الاتصال"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"البريد الصوتي وانتظار المكالمات وغير ذلك"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ed5309b..c30d4f0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"По-бавно възпроизвеждане."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Стартиране или поставяне на пауза на възпроизвеждането."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Настройки за обаждане"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Мелодии, настройки за гласова поща, обаждане през VoIP и др."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Общи настройки"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Звуци, бързи отговори и показване на контактите"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Опции за показване на контактите"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Мелодия на телефона"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Други"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Бързи отговори"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Настройки за обаждане"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Гласова поща, изчакващо обаждане и други"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index e16e3e3..ed658bf 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"ধীরে প্লে করুন৷"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"প্লেব্যাক শুরু করুন বা বিরতি দিন৷"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"কল সেটিংস"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"রিংটোন, ভয়েসমেল সেটিংস, VoIP কলিং ইত্যাদি"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"সাধারণ সেটিংস"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"পরিচিতি প্রদর্শন, শব্দ এবং দ্রুত প্রতিক্রিয়াগুলি"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"পরিচিতি প্রদর্শনের বিকল্পগুলি"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"শব্দ ও কম্পন"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ফোন রিংটোন"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"এছাড়াও কল এলে কম্পিত করুন"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"ডায়ালপ্যাড টোনগুলি"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"অন্যান্য"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"দ্রুত প্রতিক্রিয়াগুলি"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"কল সেটিংস"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"ভয়েসমেল, কল অপেক্ষমান এবং অন্যান্য"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2388786..f86aaba 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Reprodueix més lentament."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Inicia la reproducció o la posa en pausa."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Configuració de trucada"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Sons de trucada, configuració de la bústia de veu, trucades de VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Configuració general"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Pantalla de contacte, sons i respostes ràpides"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opcions de visualització de contactes"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"So de trucada"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Altres"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostes ràpides"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Configuració de trucades"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Bústia de veu, trucada en espera i altres"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e07e31e..1f143ad 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Přehrávat pomaleji."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Spustit nebo pozastavit přehrávání."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Nastavení hovorů"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Vyzvánění, nastavení hlasové schránky, volání VoIP apod."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Obecná nastavení"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Zobrazení kontaktů, zvuky a rychlé odpovědi"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Možnosti zobrazení kontaktů"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Vyzváněcí tón telefonu"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Další"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Rychlé odpovědi"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Nastavení hovorů"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Hlasová schránka, další hovor na lince atd."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a4aa20b..f5c7291 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Afspil langsommere."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Start afspilningen, eller sæt den på pause."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Indstillinger for opkald"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ringetoner, indstillinger for telefonsvarer, VoIP-opkald osv."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Generelle indstillinger"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Visning af kontaktpersoner, lyde og hurtigt svar"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Indstillinger for visning af kontaktpersoner"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Lyde og vibration"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ringetone for opkald"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrer også ved opkald"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Toner for numerisk tastatur"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Andre"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hurtigt svar"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Indstillinger for opkald"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Telefonsvarer, ventende opkald og andet"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9a6ab4c..f83f21a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Langsamer wiedergeben"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Wiedergabe starten oder pausieren"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Anrufeinstellungen"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Klingeltöne, Mailboxeinstellungen, VoIP-Anrufe usw."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Allgemeine Einstellungen"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Töne, Kurzantworten und Anzeige von Kontakten"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Anzeigeoptionen für Kontakte"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Töne und Vibration"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Klingelton"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Bei Anrufen auch vibrieren"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Wähltastentöne"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Sonstige"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Kurzantworten"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Anrufeinstellungen"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Mailbox, Anklopfen und weitere Einstellungen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0fd1ce9..320823b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Αναπαραγωγή πιο αργά."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Έναρξη ή παύση αναπαραγωγής."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Ρυθμίσεις κλήσης"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ήχοι κλήσης, ρυθμίσεις αυτόματου τηλεφωνητή, κλήση VoIP, κ.λπ."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Γενικές ρυθμίσεις"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Εμφάνιση επαφής, ήχοι και γρήγορες απαντήσεις"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Επιλογές εμφάνισης επαφών"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Ήχοι και δόνηση"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ήχος κλήσης τηλεφώνου"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Επίσης δόνηση για κλήσεις"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Τόνοι πληκτρολογίου κλήσης"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Άλλο"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Γρήγορες απαντήσεις"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Ρυθμίσεις κλήσεων"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Αυτόματος τηλεφωνητής, αναμονή κλήσης και άλλες"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8e067f4..90c9dc6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Play slower."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Start or pause playback."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Call Settings"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ringtones, voicemail settings, VoIP calling, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"General settings"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Contact display, sounds and quick responses"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Contact display options"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Phone ringtone"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Other"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Quick responses"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Call settings"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, call waiting and others"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8e067f4..90c9dc6 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Play slower."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Start or pause playback."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Call Settings"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ringtones, voicemail settings, VoIP calling, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"General settings"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Contact display, sounds and quick responses"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Contact display options"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Phone ringtone"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Other"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Quick responses"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Call settings"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, call waiting and others"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 93cc23d..c70ca2c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Disminuir velocidad de reproducción"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Iniciar o pausar la reproducción"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Configuración de llamada"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Tonos, configuración del buzón de voz, llamadas VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Configuración general"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Visualización de contactos, sonidos y respuestas rápidas"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opciones de visualización de contactos"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sonidos y vibración"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Tono del teléfono"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrar también en llamadas"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tonos del teclado"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Otro"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respuestas rápidas"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Configuración de llamada"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Buzón de voz, llamada en espera y otros"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 288bd6f..6a449f8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Reproducir más lento."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Iniciar o pausar reproducción."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Ajustes de llamada"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Tonos, ajustes del buzón de voz, llamadas de VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Ajustes generales"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Opciones para mostrar contactos, sonidos y respuestas rápidas"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opciones para mostrar contactos"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sonido y vibración"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Tono del teléfono"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrar también en llamadas"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tonos del teclado"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Otros"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respuestas rápidas"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Ajustes de llamada"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Buzón de voz, llamada en espera y otras opciones"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 2be9fda..955683a 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Aeglasem esitus."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Esituse alustamine või peatamine."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Kõne seaded"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Helinad, kõneposti seaded, VoIP-kõned jne"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Üldseaded"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kontakti kuva, helid ja kiirvastused"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Kontaktide kuvavalikud"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Telefoni helin"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Muu"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Kiirvastused"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Kõneseaded"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Kõnepost, ootel kõne ja muud"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index e6ec263..7e5abf3 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Erreproduzitu mantsoago."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Hasi edo gelditu erreprodukzioa."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Deien ezarpenak"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Tonuak, erantzungailuaren ezarpenak, VoIP deiak, etab."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Ezarpen orokorrak"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kontaktuak bistaratzeko aukera, soinuak eta erantzun bizkorrak"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Kontaktuak bistaratzeko aukerak"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Telefonoaren tonua"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Beste batzuk"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Erantzun bizkorrak"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Deien ezarpenak"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Erantzungailua, deia zain uzteko eginbidea eta beste batzuk"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 46118d4..0b4f5cb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"پخش آهسته‌تر."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"شروع یا توقف موقت بازپخش."</string>
     <string name="list_delimeter" msgid="4571593167738725100">"، "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"تنظیمات تماس"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"‏آهنگ‌های زنگ، تنظیمات پست‌صوتی، تماس VoIP و غیره"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"تنظیمات عمومی"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"نمایش مخاطب، صداها و پاسخ‌های سریع"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"گزینه‌های نمایش تماس"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"صدا و لرزش"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"آهنگ زنگ تلفن"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"تماس‌‌ها لرزش هم داشته باشند"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"صداهای صفحه شماره‌گیری"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"موارد دیگر"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"پاسخ‌های سریع"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"تنظیمات تماس"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"پست صوتی، انتظار مکالمه و موارد دیگر"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f06445e..f807cf8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Toista hitaammin."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Aloita tai keskeytä toisto."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Puheluasetukset"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Soittoäänet, vastaaja-asetukset, VoIP-puhelut jne."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Yleisasetukset"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Yhteystiedon näyttö, soittoäänet ja pikavastaukset"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Yhteystietojen näyttöasetukset"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Puhelimen soittoääni"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Muut"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Pikavastaukset"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Puheluasetukset"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Puhelinvastaaja, odottavat puhelut yms."</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bcb8e99..c2c57ee 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Lire moins vite."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Lancer ou interrompre la lecture."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Paramètres d\'appel"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Sonneries, paramètres de messagerie vocale, appels VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Paramètres généraux"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Affichage des contacts, sons et réponses rapides"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Options d\'affichage des contacts"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sons et vibrations"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Sonnerie du téléphone"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrer aussi pour les appels"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tonalités du clavier"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Autre"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Réponses rapides"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Paramètres d\'appel"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Messagerie vocale, appel en attente et autres"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 68d4cd2..c27b8fa 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Lire moins vite"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Lancer ou suspendre la lecture"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Paramètres d\'appel"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Sonneries, paramètres de messagerie vocale, appels VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Paramètres généraux"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Affichage des contacts, sons et réponses rapides"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Options d\'affichage des contacts"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Sonnerie du téléphone"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Autre"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Réponses rapides"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Paramètres d\'appel"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Messagerie vocale, appel en attente et autres"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index b31157d..7fa248b 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Reproducir máis lento."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Iniciar ou pausar a reprodución."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Configuración de chamada"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Tons de chamada, configuración do correo de voz, chamadas VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Configuración xeral"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Visualización de contactos, sons e respostas rápidas"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opcións de visualización de contactos"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sons e vibración"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ton de chamada do teléfono"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrar tamén nas chamadas"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tons do teclado de marcación"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Outra"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostas rápidas"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Configuración de chamada"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Correo de voz, chamada en espera e outros"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8af4945..8f09a7e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"धीरे चलाएं."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"प्लेबैक प्रारंभ करें या रोकें."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"कॉल सेटिंग"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"रिंगटोन, ध्वनिमेल सेटिंग, VoIP कॉल करना आदि"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"सामान्य सेटिंग"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"संपर्क प्रदर्शन, ध्वनि और त्वरित प्रतिसाद"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"संपर्क प्रदर्शन के विकल्प"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"फ़ोन रिंगटोन"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"अन्य"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"त्वरित प्रतिसाद"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"कॉल सेटिंग"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"ध्वनिमेल, प्रतीक्षारत कॉल, और अन्य"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9851f67..3d2d6b4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Sporija reprodukcija."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Pokretanje ili pauziranje reprodukcije."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Postavke poziva"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Melodije zvona, postavke govorne pošte, VoIP pozivi itd."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Opće postavke"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Prikaz kontakata, zvukovi i brzi odgovori"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opcije prikaza kontakata"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Melodija zvona telefona"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Ostalo"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Brzi odgovori"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Postavke poziva"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Govorna pošta, poziv na čekanju i ostalo"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 69769e2..6527398 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Lassabb lejátszás."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Lejátszás indítása vagy szüneteltetése."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Hívásbeállítások"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Csengőhangok, hangposta-beállítások, VoIP-hívás stb."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Általános beállítások"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Érintőkijelző, hangok és gyors válaszok"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Névjegy megjelenítési lehetőségei"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Telefon csengőhangja"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Egyéb"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Gyors válaszok"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Hívásbeállítások"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Hangposta, hívásvárakoztatás és egyebek"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 57c2dae..d94fdd5 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Նվագարկել ավելի դանդաղ:"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Սկսել կամ դադարեցնել նվագարկումը:"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Զանգերի կարգավորումներ"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Զանգերանգներ, ձայնային փոստի կարգավորումներ, VoIP զանգեր և այլն"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Հիմնական կարգավորումներ"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Կոնտակնտների ցուցադրում, ձայներ և արագ պատասխաններ"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Կոնտակտի ցուցադրման ընտրանքները"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Զանգերանգ և թրթռազանգ"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Հեռախոսի զանգերանգ"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Նաև թրթռալ զանգերի ժամանակ"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Թվաշարի ձայներանգներ"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Այլ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Արագ պատասխաններ"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Զանգի կարգավորումները"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Ձայնային փոստը, սպասվող զանգը և այլն"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index caab2c0..2100d34 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Putar lebih lambat."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Mulai atau jeda pemutaran."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Setelan Panggilan"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Nada dering, setelan kotak pesan, panggilan VoIP, dsb"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Setelan umum"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Tampilan kontak, suara, dan respons cepat"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opsi tampilan kontak"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Nada dering ponsel"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Lainnya"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respons cepat"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Setelan panggilan"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Kotak pesan, nada tunggu, dan lainnya"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 4e3c9c2..9532af6 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Spila hægar."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Hefja eða gera hlé á spilun."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Símtalastillingar"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Hringitónar, talhólfsstillingar, netsímtöl o.s.frv."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Almennar stillingar"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Birting tengiliða, hljóð og snarsvör"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Birtingarkostir fyrir tengiliði"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Hljóð og titringur"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Hringitónn síma"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Titra líka fyrir símtöl"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tónar takkaborðs"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Annað"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Snarsvör"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Símtalsstillingar"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Talhólf, símtal í bið og annað"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 97c3b6e..d90b87a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Riproduci più lentamente."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Avvia o metti in pausa la riproduzione."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Impostazioni chiamate"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Suonerie, impostazioni della segreteria, chiamate VoIP ecc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Impostazioni generali"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Visualizzazione contatti, suoni e risposte rapide"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opzioni di visualizzazione dei contatti"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Suoni e vibrazione"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Suoneria telefono"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrazione anche per chiamate"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Toni tastierino"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Altro"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Risposte rapide"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Impostazioni chiamate"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Segreteria, avviso di chiamata e altre impostazioni"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 244e0b7..ba6932e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"הפעל לאט יותר."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"התחל או השהה הפעלה."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"הגדרות שיחה"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"‏רינגטונים, הגדרות דואר קולי, שיחות ב-VoIP וכו\'"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"הגדרות כלליות"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"תצוגת מגע, צלילים ותגובות מהירות"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"אפשרויות להצגת אנשי קשר"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"רינגטון של טלפון"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"אחר"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"תגובות מהירות"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"הגדרות שיחה"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"דואר קולי, שיחה ממתינה ואחרים"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7a9eda1..28a3b51 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"遅く再生します。"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"再生を開始または一時停止します。"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"、 "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"通話設定"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"着信音、ボイスメール設定、VoIP通話など"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"全般設定"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"連絡先表示、音、クイック返信"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"連絡先表示オプション"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"着信音"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"その他"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"クイック返信"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"通話設定"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"ボイスメール、通話中着信など"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2e2e9a2..e873a6d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"დაკვრის შენელება."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"დაკვრის დაწყება ან პაუზა."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"ზარის პარამეტრები"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"ზარები, ხმოვანი ფოსტის პარამეტრები, VoIP დარეკვა და სხვ."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"ძირითადი პარამეტრები"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"კონტაქტების ჩვენება, ხმები და სწრაფი პასუხები"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"კონტაქტის ჩვენების ვარიანტები"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"ტელეფონის ზარი"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"სხვა"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"სწრაფი პასუხი"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"ზარის პარამეტრები"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"ხმოვანი ფოსტა, ზარის მოლოდინი და სხვა"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 6a60d07..460bd62 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Баяуырақ ойнату."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Ойнатуды бастау немесе кідірту."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Қоңырау параметрлері"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Қоңырау әуендері, дауыстық пошта параметрлері, VoIP қоңыраулары, т.б."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Жалпы параметрлер"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Контактіні көрсету, дыбыстар және жылдам жауаптар"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Контактілерді көрсету опциялары"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Телефон қоңырау әуені"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Басқа"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Жылдам жауаптар"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Қоңырау параметрлері"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Дауыстық пошта, қоңырауды күту және басқалар"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e380545..052262f 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"ចាក់​កាន់តែ​យឺត។"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"ចាប់ផ្ដើម ឬ​ផ្អាក​ការ​ចាក់​ឡើងវិញ។"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"​កំណត់​ការ​ហៅ"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"សំឡេង​រោទ៍​, ការ​កំណត់​សារ​ជា​សំឡេង​, ការ​ហៅ​ VoIP ។ល។"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"ការ​កំណត់​ទូទៅ"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"បង្ហាញ​ទំនាក់ទំនង, សំឡេង និង​ឆ្លើយតប​រហ័ស"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"ជម្រើស​បង្ហាញ​ទំនាក់ទំនង"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"ផ្សេងៗ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ឆ្លើយតប​រហ័ស"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"កំណត់​ការ​ហៅ"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"សារ​ជា​សំឡេង, រង់ចាំ​ការ​ហៅ និង​ផ្សេងៗ​ទៀត"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 5c6b314..b83829a 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -130,9 +130,7 @@
     <string name="dialerKeyboardHintText" msgid="5401660096579787344">"ಡಯಲ್‌ ಮಾಡಲು ಕೀಬೋರ್ಡ್‌ ಬಳಸಿ"</string>
     <string name="dialerDialpadHintText" msgid="5824490365898349041">"ಕರೆಯನ್ನು ಸೇರಿಸಲು ಡಯಲ್‌ ಮಾಡಿ"</string>
     <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> ನಿಮಿಷಗಳು <xliff:g id="SECONDS">%s</xliff:g> ಸೆಕೆಂಡುಗಳು"</string>
-    <!-- no translation found for dialog_phone_call_prohibited_message (6554711866586660441) -->
-    <!-- no translation found for dialog_phone_call_prohibited_message (4313552620858880999) -->
-    <skip />
+    <string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"ಕರೆ ಮಾಡಲಾಗಲಿಲ್ಲ."</string>
     <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಲು, ಮೆನು &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳುಗೆ ಹೋಗಿ."</string>
     <!-- no translation found for dialog_voicemail_airplane_mode_message (530922773669546093) -->
     <skip />
@@ -194,6 +192,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"ನಿಧಾನವಾಗಿ ಪ್ಲೇ ಮಾಡಿ."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"ಪ್ಲೇಬ್ಯಾಕ್‌ ಪ್ರಾರಂಭಿಸಿ ಅಥವಾ ವಿರಾಮಗೊಳಿಸಿ."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"ರಿಂಗ್‌ಟೋನ್‌ಗಳು, ಧ್ವನಿಮೇಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು, VoIP ಕರೆ ಮಾಡುವಿಕೆ, ಇತ್ಯಾದಿ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"ಸಂಪರ್ಕ ಪ್ರದರ್ಶನ, ಸೌಂಡ್‌ಗಳು ಹಾಗೂ ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"ಸಂಪರ್ಕ ಪ್ರದರ್ಶನ ಆಯ್ಕೆಗಳು"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"ಧ್ವನಿಗಳು ಹಾಗೂ ವೈಬ್ರೇಟ್‌"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"ಡಯಲ್‌ಪ್ಯಾಡ್‌ ಧ್ವನಿಗಳು"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"ಇತರೆ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"ಧ್ವನಿಮೇಲ್‌, ಕರೆ ನಿರೀಕ್ಷೆ, ಹಾಗೂ ಇತರೆ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cd76ece..4edf456 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"더 느리게 재생합니다."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"재생을 시작하거나 일시중지합니다."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"통화 설정"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"벨소리, 음성사서함 설정, VoIP 통화 등"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"일반 설정"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"연락처 표시, 소리, 빠른 응답"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"연락처 표시 옵션"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"전화 벨소리"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"기타"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"빠른 응답"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"통화 설정"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"음성사서함, 통화중 대기, 기타"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 26e53dc..9ac9488 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -240,6 +240,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Жайыраак ойнотуу."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Ойнотуп баштоо же бир азга токтотуу"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Чалуу жөндөөлөрү"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Шыңгырлар, үн почтасынын жөндөөлөрү, VoIP чалуу ж.б."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Жалпы жөндөөлөр"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Байланышты көрсөтүү, үндөр жана тез жооптор"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Байланышты көрсөтүү параметрлери"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Телефондун шыңгыры"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Башка"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Тез жооптор"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Чалуу жөндөөлөрү"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Үн почтасы, чалууну күтүү жана башкалар"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a736ec6..e8f4ad2 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"ຫຼິ້ນຊ້າລົງ."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"ເລີ່ມຫຼືຢຸດ​ການ​ຫຼິ້ນຊົ່ວຄາວ."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"​ກາ​ນ​ຕັ້ງ​ຄ່າ​ການ​ໂທ"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"ຣິງ​ໂທນ, ການ​ຕັ້ງ​ຄ່າ​ຂໍ້​ຄວາມ​ສຽງ, ການ​ໂທ VoIP, ຯ​ລຯ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"ການຕັ້ງຄ່າທົ່ວໄປ"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"​ການ​ສະ​ແດງ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່, ສຽງ ແລະ​ການ​ຕອບ​ກັບ​ດ່ວນ"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"​ໂຕ​ເລືອກ​ການ​ສະ​ແດງ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"ຣິງໂທນໂທລະສັບ"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"ອື່ນໆ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ການຕອບແບບວ່ອງໄວ"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ໂທ"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"​ຂໍ້​ຄວາມ​ສຽງ, ສາຍ​ຊ້ອນ ແລະ​ອື່ນໆ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d4c69f7..2f15e93 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Leisti lėčiau."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Pradėti arba pristabdyti atkūrimą."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Skambučių nustatymai"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Skambėjimo tonai, balso pašto nustatymai, interneto telef. skambučiai ir kt."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Bendrieji nustatymai"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kontaktų pateikimas, garsai ir greiti atsakai"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Kontaktų rodymo parinktys"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Telefono skambėjimo tonas"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Kita"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Greiti atsakai"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Skambučių nustatymai"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Balso paštas, laukiamas skambutis ir kt."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0052b5a..8614148 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Atskaņot lēnāk."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Sākt vai apturēt atskaņošanu."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Zvanu iestatījumi"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Zvana signāli, balss pasta iestatījumi, VoIP zvani un citi iestatījumi"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Vispārīgie iestatījumi"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kontaktpersonu attēlojums, skaņas un ātrās atbildes"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Kontaktpersonu rādīšanas opcijas"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Tālruņa zvana signāls"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Citi"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Ātrās atbildes"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Zvanu iestatījumi"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Balss pasts, zvanu gaidīšana un citi"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 47cf880..3ba2ef6 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Репродуцирајте побавно."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Запрете ја или паузирајте ја репродукцијата."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Поставки за повици"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Мелодии, поставки за гласовна пошта, повици преку VoIP, итн."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Општи поставки"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Приказ на контакт, звуци и брзи одговори"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Опции за прикажување контакт"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Мелодија на телефон"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Друго"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Брзи одговори"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Поставки на повик"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Говорна пошта, повик на чекање и други"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 29f46b7..0daeaca 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"കുറഞ്ഞവേഗതയിൽ പ്ലേചെയ്യുക."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"പ്ലേബാക്ക് ആരംഭിക്കുകയോ താൽക്കാലികമായി നിർത്തുകയോ ചെയ്യുക."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"കോൾ ക്രമീകരണങ്ങൾ"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"റിംഗ്‌ടോണുകൾ, വോയ്‌സ്മെയിൽ ക്രമീകരണങ്ങൾ, VoIP കോളിംഗ് തുടങ്ങിയവ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"പൊതു ക്രമീകരണങ്ങൾ"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"കോൺടാക്‌റ്റ് ഡിസ്‌പ്ലേ, ശബ്‌ദങ്ങൾ, ദ്രുത പ്രതികരണങ്ങൾ എന്നിവ"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"കോൺടാക്‌റ്റ് ഡിസ്പ്ലേ ഓപ്ഷനുകൾ"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"ശബ്‌ദങ്ങളും വൈബ്രേറ്റുചെയ്യലും"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ഫോൺ റിംഗ്ടോൺ"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"കോളുകൾക്കായും വൈബ്രേറ്റ് ചെയ്യും"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"ഡയൽപാഡ് ടോണുകൾ"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"മറ്റുള്ളവ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ദ്രുത പ്രതികരണങ്ങൾ"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"കോൾ ക്രമീകരണങ്ങൾ"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"വോയ്‌സ്മെയിൽ, കോൾ വെയ്‌റ്റിംഗ് എന്നിവയും മറ്റുള്ളവയും"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 878ab03..ec579a9 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Удаан тоглуулах."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Тоглуулахыг эхлүүлэх буюу түр зогсоох."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Дуудлагын тохиргоо"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Хонхны ая, дуут шуудангийн тохиргоо, VoIP дуудлага, г.м."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Ерөнхий тохиргоо"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Харилцагч харуулах, дуу, шуурхай хариу"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Харилцагчийн харагдах сонголт"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Хонхны ая болон чичиргээ"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Утасны хонхны ая"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Дуудлагад бас чичрэх"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Диалпадын ая"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Бусад"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Шуурхай хариунууд"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Дуудлагын тохиргоо"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Дуут шуудан, дуудлага хүлээлт болон бусад"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index afe43a4..3b0cbfe 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"अधिक धीमे प्ले करा."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"प्लेबॅक प्रारंभ करा किंवा त्यास विराम द्या."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"कॉल सेटिंग्ज"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"रिंगटोन, व्हॉइसमेल सेटिंग्ज, VoIP कॉलिंग, इ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"सामान्य सेटिंग्ज"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"संपर्क प्रदर्शन, ध्वनी आणि द्रुत प्रतिसाद"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"संपर्क प्रदर्शन पर्याय"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"ध्वनी आणि कंपन"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"फोन रिंगटोन"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"कॉल साठी कंपन देखील करा"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"डायलपॅड टोन"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"अन्य"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"द्रुत प्रतिसाद"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"कॉल सेटिंग्ज"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"व्हॉइसमेल, कॉल प्रतीक्षा आणि अन्य"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 29b4b4e..f7f8ce5 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Main lebih perlahan."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Mulakan atau jeda main balik."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Tetapan Panggilan"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Nada dering, tetapan mel suara, panggilan VoIP, dll."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Tetapan umum"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Paparan kenalan, bunyi dan respons pantas"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Pilihan paparan kenalan"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Nada dering telefon"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Lain-lain"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respons pantas"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Tetapan panggilan"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Mel suara, panggilan menunggu dan lain-lain"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index fb70490..b9abecb 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -42,7 +42,7 @@
     <string name="notification_new_voicemail_ticker" msgid="895342132049452081">"<xliff:g id="CALLER">%1$s</xliff:g> ဆီမှ အသံစာ အသစ်"</string>
     <string name="voicemail_playback_error" msgid="1811242131549854624">"အသံပို့စာအားဖွင့်မရပါ"</string>
     <string name="voicemail_buffering" msgid="738287747618697097">"ယာယီကြားခံနေစဉ်…"</string>
-    <string name="voicemail_fetching_content" msgid="877911315738258780">"အသံပို့စာများ ရယူစောင့်စားနေစဉ်…"</string>
+    <string name="voicemail_fetching_content" msgid="877911315738258780">"အသံပို့စာများ ရယူစောင့်စားနေစဉ်…"</string>
     <string name="voicemail_fetching_timout" msgid="6691792377574905201">"အသံပို့စာများ ယူ၍မရပါ"</string>
     <string name="call_log_voicemail_header" msgid="3945407886667089173">"အသံမေးလ်ပါသော အဝင်ခေါ်ဆိုမှုများသာ"</string>
     <string name="call_log_incoming_header" msgid="2787722299753674684">"အဝင်ဖုန်းသာ"</string>
@@ -78,11 +78,11 @@
     <string name="description_search_button" msgid="3660807558587384889">"ရှာဖွေရန်"</string>
     <string name="description_dial_button" msgid="1274091017188142646">"ဖုန်းခေါ်သည်"</string>
     <string name="description_digits_edittext" msgid="8760207516497016437">"ခေါ်ရန် နံပါတ်"</string>
-    <string name="description_playback_start_stop" msgid="5060732345522492292">"ပြန်ဖွင့်ပြမှုကို ဖွင့်ရန် သို့မဟုတ် ရပ်ရန်"</string>
-    <string name="description_playback_speakerphone" msgid="6008323900245707504">"စပီကာဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ရန်"</string>
-    <string name="description_playback_seek" msgid="4509404274968530055">"အသံပြန်ဖွင့်ရေး နေရာကို ရှာရန်"</string>
-    <string name="description_rate_decrease" msgid="3161652589401708284">"ပြန်ဖွင့်မှု နှုန်းကို လျှော့ချရန်"</string>
-    <string name="description_rate_increase" msgid="6324606574127052385">"ပြန်ဖွင့်မှု နှုန်းကို မြှင့်ရန်"</string>
+    <string name="description_playback_start_stop" msgid="5060732345522492292">"ပြန်ဖွင့်ပြမှုကို ဖွင့်ရန် သို့မဟုတ် ရပ်ရန်"</string>
+    <string name="description_playback_speakerphone" msgid="6008323900245707504">"စပီကာဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ရန်"</string>
+    <string name="description_playback_seek" msgid="4509404274968530055">"အသံပြန်ဖွင့်ရေး နေရာကို ရှာရန်"</string>
+    <string name="description_rate_decrease" msgid="3161652589401708284">"ပြန်ဖွင့်မှု နှုန်းကို လျှော့ချရန်"</string>
+    <string name="description_rate_increase" msgid="6324606574127052385">"ပြန်ဖွင့်မှု နှုန်းကို မြှင့်ရန်"</string>
     <string name="action_menu_call_history_description" msgid="9018442816219748968">"ယခင်ခေါ်ဆိုမှုများ"</string>
     <string name="action_menu_overflow_description" msgid="2303272250613084574">"ပိုမိုရွေးချယ်စရာများ"</string>
     <string name="action_menu_dialpad_button" msgid="1425910318049008136">"ဖုန်းနံပါတ်ကွက်"</string>
@@ -93,9 +93,9 @@
     <string name="menu_show_voicemails_only" msgid="1898421289561435703">"အသံပို့စာများသာ ပြပါ"</string>
     <string name="menu_show_all_calls" msgid="7560347482073345885">"ဖုန်းခေါ်မှုအားလုံးပြရန်"</string>
     <string name="add_contact" msgid="4579643070374941999">"အဆက်အသွယ်များ ထဲသို့ ထည့်ရန်"</string>
-    <string name="add_2sec_pause" msgid="9214012315201040129">"၂စက္ကန့်ရပ်ဆိုင်းရန် ထည့်ပါ"</string>
+    <string name="add_2sec_pause" msgid="9214012315201040129">"၂စက္ကန့်ရပ်ဆိုင်းရန် ထည့်ပါ"</string>
     <string name="add_wait" msgid="3360818652790319634">"စောင့်ဆိုင်းခြင်း ထည့်ပါ"</string>
-    <string name="menu_select_account" msgid="5576598753317289565">"အကောင့်ကို ရွေးရန်"</string>
+    <string name="menu_select_account" msgid="5576598753317289565">"အကောင့်ကို ရွေးရန်"</string>
     <string name="dialer_settings_label" msgid="4305043242594150479">"ဆက်တင်များ"</string>
     <string name="menu_newContact" msgid="1209922412763274638">"အဆက်အသွယ်အသစ်"</string>
     <string name="menu_allContacts" msgid="6948308384034051670">"လိပ်စာများအားလုံး"</string>
@@ -103,11 +103,11 @@
     <string name="toast_call_detail_error" msgid="7200975244804730096">"တောင်းဆိုထားသော ခေါ်ဆိုမှုအတွက် အသေးစိတ်အချက်အလက်များ ဖတ်လို့မရပါ"</string>
     <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"touch tone ကီးခလုတ် ကိုအသုံးပြုပါ"</string>
     <string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"ဖုန်းပြန်ခေါ်မှု ပြုလုပ်နေစဉ်"</string>
-    <string name="dialer_addAnotherCall" msgid="4205688819890074468">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
+    <string name="dialer_addAnotherCall" msgid="4205688819890074468">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
     <string name="type_incoming" msgid="6502076603836088532">"အဝင်ခေါ်ဆိုမှု"</string>
     <string name="type_outgoing" msgid="343108709599392641">"အထွက်ဖုန်း"</string>
     <string name="type_missed" msgid="2720502601640509542">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
-    <string name="type_incoming_video" msgid="82323391702796181">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
+    <string name="type_incoming_video" msgid="82323391702796181">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="type_outgoing_video" msgid="2858140021680755266">"ပြုလုပ်နေဆဲ ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="type_missed_video" msgid="954396897034220545">"လွတ်သွားသော ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="type_voicemail" msgid="5153139450668549908">"အသံစာပို့စနစ်"</string>
@@ -129,7 +129,7 @@
     <string name="payphone" msgid="4864313342828942922">"အများသုံးဖုန်း"</string>
     <string name="dialerKeyboardHintText" msgid="5401660096579787344">"ကီးဘုတ်သုံး၍ခလုတ်နှိပ်ပါ"</string>
     <string name="dialerDialpadHintText" msgid="5824490365898349041">"ဂဏန်းများနှိပ်၍ ဖုန်းခေါ်မှုကို ထည့်ပါ"</string>
-    <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> မိနစ် <xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
+    <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> မိနစ် <xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
     <string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"ဖုန်းခေါ်မှု မထွက်ပါ"</string>
     <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"အသံစာပို့စနစ်ကို ပြင်ဆင်ရန်၊ မီနူး ပြီးနောက် ဆက်တင် သို့သွားပါ"</string>
     <string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"အသံစာပို့စနစ်ကို ခေါ်ဆိုမှုပြုရန်, လေယာဉ်ပျံပေါ်အသုံးပြုသောစနစ်ကို ပိတ်ပါ"</string>
@@ -141,9 +141,9 @@
     <string name="add_contact_not_available" msgid="1419207765446461366">"ပီးပဲလ် အပ်ပလီကေးရှင်းကို ဤအရာအား အသုံးပြုခွင့် ပြန်လည်ပေးရန်"</string>
     <string name="voice_search_not_available" msgid="7580616740587850828">"အသံဖြင့် ရှာဖွေခြင်းကို လုပ်၍မရနိုင်ပါ"</string>
     <string name="call_not_available" msgid="8941576511946492225">"ဖုန်း အပလီကေးရှင်းကို ပိတ်ထား၍ ဖုန်း ခေါ်ဆိုမှု မပြုလုပ်နိုင်ခဲ့ပါ။"</string>
-    <string name="activity_not_available" msgid="8265265380537872585">"ရွေးချယ်ထားသည့် လုပ်ဆောင်ချက်ကို ကိုင်တွယ်ရန် ထည့်သွင်းထားသည့် လှုပ်ရှားမှု မရှိပါ။"</string>
+    <string name="activity_not_available" msgid="8265265380537872585">"ရွေးချယ်ထားသည့် လုပ်ဆောင်ချက်ကို ကိုင်တွယ်ရန် ထည့်သွင်းထားသည့် လှုပ်ရှားမှု မရှိပါ။"</string>
     <string name="dialer_hint_find_contact" msgid="8798845521253672403">"နာမည် သို့မဟုတ် ဖုန်းနံပါတ် တစ်ခု ရိုက်ထည့်ပါ"</string>
-    <string name="recentMissed_empty" msgid="4177320482947526015">"သင်ဆီမှာ မကြာမီတုန်းက လွတ်သွားသည့် ခေါ်ဆိုမှုများ မရှိပါ။"</string>
+    <string name="recentMissed_empty" msgid="4177320482947526015">"သင်ဆီမှာ မကြာမီတုန်းက လွတ်သွားသည့် ခေါ်ဆိုမှုများ မရှိပါ။"</string>
     <string name="recentVoicemails_empty" msgid="4905583746647459963">"သင်ဆီမှာ မကြာမီတုန်းက အသံမေးလ်များ မရှိပါ။"</string>
     <string name="show_favorites_only" msgid="5520072531022614595">"အနှစ်သက်ဆုံးများသာ ပြပါ"</string>
     <string name="call_log_activity_title" msgid="4612824396355272023">"မှတ်တမ်း"</string>
@@ -154,14 +154,14 @@
     <string name="tab_recents" msgid="929949073851377206">"မကြာမီက"</string>
     <string name="tab_all_contacts" msgid="1410922767166533690">"အဆက်အသွယ်များ"</string>
     <string name="favorite_hidden" msgid="5011234945140912047">"အနှစ်သက်ဆုံးများထဲမှာ ထုတ်လိုက်ပါပြီ"</string>
-    <string name="favorite_hidden_undo" msgid="2508998611039406474">"တစ်ဆင့် နောက်ပြန်ပြုလုပ်ပါ"</string>
+    <string name="favorite_hidden_undo" msgid="2508998611039406474">"နောက်ပြန်လုပ်ပါ"</string>
     <string name="search_shortcut_call_number" msgid="7277194656832895870">"<xliff:g id="NUMBER">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"လိပ်စာများထဲသို့ ထည့်ပါ"</string>
     <string name="search_shortcut_make_video_call" msgid="1265971685034465166">"ဗီဒီယို ခေါ်ဆိုမှု ပြုလုပ်ရန်"</string>
-    <string name="recents_footer_text" msgid="7315554578957453359">"ခေါ်ဆိုမှု မှတ်တမ်း အပြည့်ကို ကြည့်ရန်"</string>
+    <string name="recents_footer_text" msgid="7315554578957453359">"ခေါ်ဆိုမှု မှတ်တမ်း အပြည့်ကို ကြည့်ရန်"</string>
     <string name="num_missed_calls" msgid="8081736535604293886">"လွတ်သွားသောဖုန်း <xliff:g id="NUMBER">%s</xliff:g> ခါ"</string>
-    <string name="speed_dial_empty" msgid="5476435149276295630">"အမြန် နံပါတ်ကွက်မှာ အကြိုက်ဆုံးများ နှင့် သင် မကြာခဏ ခေါ်ယူသည့် နံပါတ်များ \nကို တစ်ချက် ထိလျက် ခေါ်ဆိုခြင်း\n ဖြစ်သည်။"</string>
-    <string name="all_contacts_empty" msgid="4536082452651392894">"သင့်ဆီမှာ အဆက်အသွယ်များ မရှိပါ။"</string>
+    <string name="speed_dial_empty" msgid="5476435149276295630">"အမြန် နံပါတ်ကွက်မှာ အကြိုက်ဆုံးများ နှင့် သင် မကြာခဏ ခေါ်ယူသည့် နံပါတ်များ \nကို တစ်ချက် ထိလျက် ခေါ်ဆိုခြင်း\n ဖြစ်သည်။"</string>
+    <string name="all_contacts_empty" msgid="4536082452651392894">"သင့်ဆီမှာ အဆက်အသွယ်များ မရှိပါ။"</string>
     <string name="contact_tooltip" msgid="7817483485692282287">"နံပါတ်အားလုံးကို မြင်နိုင်ရန် ပုံကို ထိကိုင်ခြင်း သို့မဟုတ် အစဉ်လိုက်ပြန်စီရန် ဖိကိုင်ထားပါ"</string>
     <string name="description_dismiss" msgid="2146276780562549643">"လွှတ်လိုက်သည်"</string>
     <string name="remove_contact" msgid="1080555335283662961">"ဖယ်ရှာခြင်း"</string>
@@ -177,7 +177,7 @@
     <string name="description_video_call_action" msgid="4303952636480252389">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ထံသို့ ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="description_voicemail_action" msgid="8054891873788903063">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>ထံမှ အသံစာကို နားထောင်ရန်"</string>
     <string name="description_details_action" msgid="2433827152749491785">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>၏ ခေါ်ဆိုမှု အသေးစိတ်များ"</string>
-    <string name="toast_entry_removed" msgid="3389119736202317999">"ခေါ်ဆိုမှု လော့ဂ် ထည့်သွင်းမှု ဖျက်ပြီး။"</string>
+    <string name="toast_entry_removed" msgid="3389119736202317999">"ခေါ်ဆိုမှု လော့ဂ် ထည့်သွင်းမှု ဖျက်ပြီး။"</string>
     <string name="toast_caller_id_reported" msgid="1127087402649645557">"အဆက်အသွယ်ကို အစီရင်ခံထား"</string>
     <string name="call_log_action_report" msgid="561229827189128879">"အစီရင်ခံရန်"</string>
     <string name="call_log_header_today" msgid="3225248682434212981">"ယနေ့"</string>
@@ -185,12 +185,21 @@
     <string name="call_log_header_last_week" msgid="5197040511028258038">"လွန်ခဲ့သော အပတ်"</string>
     <string name="call_log_header_other" msgid="5769921959940709084">"ပိုဟောင်းသော"</string>
     <string name="call_detail_list_header" msgid="866455969433213220">"ခေါ်ဆိုမှု စာရင်း"</string>
-    <string name="voicemail_speaker_on" msgid="209154030283487068">"စပီကာကို ဖွင့်ပါ။"</string>
+    <string name="voicemail_speaker_on" msgid="209154030283487068">"စပီကာကို ဖွင့်ပါ။"</string>
     <string name="voicemail_speaker_off" msgid="7390530056413093958">"စပီကာကို ပိတ်ပါ။"</string>
     <string name="voicemail_play_faster" msgid="3444751008615323006">"ပိုမြန်စွာ ကစားရန်"</string>
     <string name="voicemail_play_slower" msgid="4544796503902818832">"ပိုနှေးစွာ ကစားရန်"</string>
-    <string name="voicemail_play_start_pause" msgid="3687447935787768983">"ဖွင့်မှု စတင် သို့မဟုတ် ဆိုင်းငံ့ရန်"</string>
+    <string name="voicemail_play_start_pause" msgid="3687447935787768983">"ဖွင့်မှု စတင် သို့မဟုတ် ဆိုင်းငံ့ရန်"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"၊ "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"အသံစဉ်များ၊ အသံစာ ဆက်တင်များ၊ VoIP ခေါ်ဆိုမှုများ စသဖြင့်"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"အထွေထွေ ဆက်တင်များ"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"အဆက်အသွယ် ပြသမှု၊ အသံများ၊ နှင့် အမြန် တုံ့ပြန်ချက်များ"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"အဆက်အသွယ် ပြသမှု ရွေးစရာများ"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"အသံများ နှင့် တုန်ခါမှု"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ဖုန်း သံစဉ်"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"ခေါ်ဆိုမှု အတွက်ပါ တုန်ခါရန်"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"ဒိုင်ခွက် သံစဉ်များ"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"အခြား"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"အမြန် တုံ့ပြန်ချက်များ"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"အသံမေးလ်၊ ခေါ်ဆိုမှု စောင့်နိုင်ခြင်း၊ နှင့် အခြားများ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ace0c66..a1e570a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Spill av saktere."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Start eller stopp avspillingen."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Anropsinnstillinger"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ringelyder, innstillinger for talepostkasse, VoIP-anrop osv."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Generelle innstillinger"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Visning av kontakter, lyder og hurtigsvar"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Visningsalternativer for kontakter"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Lyder og vibrering"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Telefonringetone"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrer også når det ringer"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tastetoner for tastaturet"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Annet"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hurtigsvar"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Samtaleinnstillinger"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Talepostkasse, samtale venter og mer"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 72558cf..dcf5355 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"ढिलो चलाउनुहोस्।"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"दोहर्याउने सुरु गर्नुहोस् वा रोक्नुहोस्।"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"कल सेटिङ्हरू"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"रिङटोनहरु, भ्वाइसमेल सेटिङ्हरू, VoIP कल, आदि"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"साधारण सेटिङ्हरू"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"सम्पर्क प्रदर्शन, ध्वनि, र छिटो प्रतिक्रियाहरू"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"सम्पर्क प्रदर्शन विकल्पहरू"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"फोन रिङटोन"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"अन्य"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"द्रुत प्रतिक्रियाहरू"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"कल सेटिङ्"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"भ्वाइस मेल, कल पर्खने, र अन्य"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 88031fe..8a10806 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Langzamer afspelen."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Afspelen starten of onderbreken."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Oproepinstellingen"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Beltonen, voicemailinstellingen, VoIP-oproepen, enzovoort"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Algemene instellingen"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Weergave van contacten, geluiden en snelle reacties"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Weegaveopties voor contacten"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Geluiden en trillen"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Beltoon telefoon"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Ook trillen voor oproepen"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tonen bij toetsaanslag"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Anders"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Snelle reacties"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Oproepinstellingen"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, wisselgesprek en overige instellingen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ca189a6..ea6de2b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Odtwarzaj wolniej."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Rozpocznij lub wstrzymaj odtwarzanie."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Ustawienia połączeń"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Dzwonki, ustawienia poczty głosowej, połączenia VoIP itp."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Ustawienia ogólne"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Wyświetlanie kontaktów, dźwięki i szybkie odpowiedzi"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opcje wyświetlania kontaktów"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Dźwięki i wibracje"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Dzwonek telefonu"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Wibracja podczas połączeń"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Dźwięki klawiatury"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Inne"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Szybkie odpowiedzi"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Ustawienia połączeń"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Poczta głosowa, połączenie oczekujące itp."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 95c4ced..f657a60 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Reproduzir mais lento."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Iniciar ou interromper a reprodução."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Definições de chamadas"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Toques, definições de correio de voz, chamadas VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Definições gerais"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Apresentação de contactos, sons e respostas rápidas"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opções de visualização de contactos"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sons e vibração"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Toque do telemóvel"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrar também para chamadas"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tons do teclado"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Outras"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostas rápidas"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Definições de chamadas"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Correio de voz, chamada em espera e outros"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 710aa18..399966e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Reprodução mais lenta."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Inicie ou pause a reprodução."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Configurações de chamada"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Toques, configurações do correio de voz, chamadas VoIP, etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Configurações gerais"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Exibição de contatos, sons e respostas rápidas"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opções de exibição de contato"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Toque do telefone"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Outras"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Respostas rápidas"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Configurações de chamada"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Correio de voz, chamada em espera e outros"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c01961f..0d68c2b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -196,6 +196,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Jucați mai lent."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Porniți sau întrerupeți redarea."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Setări pentru apeluri"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Tonuri de apel, setări de mesagerie vocală, apeluri VoIP etc."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Setări generale"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Afișaj, sunete și răspunsuri rapide agendă"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Opțiuni de afișare a agendei"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sunete și vibrații"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ton de apel al telefonului"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrații și pentru apeluri"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tonuri pentru tastatură"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Altele"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Răspunsuri rapide"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Setări pentru apeluri"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Mesagerie vocală, apel în așteptare și altele"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 35a738b..1d3fbf2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -179,7 +179,7 @@
     <string name="description_details_action" msgid="2433827152749491785">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> – сведения о вызове"</string>
     <string name="toast_entry_removed" msgid="3389119736202317999">"Запись удалена"</string>
     <string name="toast_caller_id_reported" msgid="1127087402649645557">"Сообщение отправлено."</string>
-    <string name="call_log_action_report" msgid="561229827189128879">"СООБЩИТЬ GOOGLE"</string>
+    <string name="call_log_action_report" msgid="561229827189128879">"СООБЩИТЬ ОБ ОШИБКЕ"</string>
     <string name="call_log_header_today" msgid="3225248682434212981">"Сегодня"</string>
     <string name="call_log_header_yesterday" msgid="9139172458834033092">"Вчера"</string>
     <string name="call_log_header_last_week" msgid="5197040511028258038">"Прошлая неделя"</string>
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Уменьшить скорость воспроизведения."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Начать или приостановить воспроизведение."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Настройки вызовов"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Рингтоны, голосовая почта, IP-телефония и другие настройки"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Общие настройки"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Отображение контактов, звуки и быстрые ответы"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Отображение контактов"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Рингтон"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Другие настройки"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Быстрые ответы"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Настройки вызовов"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Голосовая почта, ожидание вызова и другие функции"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index e18f88a..9672cb9 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"හෙමින් ධාවනය කරන්න."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"නැවත ධාවනයෙදී ආරම්භ කරන්න හෝ විරාමය කරන්න."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"ඇමතුම් සැකසීම්"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"රිගින්ටෝන්ස්, හඬ තැපෑල් සැකසීම්, VoIP ඇමතුම, ආදී"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"පොදු සැකසීම්"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"සම්බන්ධක දර්ශකය, හඬ. සහ වේගවත් ප්‍රතිචාරයන්"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"සම්බන්ධතා දර්ශනය කිරීමේ විකල්ප"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"දුරකථන රිගින්ටෝනය"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"වෙනත්"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"ක්ෂණික ප්‍රතිචාර"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"ඇමතුම් සැකසීම්"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"හඬ තැපෑල , ඇමතුමේ රැඳී සිටීම, සහ වෙනත්"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 37a0821..36973f5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Prehrať pomalšie"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Spustiť alebo pozastaviť prehrávanie"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Nastavenia hovorov"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Tóny zvonenia, nastavenia hlasovej schránky, volania VoIP atď."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Všeobecné nastavenia"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Zobrazenie kontaktov, zvuky a rýchle odpovede"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Možnosti zobrazenia kontaktov"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Tón zvonenia telefónu"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Ďalšie"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Rýchle odpovede"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Nastavenia hovorov"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Hlasová schránka, ďalší hovor na linke atď."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2a887d7..b6d4cd5 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Predvajaj počasneje."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Začni ali zaustavi predvajanje."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Nastavitve klicanja"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Toni zvonjenja, nastavitve sporočil v odzivniku, klicanje VoIP ipd."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Splošne nastavitve"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Prikaz stika, zvoki in hitri odgovori"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Možnosti prikaza stikov"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Ton zvonjenja telefona"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Drugo"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hitri odgovori"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Klicne nastavitve"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Odzivnik, čakajoči klic in drugo"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b34f4e3..738f598 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Спорија репродукција."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Започните или паузирајте репродукцију."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Подешавања позива"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Мелодије звона, подешавања говорне поште, VoIP позивање итд."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Општа подешавања"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Приказивање контаката, звуци и брзи одговори"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Опције приказивања контаката"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Звук звона телефона"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Друго"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Брзи одговори"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Подешавања позива"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Говорна пошта, стављање позива на чекање и друго"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index dab1a14..8a9c873 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Spela upp långsammare."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Starta eller pausa uppspelning."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Samtalsinställningar"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ringsignaler, inställningar för röstbrevlåda, VoIP-samtal m.m."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Allmänna inställningar"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Visning, ljud och snabbsvar för kontakter"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Visningsalternativ för kontakter"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Ljud och vibrationer"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ringsignal"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrera även vid samtal"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Knappsatsljud"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Övrigt"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Snabbsvar"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Samtalsinställningar"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Röstbrevlåda, samtal väntar med flera"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9cbddb6..f077a44 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Cheza polepole."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Anzisha au usitishe kucheza."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Mipangilio ya Simu"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Milio ya simu, mipangilio ya ujumbe wa sauti, kupiga simu kwenye Intaneti, nk"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Mipangilio ya jumla"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Onyesho la anwani, sauti, na majibu ya haraka"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Chaguo za onyesho la anwani"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Sauti na mtetemo"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Mlio wa simu"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Tetema pia simu zinapoingia"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Milio ya vitufe vya kupiga simu"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Nyingine"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Majibu ya haraka"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Mipangilio ya kupiga simu"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Ujumbe wa sauti, kusubirisha simu, na mengineyo"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index aca640a..c4a4438 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -96,7 +96,7 @@
     <string name="add_2sec_pause" msgid="9214012315201040129">"2-வினாடி இடைநிறுத்தத்தைச் சேர்"</string>
     <string name="add_wait" msgid="3360818652790319634">"காத்திருப்பைச் சேர்"</string>
     <string name="menu_select_account" msgid="5576598753317289565">"கணக்கைத் தேர்ந்தெடு"</string>
-    <string name="dialer_settings_label" msgid="4305043242594150479">"அமைப்புகள்"</string>
+    <string name="dialer_settings_label" msgid="4305043242594150479">"அமைப்பு"</string>
     <string name="menu_newContact" msgid="1209922412763274638">"புதிய தொடர்பு"</string>
     <string name="menu_allContacts" msgid="6948308384034051670">"எல்லா தொடர்புகளும்"</string>
     <string name="callDetailTitle" msgid="5340227785196217938">"அழைப்பு விவரங்கள்"</string>
@@ -131,7 +131,7 @@
     <string name="dialerDialpadHintText" msgid="5824490365898349041">"அழைப்பைச் சேர்க்க டயல் செய்யவும்"</string>
     <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> நிமிடங்கள் <xliff:g id="SECONDS">%s</xliff:g> வினாடிகள்"</string>
     <string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"அழைக்க முடியவில்லை"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"குரலஞ்சலை அமைக்க, செல்க மெனு &gt; அமைப்புகள்."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"குரலஞ்சலை அமைக்க, செல்க மெனு &gt; அமைப்பு."</string>
     <string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"குரலஞ்சலை அழைப்பதற்கு, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
     <string name="contact_list_loading" msgid="5488620820563977329">"ஏற்றுகிறது..."</string>
     <string name="imei" msgid="3045126336951684285">"IMEI"</string>
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"மெதுவாக இயக்கு."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"பிளேபேக்கைத் தொடங்கு அல்லது இடைநிறுத்து."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"அழைப்பு அமைப்புகள்"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"ரிங்டோன்கள், குரலஞ்சல் அமைப்புகள், VoIP அழைப்பு, மேலும் பல"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"பொது அமைப்புகள்"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"தொடர்பின் காட்சி, ஒலிகள் மற்றும் விரைவு பதில்கள்"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"தொடர்பின் காட்சி விருப்பங்கள்"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"ஒலிகளும் அதிர்வுறுதலும்"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"மொபைலின் ரிங்டோன்"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"அழைப்புகளுக்கும் அதிர்வுறு"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"டயல்பேட் ஒலிகள்"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"பிற"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"விரைவு பதில்கள்"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"அழைப்பு அமைப்புகள்"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"குரலஞ்சல், அழைப்பு காத்திருப்பு, மேலும் பிற"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 91f720e..5593fe2 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"నెమ్మదిగా ప్లే చేయి."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"ప్లేబ్యాక్‌ను ప్రారంభించు లేదా పాజ్ చేయి."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"కాల్ సెట్టింగ్‌లు"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"రింగ్‌టోన్‌లు, వాయిస్ మెయిల్‌ సెట్టింగ్‌లు, VoIP కాలింగ్ మొదలైనవి"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"సాధారణ సెట్టింగ్‌లు"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"పరిచయ ప్రదర్శన, ధ్వనులు మరియు శీఘ్ర ప్రతిస్పందనలు"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"పరిచయ ప్రదర్శన ఎంపికలు"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"ధ్వనులు మరియు వైబ్రేట్"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ఫోన్ రింగ్‌టోన్"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"డయల్‌ప్యాడ్ టోన్‌లు"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"ఇతరం"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"శీఘ్ర ప్రతిస్పందనలు"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"కాల్ సెట్టింగ్‌లు"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"వాయిస్ మెయిల్, కాల్ నిరీక్షణ మరియు ఇతరం"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3c0e554..cb7a32a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"เล่นช้าลง"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"เริ่มหรือหยุดเล่นชั่วคราว"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"การตั้งค่าการโทร"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"เสียงเรียกเข้า การตั้งค่าข้อความเสียง การโทร VoIP และอื่นๆ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"การตั้งค่าทั่วไป"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"การแสดงรายชื่อติดต่อ เสียง และคำตอบด่วน"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"ตัวเลือกการแสดงรายชื่อติดต่อ"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"เสียงเรียกเข้า"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"อื่นๆ"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"คำตอบด่วน"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"การตั้งค่าการโทร"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"ข้อความเสียง สายเรียกซ้อน และอื่นๆ"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f617986..c8db85a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Mag-play nang mas mabagal."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Simulan o i-pause ang pag-playback."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Mga Setting ng Tawag"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Mga ringtone, setting ng voicemail, VoIP na pagtawag, atbp"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Mga pangkalahatang setting"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Display ng contact, mga tunog at mabilisang tugon"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Mga opsyon ng display ng contact"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Ringtone ng telepono"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Iba pa"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Mga mabilisang tugon"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Mga setting ng tawag"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Voicemail, call waiting at iba pa"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 99c9d8d..75c6827 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Daha yavaş çalın."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Çalmayı başlatın veya duraklatın."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Çağrı Ayarları"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Zil sesleri, sesli mesaj ayarları, VoIP çağrısı vb."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Genel ayarlar"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kişi görüntüleme, sesler ve hızlı yanıtlar"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Kişi görüntüleme seçenekleri"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Telefon zil sesi"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Diğer"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hızlı yanıtlar"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Çağrı ayarları"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Sesli mesaj, çağrı bekletme ve diğerleri"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1b7900d..e83e370 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Відтворювати повільніше."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Почати або призупинити відтворення."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Налаштування дзвінків"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Сигнали дзвінка, налаштування голосової пошти, дзвінки через протокол VoIP тощо"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Загальні налаштування"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Відображення контактів, звуки та швидкі відповіді"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Параметри відображення контактів"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Сигнал дзвінка телефона"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Інше"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Швидкі відповіді"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Налаштування дзвінків"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Голосова пошта, паралельний виклик та інше"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 6a114dd..2112b43 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"آہستہ چلائیں۔"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"پلے بیک شروع یا موقوف کریں۔"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"، "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"کال کی ترتیبات"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"‏رنگ ٹونز، صوتی میل کی ترتیبات، VoIP کالنگ وغیرہ"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"عمومی ترتیبات"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"رابطہ ڈسپلے، آوازیں اور فوری جوابات"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"رابطہ کے ڈسپلے کے اختیارات"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"فون رِنگ ٹون"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"دیگر"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"فوری جوابات"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"کال کی ترتیبات"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"صوتی میل، کال کا منتظر اور دیگر"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 83f39bf..a562a31 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Sekinroq ijro etish."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Ijroni boshlash yoki to‘xtatish"</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Qo‘ng‘iroq sozlamalari"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Ringtonlar, ovozli pochta sozlamalari, VoIP qo‘ng‘iroqlari va h.k."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Umumiy sozlamalar"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Kontaktlarni ko‘rsatish, ovozlar va tezkor javoblar"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Kontaktlarni ko‘rsatish uchun tanlamalar"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Telefon uchun rington"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Boshqa"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Tezkor javoblar"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Qo‘n‘giroq sozlamalari"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Ovozli pochta, qo‘ng‘iroqni kutish va boshqalar"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c81c8be..4645d2a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Phát chậm hơn."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Bắt đầu hoặc tạm dừng phát lại."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Cài đặt cuộc gọi"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Nhạc chuông, cài đặt thư thoại, gọi điện VoIP, v.v."</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Cài đặt chung"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Hiển thị liên hệ, âm thanh và trả lời nhanh"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Tùy chọn hiển thị liên hệ"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"Nhạc chuông điện thoại"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"Khác"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Trả lời nhanh"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Cài đặt cuộc gọi"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Thư thoại, cuộc gọi chờ và các cài đặt khác"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0c4a554..2b154a2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -96,8 +96,7 @@
     <string name="add_2sec_pause" msgid="9214012315201040129">"延长暂停时间2秒"</string>
     <string name="add_wait" msgid="3360818652790319634">"延长等待时间"</string>
     <string name="menu_select_account" msgid="5576598753317289565">"选择帐户"</string>
-    <!-- no translation found for dialer_settings_label (4305043242594150479) -->
-    <skip />
+    <string name="dialer_settings_label" msgid="4305043242594150479">"设置"</string>
     <string name="menu_newContact" msgid="1209922412763274638">"新建联系人"</string>
     <string name="menu_allContacts" msgid="6948308384034051670">"所有联系人"</string>
     <string name="callDetailTitle" msgid="5340227785196217938">"通话详情"</string>
@@ -119,8 +118,7 @@
     <string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>的详细联系信息"</string>
     <string name="description_new_voicemail" msgid="2133792360865517746">"有新的语音邮件。"</string>
     <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>次通话。"</string>
-    <!-- no translation found for description_video_call (2933838090743214204) -->
-    <skip />
+    <string name="description_video_call" msgid="2933838090743214204">"视频通话。"</string>
     <string name="description_send_text_message" msgid="7803126439934046891">"向<xliff:g id="NAME">%1$s</xliff:g>发送短信"</string>
     <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"未收听的语音邮件"</string>
     <string name="description_start_voice_search" msgid="520539488194946012">"开始语音搜索"</string>
@@ -193,8 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"慢放。"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"开始或暂停播放。"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"、 "</string>
-    <!-- no translation found for call_settings_label (2934215322075055446) -->
+    <string name="general_settings_label" msgid="4787443826763795004">"常规设置"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"联系人显示、提示音和快速回复"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"联系人显示选项"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
     <skip />
-    <!-- no translation found for call_settings_description (7955465849094897305) -->
+    <string name="ringtone_title" msgid="760362035635084653">"手机铃声"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
     <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"其他"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回复"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"通话设置"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"语音信箱、来电等待及其他"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f53978a..f5855e1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"放慢播放速度。"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"開始或暫停播放。"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"、 "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"通話設定"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"鈴聲、留言信箱設定、VoIP 通話功能等"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"一般設定"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"聯絡人顯示、音效和快速回應"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"聯絡人顯示選項"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"手機鈴聲"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"其他"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回應"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"通話設定"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"留言信箱、來電待接和其他設定"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4f8bc7c..84d1900 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -151,7 +151,7 @@
     <string name="call_log_missed_title" msgid="4541142293870638971">"未接來電"</string>
     <string name="call_log_voicemail_title" msgid="940422274047025948">"語音留言"</string>
     <string name="tab_speed_dial" msgid="7807567599021643864">"快速撥號"</string>
-    <string name="tab_recents" msgid="929949073851377206">"最近存取過"</string>
+    <string name="tab_recents" msgid="929949073851377206">"近期通話"</string>
     <string name="tab_all_contacts" msgid="1410922767166533690">"聯絡人"</string>
     <string name="favorite_hidden" msgid="5011234945140912047">"已從最愛的聯絡人移除"</string>
     <string name="favorite_hidden_undo" msgid="2508998611039406474">"復原"</string>
@@ -191,6 +191,18 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"放慢播放速度。"</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"開始或暫停播放。"</string>
     <string name="list_delimeter" msgid="4571593167738725100">"、 "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"通話設定"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"鈴聲、語音信箱設定、VoIP 通話功能等"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"一般設定"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"聯絡人顯示、音效和快速回應"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"聯絡人顯示選項"</string>
+    <!-- no translation found for sounds_and_vibrate_category_title (7589787045192519254) -->
+    <skip />
+    <string name="ringtone_title" msgid="760362035635084653">"手機鈴聲"</string>
+    <!-- no translation found for vibrate_on_ring_title (3362916460327555241) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (6571449695997521615) -->
+    <skip />
+    <string name="other_settings_title" msgid="7976283601445863248">"其他"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"快速回應"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"通話設定"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"語音信箱、來電插撥和其他設定"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3e5150b..17faafd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -191,6 +191,15 @@
     <string name="voicemail_play_slower" msgid="4544796503902818832">"Dlala ngokungasheshi."</string>
     <string name="voicemail_play_start_pause" msgid="3687447935787768983">"Qala noma misa isikhashana ukudlala."</string>
     <string name="list_delimeter" msgid="4571593167738725100">", "</string>
-    <string name="call_settings_label" msgid="2934215322075055446">"Izilungiselelo zekholi"</string>
-    <string name="call_settings_description" msgid="7955465849094897305">"Amathoni wokukhala, izilungselelo zevoyisimeyili, ikholi ye-VoIP, njll"</string>
+    <string name="general_settings_label" msgid="4787443826763795004">"Izilungiselelo ezijwayelekile"</string>
+    <string name="general_settings_description" msgid="4838560696004337578">"Ukubonisa oxhumana naye, imisindo, izimpendulo ezisheshayo"</string>
+    <string name="contact_display_options_category_title" msgid="5719485933817512769">"Izinketho zokubonisa oxhumana naye"</string>
+    <string name="sounds_and_vibrate_category_title" msgid="7589787045192519254">"Imisindo nokudlidliza"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ithoni yokukhala yefoni"</string>
+    <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Iyadlidliza futhi ngamakholi"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Ukukhala kwephedi yokudayela"</string>
+    <string name="other_settings_title" msgid="7976283601445863248">"Okunye"</string>
+    <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Izimpendulo ezisheshayo"</string>
+    <string name="call_settings_label" msgid="7416182166943714852">"Izilungiselelo zekholi"</string>
+    <string name="call_settings_description" msgid="2756622428019213052">"Ivoyisimeyili, ikholi elindile, nokunye"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 448d1e6..a3fd3f9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,7 +19,6 @@
     <color name="dialtacts_primary_text_color">#333</color>
     <!-- Secondary text color in the Dialer -->
     <color name="dialtacts_secondary_text_color">#737373</color>
-    <color name="dialer_accent_color">#eeff41</color>
     <color name="dialer_red_highlight_color">#ff1744</color>
     <color name="dialer_green_highlight_color">#00c853</color>
 
@@ -100,7 +99,8 @@
     <!-- Color for icons in the actionbar -->
     <color name="actionbar_icon_color">#ffffff</color>
 
-    <color name="dialer_dialpad_touch_tint">#331dc7db</color>
+    <color name="dialer_dialpad_touch_tint">#330288d1</color>
 
+    <color name="floating_action_button_touch_tint">#80ffffff</color>
 
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cba04bd..e48720e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -76,6 +76,9 @@
     <dimen name="recent_call_log_item_padding_top">12dp</dimen>
     <dimen name="recent_call_log_item_padding_bottom">11dp</dimen>
 
+    <dimen name="call_log_item_extra_padding_vertical">4dp</dimen>
+
+
     <!-- Size of the star icon on the favorites tile. -->
     <dimen name="favorites_star_icon_size">12dp</dimen>
 
@@ -108,9 +111,6 @@
     <dimen name="search_box_icon_margin">4dp</dimen>
     <dimen name="search_box_search_icon_padding">2dp</dimen>
     <dimen name="search_box_collapsed_text_margin_left">22dp</dimen>
-    <dimen name="search_box_expanded_text_margin_left">26dp</dimen>
-    <!-- Size of the icon (voice search, close search) in the search box. -->
-    <dimen name="search_box_icon_size">28dp</dimen>
     <dimen name="search_list_padding_top">16dp</dimen>
     <dimen name="search_box_elevation">3dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 455fd5d..f9bd79e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -776,9 +776,40 @@
 
     <!-- Dialer settings related strings-->
 
+    <!-- Label for the general dialer settings section [CHAR LIMIT=30]-->
+    <string name="general_settings_label">General settings</string>
+
+    <!-- Label for the general dialer settings section description [CHAR LIMIT=80]-->
+    <string name="general_settings_description">Contact display, sounds, and quick responses</string>
+
+    <!-- Title for "Contact display options" category, which is shown above options which
+         manipulate how contacts are shown. [CHAR LIMIT=40] -->
+    <string name="contact_display_options_category_title">Contact display options</string>
+
+    <!-- Title for the category "sounds", which is shown above sounds and vibration related
+         settings. [CHAR LIMIT=30] -->
+    <string name="sounds_and_vibrate_category_title">Sounds and vibrate</string>
+
+    <!-- Setting option name to pick ringtone (a list dialog comes up). [CHAR LIMIT=30] -->
+    <string name="ringtone_title">Phone ringtone</string>
+
+    <!-- Setting option name to enable or disable vibration when ringing the phone.
+         [CHAR LIMIT=30] -->
+    <string name="vibrate_on_ring_title">"Also vibrate for calls</string>
+
+    <!-- Setting option name to enable or disable DTMF tone sound [CHAR LIMIT=30] -->
+    <string name="dtmf_tone_enable_title">Dialpad tones</string>
+
+    <!-- Label for section of general call settings where miscellaneous settings are listed. -->
+    <string name="other_settings_title">Other</string>
+
+    <!-- Title of settings screen for managing the "Respond via SMS" feature. [CHAR LIMIT=30] -->
+    <string name="respond_via_sms_setting_title">Quick responses</string>
+
     <!-- Label for the call settings section [CHAR LIMIT=30]-->
-    <string name="call_settings_label">Call Settings</string>
+    <string name="call_settings_label">Call settings</string>
 
     <!-- Label for the call settings section description [CHAR LIMIT=80]-->
-    <string name="call_settings_description">Ringtones, voicemail settings, VoIP calling, etc</string>
+    <string name="call_settings_description">Voicemail, call waiting, and others</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a3ef1c6..9d0fcd0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,7 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:overlapAnchor">true</item>
+        <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="activated_background">@drawable/list_item_activated_background</item>
         <item name="section_header_background">@drawable/list_title_holo</item>
         <item name="list_section_header_height">32dip</item>
@@ -36,7 +37,9 @@
         <item name="list_item_padding_right">32dp</item>
         <item name="list_item_padding_bottom">12dp</item>
         <item name="list_item_padding_left">16dp</item>
-        <item name="list_item_gap_between_image_and_text">8dip</item>
+        <item name="list_item_gap_between_image_and_text">
+            @dimen/contact_browser_list_item_gap_between_image_and_text
+        </item>
         <item name="list_item_gap_between_label_and_data">5dip</item>
         <item name="list_item_presence_icon_margin">4dip</item>
         <item name="list_item_presence_icon_size">16dip</item>
@@ -162,5 +165,13 @@
         <!-- Setting description. -->
         <item name="android:textColorTertiary">@color/setting_secondary_color</item>
         <item name="android:windowBackground">@color/setting_background_color</item>
+        <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+        <item name="android:textColorLink">@color/dialtacts_theme_color</item>
+    </style>
+
+    <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
+    since the Alert dialog is private. They are identical anyway. -->
+    <style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+        <item name="android:colorAccent">@color/dialtacts_theme_color</item>
     </style>
 </resources>
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
new file mode 100644
index 0000000..7410211
--- /dev/null
+++ b/res/xml/general_settings.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2014 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
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:key="dialer_contact_display_options_category_key"
+        android:title="@string/contact_display_options_category_title"
+        android:persistent="false">
+
+        <com.android.contacts.common.preference.SortOrderPreference
+            android:key="sortOrder"
+            android:title="@string/display_options_sort_list_by"
+            android:dialogTitle="@string/display_options_sort_list_by" />
+
+        <com.android.contacts.common.preference.DisplayOrderPreference
+            android:key="displayOrder"
+            android:title="@string/display_options_view_names_as"
+            android:dialogTitle="@string/display_options_view_names_as" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="dialer_general_sounds_category_key"
+        android:title="@string/sounds_and_vibrate_category_title"
+        android:persistent="false">
+
+        <com.android.dialer.settings.DefaultRingtonePreference
+            android:key="button_ringtone_key"
+            android:title="@string/ringtone_title"
+            android:dialogTitle="@string/ringtone_title"
+            android:persistent="false"
+            android:ringtoneType="ringtone" />
+
+        <CheckBoxPreference
+            android:key="button_play_dtmf_tone"
+            android:title="@string/dtmf_tone_enable_title"
+            android:persistent="false"
+            android:defaultValue="true" />
+
+        <CheckBoxPreference
+            android:key="button_vibrate_on_ring"
+            android:title="@string/vibrate_on_ring_title"
+            android:persistent="false"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="dialer_general_other_settings_category_key"
+        android:title="@string/other_settings_title"
+        android:persistent="false" >
+
+        <PreferenceScreen
+            android:key="button_respond_via_sms_key"
+            android:title="@string/respond_via_sms_setting_title"
+            android:persistent="false">
+
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.telecomm"
+                android:targetClass="com.android.telecomm.RespondViaSmsSettings$Settings" />
+
+        </PreferenceScreen>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index cb01e8e..6991be6 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -31,7 +31,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.phone.PhoneManager;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents;
 import android.speech.RecognizerIntent;
@@ -65,6 +64,7 @@
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.dialog.ClearFrequentsDialog;
 import com.android.contacts.common.interactions.ImportExportDialogFragment;
+import com.android.contacts.common.interactions.TouchPointManager;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
 import com.android.contacts.common.widget.FloatingActionButtonController;
 import com.android.dialer.activity.TransactionSafeActivity;
@@ -89,6 +89,7 @@
 import com.android.dialer.widget.SearchEditTextLayout;
 import com.android.dialer.widget.SearchEditTextLayout.OnBackButtonClickedListener;
 import com.android.dialerbind.DatabaseHelperManager;
+import com.android.incallui.CallCardFragment;
 import com.android.phone.common.animation.AnimUtils;
 import com.android.phone.common.animation.AnimationListenerAdapter;
 
@@ -227,10 +228,6 @@
     private String mActionMenuDialpadButtonStr;
     private ImageButton mFloatingActionButton;
     private FloatingActionButtonController mFloatingActionButtonController;
-    /**
-     * Additional offset for FAB to be lowered when dialpad is open.
-     */
-    private int mFloatingActionButtonDialpadMarginBottomOffset;
 
     private int mActionBarHeight;
 
@@ -339,6 +336,15 @@
     };
 
     @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            TouchPointManager.getInstance().setPoint((int) ev.getRawX(), (int) ev.getRawY());
+        }
+        return super.dispatchTouchEvent(ev);
+
+    }
+
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mFirstLaunch = true;
@@ -388,9 +394,7 @@
                 R.dimen.floating_action_button_width);
         mFloatingActionButton.setOnClickListener(this);
         mFloatingActionButtonController = new FloatingActionButtonController(this,
-                floatingActionButtonContainer);
-        mFloatingActionButtonDialpadMarginBottomOffset = resources.getDimensionPixelOffset(
-                R.dimen.floating_action_button_dialpad_margin_bottom_offset);
+                floatingActionButtonContainer, mFloatingActionButton);
 
         ImageButton optionsMenuButton =
                 (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button);
@@ -414,10 +418,16 @@
             mActionBarController.restoreInstanceState(savedInstanceState);
         }
 
-        mSlideIn = AnimationUtils.loadAnimation(this,
-                mIsLandscape ? R.anim.dialpad_slide_in_right : R.anim.dialpad_slide_in_bottom);
-        mSlideOut = AnimationUtils.loadAnimation(this,
-                mIsLandscape ? R.anim.dialpad_slide_out_right : R.anim.dialpad_slide_out_bottom);
+        final boolean isLayoutRtl = DialerUtils.isRtl();
+        if (mIsLandscape) {
+            mSlideIn = AnimationUtils.loadAnimation(this,
+                    isLayoutRtl ? R.anim.dialpad_slide_in_left : R.anim.dialpad_slide_in_right);
+            mSlideOut = AnimationUtils.loadAnimation(this,
+                    isLayoutRtl ? R.anim.dialpad_slide_out_left : R.anim.dialpad_slide_out_right);
+        } else {
+            mSlideIn = AnimationUtils.loadAnimation(this, R.anim.dialpad_slide_in_bottom);
+            mSlideOut = AnimationUtils.loadAnimation(this, R.anim.dialpad_slide_out_bottom);
+        }
 
         mSlideIn.setInterpolator(AnimUtils.EASE_IN);
         mSlideOut.setInterpolator(AnimUtils.EASE_OUT);
@@ -778,7 +788,7 @@
         final boolean callKey = Intent.ACTION_CALL_BUTTON.equals(intent.getAction());
 
         if (callKey) {
-            getPhoneManager().showCallScreen(false);
+            getTelecommManager().showInCallScreen(false);
             return true;
         }
 
@@ -1004,7 +1014,7 @@
     }
 
     private boolean phoneIsInUse() {
-        return getPhoneManager().isInAPhoneCall();
+        return getTelecommManager().isInCall();
     }
 
     public static Intent getAddNumberToContactIntent(CharSequence text) {
@@ -1136,8 +1146,8 @@
         return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
     }
 
-    private PhoneManager getPhoneManager() {
-        return (PhoneManager) getSystemService(Context.PHONE_SERVICE);
+    private TelecommManager getTelecommManager() {
+        return (TelecommManager) getSystemService(Context.TELECOMM_SERVICE);
     }
 
     @Override
@@ -1183,9 +1193,6 @@
                 align = FloatingActionButtonController.ALIGN_END;
             }
         }
-        mFloatingActionButtonController.align(align,
-                0 /* offsetX */,
-                mIsDialpadShown ? mFloatingActionButtonDialpadMarginBottomOffset : 0 /* offsetY */,
-                animate);
+        mFloatingActionButtonController.align(align, 0 /* offsetX */, 0 /* offsetY */, animate);
     }
 }
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index a432daf..c5f2fb6 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -25,6 +25,7 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.testing.NeededForTesting;
 import com.android.contacts.common.util.PhoneNumberHelper;
 import com.android.dialer.calllog.CallTypeHelper;
@@ -32,7 +33,6 @@
 import com.android.dialer.calllog.PhoneNumberDisplayHelper;
 import com.android.dialer.calllog.PhoneNumberUtilsWrapper;
 import com.android.dialer.util.DialerUtils;
-
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 4a6e4b2..0b6e881 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -27,8 +27,8 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Looper;
-import android.phone.PhoneManager;
 import android.provider.Settings;
+import android.telecomm.TelecommManager;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -225,9 +225,9 @@
 
     static boolean handlePinEntry(Context context, String input) {
         if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) {
-            PhoneManager phoneManager =
-                    (PhoneManager) context.getSystemService(Context.PHONE_SERVICE);
-            return phoneManager.handlePinMmi(input);
+            TelecommManager telecommManager =
+                    (TelecommManager) context.getSystemService(Context.TELECOMM_SERVICE);
+            return telecommManager.handleMmi(input);
         }
         return false;
     }
diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
index 105462f..d53f77f 100644
--- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
+++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
@@ -26,6 +26,7 @@
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.android.contacts.common.CallUtil;
 import com.android.dialer.PhoneCallDetails;
 import com.android.dialer.R;
 import com.android.dialer.util.DialerUtils;
@@ -122,7 +123,8 @@
         TextView durationView = (TextView) result.findViewById(R.id.duration);
 
         int callType = details.callTypes[0];
-        boolean isVideoCall = (details.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO;
+        boolean isVideoCall = (details.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO
+                && CallUtil.isVideoEnabled(mContext);
 
         callTypeIconView.clear();
         callTypeIconView.add(callType);
diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index 0054ac0..8e5622c 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -29,7 +29,9 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 
+import com.android.contacts.common.interactions.TouchPointManager;
 import com.android.contacts.common.list.ViewPagerTabs;
 import com.android.dialer.DialtactsActivity;
 import com.android.dialer.R;
@@ -104,6 +106,14 @@
     }
 
     @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            TouchPointManager.getInstance().setPoint((int) ev.getRawX(), (int) ev.getRawY());
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -116,6 +126,7 @@
         actionBar.setDisplayShowHomeEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setDisplayShowTitleEnabled(true);
+        actionBar.setElevation(0);
 
         int startingTab = TAB_INDEX_ALL;
         final Intent intent = getIntent();
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 64b1055..d0c7632 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.calllog;
 
-import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -29,9 +28,7 @@
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.PhoneLookup;
 import android.telecomm.PhoneAccountHandle;
-import android.telecomm.TelecommManager;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.AccessibilityDelegate;
@@ -39,15 +36,16 @@
 import android.view.ViewStub;
 import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityRecord;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.common.widget.GroupingListAdapter;
+import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.util.UriUtils;
+import com.android.dialer.DialtactsActivity;
 import com.android.dialer.PhoneCallDetails;
 import com.android.dialer.PhoneCallDetailsHelper;
 import com.android.dialer.R;
@@ -66,6 +64,8 @@
 public class CallLogAdapter extends GroupingListAdapter
         implements ViewTreeObserver.OnPreDrawListener, CallLogGroupBuilder.GroupCreator {
 
+    private static final int VOICEMAIL_TRANSCRIPTION_MAX_LINES = 10;
+
     /** The enumeration of {@link android.os.AsyncTask} objects used in this class. */
     public enum Tasks {
         REMOVE_CALL_LOG_ENTRIES,
@@ -257,8 +257,6 @@
     private volatile boolean mRequestProcessingDisabled = false;
 
     private boolean mIsCallLog = true;
-    private int mNumMissedCalls = 0;
-    private int mNumMissedCallsShown = 0;
 
     private View mBadgeContainer;
     private ImageView mBadgeImageView;
@@ -777,7 +775,7 @@
                     null, accountIcon, features, dataUsage, transcription);
         }
 
-        mCallLogViewsHelper.setPhoneCallDetails(views, details);
+        mCallLogViewsHelper.setPhoneCallDetails(mContext, views, details);
 
         int contactType = ContactPhotoManager.TYPE_DEFAULT;
 
@@ -887,6 +885,7 @@
     private void expandOrCollapseActions(CallLogListItemView callLogItem, boolean isExpanded) {
         final CallLogListItemViews views = (CallLogListItemViews)callLogItem.getTag();
 
+        expandVoicemailTranscriptionView(views, isExpanded);
         if (isExpanded) {
             // Inflate the view stub if necessary, and wire up the event handlers.
             inflateActionViewStub(callLogItem);
@@ -909,6 +908,20 @@
         }
     }
 
+    public static void expandVoicemailTranscriptionView(CallLogListItemViews views,
+            boolean isExpanded) {
+        if (views.callType != Calls.VOICEMAIL_TYPE) {
+            return;
+        }
+
+        final TextView view = views.phoneCallDetailsViews.voicemailTranscriptionView;
+        if (TextUtils.isEmpty(view.getText())) {
+            return;
+        }
+        view.setMaxLines(isExpanded ? VOICEMAIL_TRANSCRIPTION_MAX_LINES : 1);
+        view.setSingleLine(!isExpanded);
+    }
+
     /**
      * Configures the action buttons in the expandable actions ViewStub.  The ViewStub is not
      * inflated during initial binding, so click handlers, tags and accessibility text must be set
@@ -980,7 +993,8 @@
         }
 
         // If one of the calls had video capabilities, show the video call button.
-        if (canPlaceCallToNumber && views.phoneCallDetailsViews.callTypeIcons.isVideoShown()) {
+        if (CallUtil.isVideoEnabled(mContext) && canPlaceCallToNumber &&
+                views.phoneCallDetailsViews.callTypeIcons.isVideoShown()) {
             views.videoCallButtonView.setTag(
                     IntentProvider.getReturnVideoCallIntentProvider(views.number));
             views.videoCallButtonView.setVisibility(View.VISIBLE);
@@ -1019,21 +1033,13 @@
         mCallLogViewsHelper.setActionContentDescriptions(views);
     }
 
-    protected void bindBadge(View view, ContactInfo info, PhoneCallDetails details, int callType) {
-
+    protected void bindBadge(
+            View view, ContactInfo info, final PhoneCallDetails details, int callType) {
         // Do not show badge in call log.
         if (!mIsCallLog) {
-            final int numMissed = getNumMissedCalls(callType);
             final ViewStub stub = (ViewStub) view.findViewById(R.id.link_stub);
 
-            if (shouldShowBadge(numMissed, info, details)) {
-                // Do not process if the data has not changed (optimization since bind view is
-                // called multiple times due to contact lookup).
-                if (numMissed == mNumMissedCallsShown) {
-                    return;
-                }
-
-                // stub will be null if it was already inflated.
+            if (TextUtils.isEmpty(info.lookupKey)) {
                 if (stub != null) {
                     final View inflated = stub.inflate();
                     inflated.setVisibility(View.VISIBLE);
@@ -1042,11 +1048,16 @@
                     mBadgeText = (TextView) inflated.findViewById(R.id.badge_text);
                 }
 
-                mBadgeContainer.setOnClickListener(getBadgeClickListener());
-                mBadgeImageView.setImageResource(getBadgeImageResId());
-                mBadgeText.setText(getBadgeText(numMissed));
-
-                mNumMissedCallsShown = numMissed;
+                mBadgeContainer.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        final Intent intent =
+                                DialtactsActivity.getAddNumberToContactIntent(details.number);
+                        mContext.startActivity(intent);
+                    }
+                });
+                mBadgeImageView.setImageResource(R.drawable.ic_person_add_24dp);
+                mBadgeText.setText(R.string.recentCalls_addToContact);
             } else {
                 // Hide badge if it was previously shown.
                 if (stub == null) {
@@ -1059,67 +1070,6 @@
         }
     }
 
-    public void setMissedCalls(Cursor data) {
-        final int missed;
-        if (data == null) {
-            missed = 0;
-        } else {
-            missed = data.getCount();
-        }
-        // Only need to update if the number of calls changed.
-        if (missed != mNumMissedCalls) {
-            mNumMissedCalls = missed;
-            notifyDataSetChanged();
-        }
-    }
-
-    protected View.OnClickListener getBadgeClickListener() {
-        return new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                final Intent intent = new Intent(mContext, CallLogActivity.class);
-                mContext.startActivity(intent);
-            }
-        };
-    }
-
-    /**
-     * Get the resource id for the image to be shown for the badge.
-     */
-    protected int getBadgeImageResId() {
-        return R.drawable.ic_call_log_blue;
-    }
-
-    /**
-     * Get the text to be shown for the badge.
-     *
-     * @param numMissed The number of missed calls.
-     */
-    protected String getBadgeText(int numMissed) {
-        return mContext.getResources().getString(R.string.num_missed_calls, numMissed);
-    }
-
-    /**
-     * Whether to show the badge.
-     *
-     * @param numMissedCalls The number of missed calls.
-     * @param info The contact info.
-     * @param details The call detail.
-     * @return {@literal true} if badge should be shown.  {@literal false} otherwise.
-     */
-    protected boolean shouldShowBadge(int numMissedCalls, ContactInfo info,
-            PhoneCallDetails details) {
-        return numMissedCalls > 0;
-    }
-
-    private int getNumMissedCalls(int callType) {
-        if (callType == Calls.MISSED_TYPE) {
-            // Exclude the current missed call shown in the shortcut.
-            return mNumMissedCalls - 1;
-        }
-        return mNumMissedCalls;
-    }
-
     /** Checks whether the contact info from the call log matches the one from the contacts db. */
     private boolean callLogInfoMatches(ContactInfo callLogInfo, ContactInfo info) {
         // The call log only contains a subset of the fields in the contacts db.
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index ded65ed..b75e1c6 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -17,8 +17,8 @@
 package com.android.dialer.calllog;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
-import android.animation.Animator.AnimatorListener;
 import android.app.Activity;
 import android.app.DialogFragment;
 import android.app.KeyguardManager;
@@ -26,28 +26,24 @@
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.graphics.Outline;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract;
 import android.provider.VoicemailContract.Status;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.common.io.MoreCloseables;
-import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.util.PhoneNumberHelper;
 import com.android.contacts.common.util.ViewUtil;
 import com.android.dialer.R;
 import com.android.dialer.list.ListsFragment.HostInterface;
@@ -574,6 +570,7 @@
                 if (!isExpand) {
                     viewHolder.actionsView.setVisibility(View.VISIBLE);
                 }
+                CallLogAdapter.expandVoicemailTranscriptionView(viewHolder, !isExpand);
 
                 // Set up the fade effect for the action buttons.
                 if (isExpand) {
@@ -612,7 +609,7 @@
                     }
                 });
                 // Set everything to their final values when the animation's done.
-                animator.addListener(new AnimatorListener() {
+                animator.addListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationEnd(Animator animation) {
                         view.getLayoutParams().height = LayoutParams.WRAP_CONTENT;
@@ -625,14 +622,8 @@
                             // is defaulting to the value (0) at the start of the expand animation.
                             viewHolder.actionsView.setAlpha(1);
                         }
+                        CallLogAdapter.expandVoicemailTranscriptionView(viewHolder, isExpand);
                     }
-
-                    @Override
-                    public void onAnimationCancel(Animator animation) { }
-                    @Override
-                    public void onAnimationRepeat(Animator animation) { }
-                    @Override
-                    public void onAnimationStart(Animator animation) { }
                 });
 
                 animator.setDuration(mExpandCollapseDuration);
diff --git a/src/com/android/dialer/calllog/CallLogListItemHelper.java b/src/com/android/dialer/calllog/CallLogListItemHelper.java
index b2c1e2d..68ca7a8 100644
--- a/src/com/android/dialer/calllog/CallLogListItemHelper.java
+++ b/src/com/android/dialer/calllog/CallLogListItemHelper.java
@@ -16,10 +16,12 @@
 
 package com.android.dialer.calllog;
 
+import android.content.Context;
 import android.content.res.Resources;
 import android.provider.CallLog.Calls;
 import android.text.TextUtils;
 
+import com.android.contacts.common.CallUtil;
 import com.android.dialer.PhoneCallDetails;
 import com.android.dialer.PhoneCallDetailsHelper;
 import com.android.dialer.R;
@@ -51,17 +53,19 @@
     /**
      * Sets the name, label, and number for a contact.
      *
+     * @param context The application context.
      * @param views the views to populate
      * @param details the details of a phone call needed to fill in the data
      */
-    public void setPhoneCallDetails(CallLogListItemViews views, PhoneCallDetails details) {
+    public void setPhoneCallDetails(
+            Context context, CallLogListItemViews views, PhoneCallDetails details) {
         mPhoneCallDetailsHelper.setPhoneCallDetails(views.phoneCallDetailsViews, details);
 
         // Set the accessibility text for the contact badge
         views.quickContactView.setContentDescription(getContactBadgeDescription(details));
 
         // Set the primary action accessibility description
-        views.primaryActionView.setContentDescription(getCallDescription(details));
+        views.primaryActionView.setContentDescription(getCallDescription(context, details));
 
         // Cache name or number of caller.  Used when setting the content descriptions of buttons
         // when the actions ViewStub is inflated.
@@ -123,10 +127,12 @@
      * Examples:
      * 3 calls.  New Voicemail.  Missed call from Joe Smith mobile 2 hours ago.
      * 2 calls.  Answered call from John Doe mobile.  Last called 1 hour ago.
+     *
+     * @param context The application context.
      * @param details Details of call.
      * @return Return call action description.
      */
-    public CharSequence getCallDescription(PhoneCallDetails details) {
+    public CharSequence getCallDescription(Context context, PhoneCallDetails details) {
         int lastCallType = getLastCallType(details.callTypes);
         boolean isVoiceMail = lastCallType == Calls.VOICEMAIL_TYPE;
 
@@ -153,7 +159,8 @@
         }
 
         // If call had video capabilities, add the "Video Call" string.
-        if ((details.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
+        if ((details.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO &&
+                CallUtil.isVideoEnabled(context)) {
             callDescription.append(mResources.getString(R.string.description_video_call));
         }
 
diff --git a/src/com/android/dialer/calllog/CallLogNotificationsHelper.java b/src/com/android/dialer/calllog/CallLogNotificationsHelper.java
index 2b4ae50..db37d34 100644
--- a/src/com/android/dialer/calllog/CallLogNotificationsHelper.java
+++ b/src/com/android/dialer/calllog/CallLogNotificationsHelper.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.phone.PhoneManager;
+import android.telecomm.TelecommManager;
 
 /**
  * Helper class operating on call log notifications.
@@ -26,8 +26,9 @@
 public class CallLogNotificationsHelper {
     /** Removes the missed call notifications. */
     public static void removeMissedCallNotifications(Context context) {
-        PhoneManager phoneManager = (PhoneManager) context.getSystemService(Context.PHONE_SERVICE);
-        phoneManager.cancelMissedCallsNotification();
+        TelecommManager telecommManager = (TelecommManager)
+                context.getSystemService(Context.TELECOMM_SERVICE);
+        telecommManager.cancelMissedCallsNotification();
     }
 
     /** Update the voice mail notifications. */
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index 477aa86..837cfba 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -157,6 +157,7 @@
                 .setSmallIcon(icon)
                 .setContentTitle(title)
                 .setContentText(callers)
+                .setColor(resources.getColor(R.color.dialer_theme_color))
                 .setDefaults(callToNotify != null ? Notification.DEFAULT_ALL : 0)
                 .setDeleteIntent(createMarkNewVoicemailsAsOldIntent())
                 .setAutoCancel(true);
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index ce6c46d..141a451 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -33,11 +33,11 @@
 import android.media.ToneGenerator;
 import android.net.Uri;
 import android.os.Bundle;
-import android.phone.PhoneManager;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
 import android.provider.Contacts.PhonesColumns;
 import android.provider.Settings;
+import android.telecomm.TelecommManager;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
@@ -213,7 +213,7 @@
      * press/depress of the "hookswitch" of a landline phone. Aka "empty flash".
      *
      * TODO: Using an intent extra to tell the phone to send this flash is a
-     * temporary measure. To be replaced with an Telephony/PhoneManager call in the future.
+     * temporary measure. To be replaced with an Telephony/TelecommManager call in the future.
      * TODO: Keep in sync with the string defined in OutgoingCallBroadcaster.java
      * in Phone app until this is replaced with the Telephony/Telecomm API.
      */
@@ -273,8 +273,8 @@
         return (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
     }
 
-    private PhoneManager getPhoneManager() {
-        return (PhoneManager) getActivity().getSystemService(Context.PHONE_SERVICE);
+    private TelecommManager getTelecommManager() {
+        return (TelecommManager) getActivity().getSystemService(Context.TELECOMM_SERVICE);
     }
 
     @Override
@@ -650,11 +650,14 @@
 
         mSmsPackageComponentName = DialerUtils.getSmsComponent(activity);
 
+        // Populate the overflow menu in onResume instead of onCreate, so that if the SMS activity
+        // is disabled while Dialer is paused, the "Send a text message" option can be correctly
+        // removed when resumed.
         mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
         mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton);
         mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
         mOverflowMenuButton.setOnClickListener(this);
-        mOverflowMenuButton.setVisibility(View.INVISIBLE);
+        mOverflowMenuButton.setVisibility(isDigitsEmpty() ? View.INVISIBLE : View.VISIBLE);
     }
 
     @Override
@@ -1381,7 +1384,7 @@
      * or "return to call" from the dialpad chooser.
      */
     private void returnToInCallScreen(boolean showDialpad) {
-        getPhoneManager().showCallScreen(showDialpad);
+        getTelecommManager().showInCallScreen(showDialpad);
 
         // Finally, finish() ourselves so that we don't stay on the
         // activity stack.
@@ -1399,7 +1402,7 @@
      *              is active (ie. off hook or ringing or dialing, or on hold).
      */
     public boolean isPhoneInUse() {
-        return getPhoneManager().isInAPhoneCall();
+        return getTelecommManager().isInCall();
     }
 
     /**
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 966d265..ed95dc2 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -70,9 +70,6 @@
     public static final float REMOVE_VIEW_SHOWN_ALPHA = 0.5f;
     public static final float REMOVE_VIEW_HIDDEN_ALPHA = 1;
 
-    // Used with LoaderManager
-    private static int MISSED_CALL_LOADER = 1;
-
     public interface HostInterface {
         public void showCallHistory();
         public int getActionBarHeight();
@@ -111,27 +108,6 @@
      */
     private long mCurrentCallShortcutDate = 0;
 
-    private class MissedCallLogLoaderListener implements LoaderManager.LoaderCallbacks<Cursor> {
-
-        @Override
-        public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-            final Uri uri = CallLog.Calls.CONTENT_URI;
-            final String[] projection = new String[] {CallLog.Calls.TYPE};
-            final String selection = CallLog.Calls.TYPE + " = " + CallLog.Calls.MISSED_TYPE +
-                    " AND " + CallLog.Calls.IS_READ + " = 0";
-            return new CursorLoader(getActivity(), uri, projection, selection, null, null);
-        }
-
-        @Override
-        public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor data) {
-            mCallLogAdapter.setMissedCalls(data);
-        }
-
-        @Override
-        public void onLoaderReset(Loader<Cursor> cursorLoader) {
-        }
-    }
-
     private PanelSlideListener mPanelSlideListener = new PanelSlideListener() {
         @Override
         public void onPanelSlide(View panel, float slideOffset) {
@@ -229,7 +205,6 @@
     @Override
     public void onStart() {
         super.onStart();
-        getLoaderManager().initLoader(MISSED_CALL_LOADER, null, new MissedCallLogLoaderListener());
     }
 
     @Override
@@ -331,11 +306,11 @@
 
     @Override
     public void onPageSelected(int position) {
-        if (position == TAB_INDEX_SPEED_DIAL) {
+        if (position == TAB_INDEX_SPEED_DIAL && mSpeedDialFragment != null) {
             mSpeedDialFragment.sendScreenView();
-        } else if (position == TAB_INDEX_RECENTS) {
+        } else if (position == TAB_INDEX_RECENTS && mRecentsFragment != null) {
             mRecentsFragment.sendScreenView();
-        } else if (position == TAB_INDEX_ALL_CONTACTS) {
+        } else if (position == TAB_INDEX_ALL_CONTACTS && mAllContactsFragment != null) {
             mAllContactsFragment.sendScreenView();
         }
         final int count = mOnPageChangeListeners.size();
diff --git a/src/com/android/dialer/list/RegularSearchListAdapter.java b/src/com/android/dialer/list/RegularSearchListAdapter.java
index 2bceaf9..3ce4bea 100644
--- a/src/com/android/dialer/list/RegularSearchListAdapter.java
+++ b/src/com/android/dialer/list/RegularSearchListAdapter.java
@@ -21,6 +21,7 @@
 import android.provider.ContactsContract;
 import android.text.TextUtils;
 
+import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.list.DirectoryPartition;
 import com.android.contacts.common.list.PhoneNumberListAdapter;
 import com.android.dialer.calllog.ContactInfo;
@@ -73,9 +74,8 @@
         // a dialable number, then clicking add to contact should add it as a number.
         // Otherwise, it should add it to a new contact as a name.
         setShortcutEnabled(SHORTCUT_ADD_NUMBER_TO_CONTACTS, showNumberShortcuts);
-        // TODO: Write utility method to check subscriptions and settings, and use it to determine
-        // whether to enable or disable video call shortcut.
-        setShortcutEnabled(SHORTCUT_MAKE_VIDEO_CALL, showNumberShortcuts);
+        setShortcutEnabled(SHORTCUT_MAKE_VIDEO_CALL,
+                showNumberShortcuts && CallUtil.isVideoEnabled(getContext()));
         super.setQueryString(queryString);
     }
 }
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index d993b23..3bea170 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -146,15 +146,6 @@
     }
 
     @Override
-    protected void configureAdapter() {
-        super.configureAdapter();
-        final ContactEntryListAdapter adapter = getAdapter();
-        if (adapter != null) {
-            getAdapter().setPinnedPartitionHeadersEnabled(false);
-        }
-    }
-
-    @Override
     protected void onItemClick(int position, long id) {
         final DialerPhoneNumberListAdapter adapter = (DialerPhoneNumberListAdapter) getAdapter();
         final int shortcutType = adapter.getShortcutTypeFromPosition(position);
diff --git a/src/com/android/dialer/list/SmartDialNumberListAdapter.java b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
index d9aa846..b2e0310 100644
--- a/src/com/android/dialer/list/SmartDialNumberListAdapter.java
+++ b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
@@ -25,6 +25,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.PhoneNumberListAdapter;
 import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery;
@@ -118,9 +119,8 @@
     public void setQueryString(String queryString) {
         final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString());
         setShortcutEnabled(SHORTCUT_ADD_NUMBER_TO_CONTACTS, showNumberShortcuts);
-        // TODO: Write utility method to check subscriptions and settings, and use it to determine
-        // whether to enable or disable video call shortcut.
-        setShortcutEnabled(SHORTCUT_MAKE_VIDEO_CALL, showNumberShortcuts);
+        setShortcutEnabled(SHORTCUT_MAKE_VIDEO_CALL,
+                showNumberShortcuts && CallUtil.isVideoEnabled(getContext()));
         super.setQueryString(queryString);
     }
 }
diff --git a/src/com/android/dialer/list/SmartDialNumberPickerFragment.java b/src/com/android/dialer/list/SmartDialNumberPickerFragment.java
deleted file mode 100644
index 0892de6..0000000
--- a/src/com/android/dialer/list/SmartDialNumberPickerFragment.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-package com.android.dialer.list;
-
-import android.content.Loader;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract.Directory;
-import android.util.Log;
-
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.dialer.dialpad.SmartDialCursorLoader;
-
-/**
- * Implements a fragment to load and display SmartDial search results.
- */
-public class SmartDialNumberPickerFragment extends PhoneNumberPickerFragment {
-
-    private static final String TAG = SmartDialNumberPickerFragment.class.getSimpleName();
-
-    /**
-     * Creates a SmartDialListAdapter to display and operate on search results.
-     * @return
-     */
-    @Override
-    protected ContactEntryListAdapter createListAdapter() {
-        SmartDialNumberListAdapter adapter = new SmartDialNumberListAdapter(getActivity());
-        adapter.setDisplayPhotos(true);
-        adapter.setUseCallableUri(super.usesCallableUri());
-        return adapter;
-    }
-
-    /**
-     * Creates a SmartDialCursorLoader object to load query results.
-     */
-    @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-        /** SmartDial does not support Directory Load, falls back to normal search instead. */
-        if (id == getDirectoryLoaderId()) {
-            Log.v(TAG, "Directory load");
-            return super.onCreateLoader(id, args);
-        } else {
-            Log.v(TAG, "Creating loader");
-            final SmartDialNumberListAdapter adapter = (SmartDialNumberListAdapter) getAdapter();
-            SmartDialCursorLoader loader = new SmartDialCursorLoader(super.getContext());
-            adapter.configureLoader(loader);
-            return loader;
-        }
-    }
-
-    /**
-     * Gets the Phone Uri of an entry for calling.
-     * @param position Location of the data of interest.
-     * @return Phone Uri to establish a phone call.
-     */
-    @Override
-    protected Uri getPhoneUri(int position) {
-        final SmartDialNumberListAdapter adapter = (SmartDialNumberListAdapter) getAdapter();
-        return adapter.getDataUri(position);
-    }
-}
diff --git a/src/com/android/dialer/settings/DefaultRingtonePreference.java b/src/com/android/dialer/settings/DefaultRingtonePreference.java
new file mode 100644
index 0000000..c12e717
--- /dev/null
+++ b/src/com/android/dialer/settings/DefaultRingtonePreference.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.settings;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.preference.RingtonePreference;
+import android.util.AttributeSet;
+
+/**
+ * RingtonePreference which doesn't show default ringtone setting.
+ */
+public class DefaultRingtonePreference extends RingtonePreference {
+    public DefaultRingtonePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onPrepareRingtonePickerIntent(Intent ringtonePickerIntent) {
+        super.onPrepareRingtonePickerIntent(ringtonePickerIntent);
+
+        /*
+         * Since this preference is for choosing the default ringtone, it
+         * doesn't make sense to show a 'Default' item.
+         */
+        ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false);
+    }
+
+    @Override
+    protected void onSaveRingtone(Uri ringtoneUri) {
+        RingtoneManager.setActualDefaultRingtoneUri(getContext(), getRingtoneType(), ringtoneUri);
+    }
+
+    @Override
+    protected Uri onRestoreRingtone() {
+        return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+    }
+}
diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java
index 8d41d77..db45135 100644
--- a/src/com/android/dialer/settings/DialerSettingsActivity.java
+++ b/src/com/android/dialer/settings/DialerSettingsActivity.java
@@ -5,6 +5,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceActivity.Header;
 import android.text.TextUtils;
@@ -17,7 +19,6 @@
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment;
 import com.android.dialer.DialtactsActivity;
 import com.android.dialer.R;
 import com.android.dialerbind.analytics.AnalyticsPreferenceActivity;
@@ -29,6 +30,8 @@
     protected SharedPreferences mPreferences;
     private HeaderAdapter mHeaderAdapter;
 
+    private static final int OWNER_HANDLE_ID = 0;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -40,17 +43,20 @@
 
     @Override
     public void onBuildHeaders(List<Header> target) {
-        final Header contactDisplayHeader = new Header();
-        contactDisplayHeader.titleRes = R.string.settings_contact_display_options_title;
-        contactDisplayHeader.summaryRes = R.string.settings_contact_display_options_description;
-        contactDisplayHeader.fragment = DisplayOptionsPreferenceFragment.class.getName();
-        target.add(contactDisplayHeader);
+        final Header generalSettingsHeader = new Header();
+        generalSettingsHeader.titleRes = R.string.general_settings_label;
+        generalSettingsHeader.summaryRes = R.string.general_settings_description;
+        generalSettingsHeader.fragment = GeneralSettingsFragment.class.getName();
+        target.add(generalSettingsHeader);
 
-        final Header callSettingHeader = new Header();
-        callSettingHeader.titleRes = R.string.call_settings_label;
-        callSettingHeader.summaryRes = R.string.call_settings_description;
-        callSettingHeader.intent = DialtactsActivity.getCallSettingsIntent();
-        target.add(callSettingHeader);
+        // Only add the call settings header if the current user is the primary/owner user.
+        if (isPrimaryUser()) {
+            final Header callSettingHeader = new Header();
+            callSettingHeader.titleRes = R.string.call_settings_label;
+            callSettingHeader.summaryRes = R.string.call_settings_description;
+            callSettingHeader.intent = DialtactsActivity.getCallSettingsIntent();
+            target.add(callSettingHeader);
+        }
     }
 
     @Override
@@ -85,6 +91,23 @@
     }
 
     /**
+     * Whether a user handle associated with the current user is that of the primary owner. That is,
+     * whether there is a user handle which has an id which matches the owner's handle.
+     * @return Whether the current user is the primary user.
+     */
+    private boolean isPrimaryUser() {
+        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        List<UserHandle> userHandles = userManager.getUserProfiles();
+        for (int i = 0; i < userHandles.size(); i++){
+            if (userHandles.get(i).myUserId() == OWNER_HANDLE_ID) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * This custom {@code ArrayAdapter} is mostly identical to the equivalent one in
      * {@code PreferenceActivity}, except with a local layout resource.
      */
@@ -130,7 +153,6 @@
             } else {
                 holder.summary.setVisibility(View.GONE);
             }
-
             return view;
         }
     }
diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java
new file mode 100644
index 0000000..d04fae3
--- /dev/null
+++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.settings;
+
+import android.content.Context;
+import android.media.RingtoneManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Vibrator;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+
+import com.android.dialer.R;
+import com.android.phone.common.util.SettingsUtil;
+
+import java.lang.Boolean;
+import java.lang.CharSequence;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.Runnable;
+import java.lang.String;
+import java.lang.Thread;
+
+public class GeneralSettingsFragment extends PreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+    private static final String CATEGORY_SOUNDS_KEY    = "dialer_general_sounds_category_key";
+    private static final String BUTTON_RINGTONE_KEY    = "button_ringtone_key";
+    private static final String BUTTON_VIBRATE_ON_RING = "button_vibrate_on_ring";
+    private static final String BUTTON_PLAY_DTMF_TONE  = "button_play_dtmf_tone";
+    private static final String BUTTON_RESPOND_VIA_SMS_KEY = "button_respond_via_sms_key";
+
+    private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
+
+    private Context mContext;
+
+    private Preference mRingtonePreference;
+    private CheckBoxPreference mVibrateWhenRinging;
+    private CheckBoxPreference mPlayDtmfTone;
+    private Preference mRespondViaSms;
+
+    private Runnable mRingtoneLookupRunnable;
+    private final Handler mRingtoneLookupComplete = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_UPDATE_RINGTONE_SUMMARY:
+                    mRingtonePreference.setSummary((CharSequence) msg.obj);
+                    break;
+            }
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mContext = getActivity().getApplicationContext();
+
+        addPreferencesFromResource(R.xml.general_settings);
+
+        mRingtonePreference = findPreference(BUTTON_RINGTONE_KEY);
+        mVibrateWhenRinging = (CheckBoxPreference) findPreference(BUTTON_VIBRATE_ON_RING);
+        mPlayDtmfTone = (CheckBoxPreference) findPreference(BUTTON_PLAY_DTMF_TONE);
+        mRespondViaSms = findPreference(BUTTON_RESPOND_VIA_SMS_KEY);
+
+        PreferenceCategory soundCategory = (PreferenceCategory) findPreference(CATEGORY_SOUNDS_KEY);
+        if (mVibrateWhenRinging != null) {
+            Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
+            if (vibrator != null && vibrator.hasVibrator()) {
+                mVibrateWhenRinging.setOnPreferenceChangeListener(this);
+            } else {
+                soundCategory.removePreference(mVibrateWhenRinging);
+                mVibrateWhenRinging = null;
+            }
+        }
+
+        if (mPlayDtmfTone != null) {
+            mPlayDtmfTone.setOnPreferenceChangeListener(this);
+            mPlayDtmfTone.setChecked(Settings.System.getInt(mContext.getContentResolver(),
+                    Settings.System.DTMF_TONE_WHEN_DIALING, 1) != 0);
+        }
+
+        mRingtoneLookupRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (mRingtonePreference != null) {
+                    SettingsUtil.updateRingtoneName(
+                            mContext,
+                            mRingtoneLookupComplete,
+                            RingtoneManager.TYPE_RINGTONE,
+                            mRingtonePreference,
+                            MSG_UPDATE_RINGTONE_SUMMARY);
+                }
+            }
+        };
+    }
+
+    /**
+     * Supports onPreferenceChangeListener to look for preference changes.
+     *
+     * @param preference The preference to be changed
+     * @param objValue The value of the selection, NOT its localized display value.
+     */
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        if (preference == mVibrateWhenRinging) {
+            boolean doVibrate = (Boolean) objValue;
+            Settings.System.putInt(mContext.getContentResolver(),
+                    Settings.System.VIBRATE_WHEN_RINGING, doVibrate ? 1 : 0);
+        }
+        return true;
+    }
+
+    /**
+     * Click listener for toggle events.
+     */
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (preference == mPlayDtmfTone) {
+            Settings.System.putInt(mContext.getContentResolver(),
+                    Settings.System.DTMF_TONE_WHEN_DIALING, mPlayDtmfTone.isChecked() ? 1 : 0);
+        } else if (preference == mRespondViaSms) {
+            // Needs to return false for the intent to launch.
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mVibrateWhenRinging != null) {
+            mVibrateWhenRinging.setChecked(SettingsUtil.getVibrateWhenRingingSetting(mContext));
+        }
+
+        // Lookup the ringtone name asynchronously.
+        new Thread(mRingtoneLookupRunnable).start();
+    }
+}
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index 93a055d..686884a 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -23,8 +23,11 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.graphics.Point;
 import android.net.Uri;
+import android.os.Bundle;
 import android.provider.Telephony;
+import android.telecomm.TelecommManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -33,7 +36,10 @@
 import android.widget.Toast;
 
 import com.android.contacts.common.CallUtil;
+import com.android.contacts.common.interactions.TouchPointManager;
 import com.android.dialer.R;
+import com.android.incallui.CallCardFragment;
+import com.android.incallui.Log;
 
 import java.util.List;
 import java.util.Locale;
@@ -66,6 +72,14 @@
     public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) {
         try {
             if (Intent.ACTION_CALL.equals(intent.getAction())) {
+                // All dialer-initiated calls should pass the touch point to the InCallUI
+                Point touchPoint = TouchPointManager.getInstance().getPoint();
+                if (touchPoint.x != 0 || touchPoint.y != 0) {
+                    Bundle extras = new Bundle();
+                    extras.putParcelable(TouchPointManager.TOUCH_POINT, touchPoint);
+                    intent.putExtra(TelecommManager.EXTRA_OUTGOING_CALL_EXTRAS, extras);
+                }
+
                 ((Activity) context).startActivityForResult(intent, 0);
             } else {
                 context.startActivity(intent);
diff --git a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
index c001165..85dbf8c 100644
--- a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
@@ -233,7 +233,7 @@
                 TEST_FORMATTED_NUMBER,
                 TEST_COUNTRY_ISO, TEST_GEOCODE,
                 new int[]{Calls.OUTGOING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION);
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
         assertFalse(description.toString()
                 .contains(this.mResources.getString(R.string.description_new_voicemail)));
     }
@@ -247,7 +247,7 @@
                 TEST_FORMATTED_NUMBER,
                 TEST_COUNTRY_ISO, TEST_GEOCODE,
                 new int[]{Calls.INCOMING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION);
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
         assertFalse(description.toString()
                 .contains(this.mResources.getString(R.string.description_new_voicemail)));
     }
@@ -261,7 +261,7 @@
                 TEST_FORMATTED_NUMBER,
                 TEST_COUNTRY_ISO, TEST_GEOCODE,
                 new int[]{Calls.MISSED_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION);
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
         assertFalse(description.toString()
                 .contains(this.mResources.getString(R.string.description_new_voicemail)));
     }
@@ -275,7 +275,7 @@
                 TEST_FORMATTED_NUMBER,
                 TEST_COUNTRY_ISO, TEST_GEOCODE,
                 new int[]{Calls.VOICEMAIL_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION);
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
         assertTrue(description.toString()
                 .contains(this.mResources.getString(R.string.description_new_voicemail)));
     }
@@ -289,7 +289,7 @@
                 TEST_FORMATTED_NUMBER,
                 TEST_COUNTRY_ISO, TEST_GEOCODE,
                 new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION);
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
 
         // Rather than hard coding the "X calls" string message, we'll generate it with an empty
         // number of calls, and trim the resulting string.  This gets us just the word "calls",
@@ -308,7 +308,7 @@
                 TEST_FORMATTED_NUMBER,
                 TEST_COUNTRY_ISO, TEST_GEOCODE,
                 new int[]{Calls.VOICEMAIL_TYPE, Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION);
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
         assertTrue(description.toString()
                 .contains(this.mResources.getString(R.string.description_num_calls, 2)));
     }
@@ -324,7 +324,7 @@
                 new int[]{Calls.INCOMING_TYPE, Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION,
                 null, null, Calls.FEATURES_VIDEO, null, null);
 
-        CharSequence description = mHelper.getCallDescription(details);
+        CharSequence description = mHelper.getCallDescription(getContext(), details);
         assertTrue(description.toString()
                 .contains(this.mResources.getString(R.string.description_video_call, 2)));
     }
@@ -346,7 +346,7 @@
     /** Sets the details of a phone call using the specified phone number. */
     private void setPhoneCallDetailsWithNumberAndType(String number,
             int presentation, String formattedNumber, int callType) {
-        mHelper.setPhoneCallDetails(mViews,
+        mHelper.setPhoneCallDetails(getContext(), mViews,
                 new PhoneCallDetails(number, presentation, formattedNumber,
                         TEST_COUNTRY_ISO, TEST_GEOCODE,
                         new int[]{ callType }, TEST_DATE, TEST_DURATION)
@@ -355,7 +355,7 @@
 
     /** Sets the details of a phone call using the specified call type. */
     private void setPhoneCallDetailsWithTypes(int... types) {
-        mHelper.setPhoneCallDetails(mViews,
+        mHelper.setPhoneCallDetails(getContext() ,mViews,
                 new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
                         TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
                         types, TEST_DATE, TEST_DURATION)
@@ -364,7 +364,7 @@
 
     /** Sets the details of an unread phone call using the specified call type. */
     private void setUnreadPhoneCallDetailsWithTypes(int... types) {
-        mHelper.setPhoneCallDetails(mViews,
+        mHelper.setPhoneCallDetails(getContext(), mViews,
                 new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
                         TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
                         types, TEST_DATE, TEST_DURATION)