Improve CAF strings

- Move them to cm_strings
- Delete unused ones
- Improve wording

Change-Id: I8f75e816026bcd606946110500f5289a5237a341

2 files changed, 40 insertions, 38 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 8e23780c6..b134fc6fd 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -142,4 +142,44 @@
     <string name="alert_call_no_cellular_coverage">No cellular network available. Connect to available Wi-Fi to make calls.</string>
     <string name="alert_user_connect_to_wifi_for_call">Connect to Wi-Fi to make calls.</string>
     <string name="alert_user_connect_to_wifi_for_call_text">Tap here to view available networks</string>
+
+    <string name="menu_add_to_4g_conference_call">Add to 4G conference call</string>
+    <string name="menu_4g_conference_call">4G conference call</string>
+
+    <!-- Title for incoming 4G voice call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_incoming_volte">Incoming 4G voice call</string>
+
+    <!-- Title for incoming 4G video call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_incoming_video_lte">Incoming 4G video call</string>
+
+    <!-- Title for outgoing 4G voice call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_outgoing_volte">Outgoing 4G voice call</string>
+
+    <!-- Title for incoming 4G video call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_outgoing_video_lte">Outgoing 4G video call</string>
+
+    <!-- Title for missed 4G voice call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_missed_volte">Missed 4G voice call</string>
+
+    <!-- Title for missed 4G video call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_missed_video_lte">Missed 4G video call</string>
+
+    <!-- Title for incoming wifi voice call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_incoming_vowifi">Incoming WiFi voice call</string>
+
+    <!-- Title for incoming wifi video call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_incoming_video_wifi">Incoming WiFi video call</string>
+
+    <!-- Title for outgoing wifi voice call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_outgoing_vowifi">Outgoing WiFi voice call</string>
+
+    <!-- Title for outgoing wifi video call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_outgoing_video_wifi">Outgoing WiFi video call</string>
+
+    <!-- Title for missed wifi voice call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_missed_vowifi">Missed WiFi voice call</string>
+
+    <!-- Title for missed wifi video call in call details screen [CHAR LIMIT=60] -->
+    <string name="type_missed_video_wifi">Missed WiFi video call</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6af87602f..cb8568411 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,8 +314,6 @@
     <string name="menu_show_all_calls">Show all calls</string>
 
     <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] -->
-    <string name="menu_add_to_4g_conference_call">Add to 4G conference call</string>
-    <string name="menu_4g_conference_call">4G conference call</string>
     <string name="add_2sec_pause">Add 2-sec pause</string>
     <string name="add_wait">Add wait</string>
 
@@ -367,42 +365,6 @@
     <!-- Title for missed video call in call details screen [CHAR LIMIT=60] -->
     <string name="type_missed_video">Missed video call</string>
 
-    <!-- Title for incoming 4G voice call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_incoming_volte">Incoming 4G voice call</string>
-
-     <!-- Title for incoming 4G video call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_incoming_video_lte">Incoming 4G video call</string>
-
-    <!-- Title for outgoing 4G voice call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_outgoing_volte">Outgoing 4G voice call</string>
-
-     <!-- Title for incoming 4G video call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_outgoing_video_lte">Outgoing 4G video call</string>
-
-    <!-- Title for missed 4G voice call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_missed_volte">Missed 4G voice call</string>
-
-     <!-- Title for missed 4G video call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_missed_video_lte">Missed 4G video call</string>
-
-    <!-- Title for incoming wifi voice call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_incoming_vowifi">Incoming WiFi voice call</string>
-
-     <!-- Title for incoming wifi video call in call details screen [CHAR LIMIT=60] -->
-     <string name="type_incoming_video_wifi">Incoming WiFi video call</string>
-
-    <!-- Title for outgoing wifi voice call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_outgoing_vowifi">Outgoing WiFi voice call</string>
-
-     <!-- Title for outgoing wifi video call in call details screen [CHAR LIMIT=60] -->
-     <string name="type_outgoing_video_wifi">Outgoing WiFi video call</string>
-
-    <!-- Title for missed wifi voice call in call details screen [CHAR LIMIT=60] -->
-    <string name="type_missed_vowifi">Missed WiFi voice call</string>
-
-     <!-- Title for missed wifi video call in call details screen [CHAR LIMIT=60] -->
-     <string name="type_missed_video_wifi">Missed WiFi video call</string>
-
     <!-- Title for voicemail details screen -->
     <string name="type_voicemail">Voicemail</string>