diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 05cd5b5..92d6d94 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -282,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. -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5f71ce5..dbea082 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -191,26 +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>
-    <!-- no translation found for general_settings_label (4787443826763795004) -->
-    <skip />
-    <!-- no translation found for general_settings_description (4838560696004337578) -->
-    <skip />
-    <!-- no translation found for contact_display_options_category_title (5719485933817512769) -->
-    <skip />
-    <!-- no translation found for sounds_and_vibrate_category_title (8821719295658641733) -->
-    <skip />
-    <!-- no translation found for ringtone_title (760362035635084653) -->
-    <skip />
-    <!-- no translation found for vibrate_on_ring_title (3442694674084884238) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (1924260663475511870) -->
-    <skip />
-    <!-- no translation found for other_settings_title (7976283601445863248) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title (1318281521087951580) -->
-    <skip />
-    <!-- no translation found for call_settings_label (7416182166943714852) -->
-    <skip />
-    <!-- no translation found for call_settings_description (2756622428019213052) -->
-    <skip />
+    <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="8821719295658641733">"Ήχοι και δόνηση"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Ήχος κλήσης τηλεφώνου"</string>
+    <string name="vibrate_on_ring_title" msgid="3442694674084884238">"Δόνηση κατά το κουδούνισμα"</string>
+    <string name="dtmf_tone_enable_title" msgid="1924260663475511870">"Ήχοι αφής πληκτρολογίου κλήσης"</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-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index ec718a1..7d9e3be 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -191,26 +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>
-    <!-- no translation found for general_settings_label (4787443826763795004) -->
-    <skip />
-    <!-- no translation found for general_settings_description (4838560696004337578) -->
-    <skip />
-    <!-- no translation found for contact_display_options_category_title (5719485933817512769) -->
-    <skip />
-    <!-- no translation found for sounds_and_vibrate_category_title (8821719295658641733) -->
-    <skip />
-    <!-- no translation found for ringtone_title (760362035635084653) -->
-    <skip />
-    <!-- no translation found for vibrate_on_ring_title (3442694674084884238) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (1924260663475511870) -->
-    <skip />
-    <!-- no translation found for other_settings_title (7976283601445863248) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title (1318281521087951580) -->
-    <skip />
-    <!-- no translation found for call_settings_label (7416182166943714852) -->
-    <skip />
-    <!-- no translation found for call_settings_description (2756622428019213052) -->
-    <skip />
+    <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="8821719295658641733">"​ສຽງ​ແລະ​ການ​ສັ່ນ​ເຕືອນ"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ຣິງໂທນໂທລະສັບ"</string>
+    <string name="vibrate_on_ring_title" msgid="3442694674084884238">"ສັ່ນເຕືອນເມື່ອມີສາຍໂທເຂົ້າ"</string>
+    <string name="dtmf_tone_enable_title" msgid="1924260663475511870">"​ສຽງ​ກົດ​ປຸ່ມ​ໂທ"</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 c7ae406..98e37ad 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -191,26 +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>
-    <!-- no translation found for general_settings_label (4787443826763795004) -->
-    <skip />
-    <!-- no translation found for general_settings_description (4838560696004337578) -->
-    <skip />
-    <!-- no translation found for contact_display_options_category_title (5719485933817512769) -->
-    <skip />
-    <!-- no translation found for sounds_and_vibrate_category_title (8821719295658641733) -->
-    <skip />
-    <!-- no translation found for ringtone_title (760362035635084653) -->
-    <skip />
-    <!-- no translation found for vibrate_on_ring_title (3442694674084884238) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (1924260663475511870) -->
-    <skip />
-    <!-- no translation found for other_settings_title (7976283601445863248) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title (1318281521087951580) -->
-    <skip />
-    <!-- no translation found for call_settings_label (7416182166943714852) -->
-    <skip />
-    <!-- no translation found for call_settings_description (2756622428019213052) -->
-    <skip />
+    <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="8821719295658641733">"Дуу болон Чичиргээ"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Утасны хонхны ая"</string>
+    <string name="vibrate_on_ring_title" msgid="3442694674084884238">"Хонх дуугарах үед чичрэх"</string>
+    <string name="dtmf_tone_enable_title" msgid="1924260663475511870">"Диалпад товчны дуу"</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-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index f071f80..744d987 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -154,7 +154,7 @@
     <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>
@@ -191,26 +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>
-    <!-- no translation found for general_settings_label (4787443826763795004) -->
-    <skip />
-    <!-- no translation found for general_settings_description (4838560696004337578) -->
-    <skip />
-    <!-- no translation found for contact_display_options_category_title (5719485933817512769) -->
-    <skip />
-    <!-- no translation found for sounds_and_vibrate_category_title (8821719295658641733) -->
-    <skip />
-    <!-- no translation found for ringtone_title (760362035635084653) -->
-    <skip />
-    <!-- no translation found for vibrate_on_ring_title (3442694674084884238) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (1924260663475511870) -->
-    <skip />
-    <!-- no translation found for other_settings_title (7976283601445863248) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title (1318281521087951580) -->
-    <skip />
-    <!-- no translation found for call_settings_label (7416182166943714852) -->
-    <skip />
-    <!-- no translation found for call_settings_description (2756622428019213052) -->
-    <skip />
+    <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="8821719295658641733">"အသံများ နှင့် တုန်ခါမှု"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"ဖုန်း သံစဉ်"</string>
+    <string name="vibrate_on_ring_title" msgid="3442694674084884238">"ဖုန်း မြည်စဉ် တုန်ခါရန်"</string>
+    <string name="dtmf_tone_enable_title" msgid="1924260663475511870">"ဒိုင်ခွက် တို့ထိမှု သံစဉ်များ"</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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3efc211..46dbd32 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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5098369..f9bd79e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -788,17 +788,17 @@
 
     <!-- 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>
+    <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">Vibrate when ringing</string>
+    <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 touch tones</string>
+    <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>
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index ecccdfd..7410211 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -48,17 +48,17 @@
             android:ringtoneType="ringtone" />
 
         <CheckBoxPreference
-            android:key="button_vibrate_on_ring"
-            android:title="@string/vibrate_on_ring_title"
-            android:persistent="false"
-            android:defaultValue="false" />
-
-        <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