Move CAF strings to cm_strings and fix wrong line breaks.

Screenshots:
Before:
http://imgur.com/a/4n2Sv
http://imgur.com/a/o4FPf

After:
http://imgur.com/a/jYZm2
http://imgur.com/a/HhiUS

Change-Id: I078bbe05015b2e28aed6afa06e277bc61b9f3e20
Signed-off-by: PMS22 <prathams99@rediff.com>

2 files changed, 40 insertions, 50 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 6c9299d43..81ab9fac9 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -97,4 +97,44 @@
     <string name="wb_amr_format" translatable="false">AMR-WB</string>
     <string name="aac_format" translatable="false">AAC</string>
     <string name="call_playback_no_app_found_toast">No app could be found for playback of the selected recording.</string>
+
+    <!-- Speed Dial -->
+    <string name="speed_dial_settings">Speed dial settings</string>
+    <string name="speed_dial_not_set">(not set)</string>
+    <string name="speed_dial_replace">Replace</string>
+    <string name="speed_dial_delete">Delete</string>
+    <string name="speed_dial_unassigned_dialog_title">Key unassigned</string>
+    <string name="speed_dial_unassigned_dialog_message">No speed dial action is assigned to number key \'<xliff:g id="number">%s</xliff:g>\'. Do you want to assign an action now?</string>
+    <string name="dialog_speed_dial_airplane_mode_message">To use speed dial, first turn off airplane mode</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+
+    <!-- Text displayed when the list of incoming calls is empty -->
+    <string name="recentIncoming_empty">You have no incoming calls.</string>
+
+    <!-- Text displayed when the list of outgoing calls is empty -->
+    <string name="recentOutgoing_empty">You have no outgoing calls.</string>
+
+    <!-- Text displayed when the call log is empty. -->
+    <string name="recentCalls_empty">Your call log is empty</string>
+    <string name="calllog_search_hint">Search call log</string>
+    <string name="no_call_log">No call log</string>
+    <string name="clear">Clear</string>
+    <string name="description_clear_search">Clear search</string>
+    <string name="video_call_welcome_title"><b>Welcome to the new Video Calling Dialer</b></string>
+    <string name="video_call_welcome_message">We all love to hear that familiar voice at the end of the line, but talking face-to-face is so much better! Here\'s what you should know to get your real-time (or FaceTime?) connections going: You\'ll need to be on 4G LTE or a Wi-Fi connection The device you\'re calling must also be video calling compatible Video calls use your high speed data You can also upgrade a voice call to a video call Check out <a>https://support.t-mobile.com/docs/DOC-23574</a> for more information.</string>
+    <string name="video_call_welcome_message_repeat">Show this message every time</string>
+
+    <string name="toast_change_video_call_failed">Can not change to video call, incorrect number format</string>
+    <string name="toast_make_video_call_failed">Can not make video call, incorrect number format</string>
+    <!-- Add for enhance videocall ui -->
+    <string name="overflowBothCallMenuItemText">Video Call, show me</string>
+    <string name="overflowRXCallMenuItemText">Video Call, hide me</string>
+    <string name="overflowVOCallMenuItemText">Voice Call</string>
+    <string name="video_call">Video Calling</string>
+    <string name="call_data_info_label">Call/data Usage Timers</string>
+    <string name="call_data_info_description">Voice call usage time and data usage time</string>
+    <string name="alert_call_over_wifi">Calls will be made over Wi-Fi.</string>
+    <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>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad7f457d5..6af87602f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1101,54 +1101,4 @@
 
     <!-- Accessibility announcement to indicate which call is active -->
     <string name="accessibility_call_is_active"><xliff:g id="nameOrNumber">^1</xliff:g> is active</string>
-
-    <!--  for speed dial -->
-    <string name="speed_dial_settings">Speed dial settings</string>
-
-    <string name="speed_dial_not_set">(not set)</string>
-
-    <string name="speed_dial_replace">Replace</string>
-
-    <string name="speed_dial_delete">Delete</string>
-
-    <string name="speed_dial_unassigned_dialog_title">Key unassigned</string>
-
-    <string name="speed_dial_unassigned_dialog_message">No speed dial action is assigned to number k
-ey \'<xliff:g id="number">%s</xliff:g>\'. Do you want to assign an action now?</string>
-
-    <string name="dialog_speed_dial_airplane_mode_message">To use speed dial, first turn off Airplan
-e mode.</string>
-
-    <string name="yes">Yes</string>
-
-    <string name="no">No</string>
-
-    <!-- Text displayed when the list of incoming calls is empty -->
-    <string name="recentIncoming_empty">You have no incoming calls.</string>
-
-    <!-- Text displayed when the list of outgoing calls is empty -->
-    <string name="recentOutgoing_empty">You have no outgoing calls.</string>
-
-    <!-- Text displayed when the call log is empty. -->
-    <string name="recentCalls_empty">Your call log is empty</string>
-    <string name="calllog_search_hint">"Search call log"</string>
-    <string name="no_call_log">No call log</string>
-    <string name="clear">Clear</string>
-    <string name="description_clear_search">Clear search</string>
-    <string name="video_call_welcome_title"><b>Welcome to the new Video Calling Dialer</b></string>
-    <string name="video_call_welcome_message">We all love to hear that familiar voice at the end of the line, but talking face-to-face is so much better! Here\'s what you should know to get your real-time (or FaceTime?) connections going: You\'ll need to be on 4G LTE or a Wi-Fi connection The device you\'re calling must also be video calling compatible Video calls use your high speed data You can also upgrade a voice call to a video call Check out <a>https://support.t-mobile.com/docs/DOC-23574</a> for more information.</string>
-    <string name="video_call_welcome_message_repeat">Show this message every time</string>
-
-    <string name="toast_change_video_call_failed">Can not change to video call, incorrect number format</string>
-    <string name="toast_make_video_call_failed">Can not make video call, incorrect number format</string>
-    <!-- Add for enhance videocall ui -->
-    <string name="overflowBothCallMenuItemText">Video Call, show me</string>
-    <string name="overflowRXCallMenuItemText">Video Call, hide me</string>
-    <string name="overflowVOCallMenuItemText">Voice Call</string>
-    <string name="video_call">Video Calling</string>
-    <string name="call_data_info_label">Call/data Usage Timers</string>
-    <string name="call_data_info_description">Voice call usage time and data usage time</string>
-    <string name="alert_call_over_wifi">Calls will be made over Wi-Fi.</string>
-    <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>
 </resources>