InCallUI: Improve CAF strings

Change-Id: Iba101b105909526782e5a6d73be56adb7ea23055

2 files changed, 28 insertions, 35 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3fd76fee..bc3a5df4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -171,13 +171,4 @@
     <string name="manageConferenceLabel" msgid="4691922394301969053">"管理电话会议"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"紧急电话号码"</string>
     <string name="select_account_dialog_title" msgid="5730339500156684204">"选择帐户"</string>
-    <string name="volume_boost_notify_enabled">"开启音量增强"</string>
-    <string name="volume_boost_notify_disabled">"关闭音量增强"</string>
-    <string name="volume_boost_notify_unavailable">"有线/蓝牙耳机连接时，音效增强不可用。"</string>
-    <string name="onscreenMoreMenuText">更多菜单</string>
-    <string name="menu_start_record">通话录音</string>
-    <string name="menu_stop_record">停止录音</string>
-    <string name="recording_time_text">录音中</string>
-    <string name="menu_add_call">添加通话</string>
-    <string name="menu_merge_call">合并通话</string>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index d7abce9a..8d9de019 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     Copyright (C) 2013-2014 The CyanogenMod Project
+     Copyright (C) 2013-2015 The CyanogenMod Project
      Copyright (c) 2013, The Linux Foundation. All rights reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,61 +38,63 @@
     <string name="blacklist_dialog_message">Future calls from <xliff:g id="number">%s</xliff:g> will be blocked</string>
 
     <!-- In-call screen: status label when in a paused video call. -->
-    <string name="card_title_video_call_paused">Video call (Paused)</string>
+    <string name="card_title_video_call_paused">Video call (paused)</string>
     <!-- Text for the onscreen "Add Participant" button -->
-    <string name="onscreenAddParticipant">Add Participant</string>
+    <string name="onscreenAddParticipant">Add participant</string>
 
     <!-- In-call screen: Modify Call Options for IMS call -->
-    <string name="modify_call_option_title">Which type of call?</string>
-    <string name="modify_call_option_vt">VT</string>
+    <string name="modify_call_option_title">Select call type</string>
+    <string name="modify_call_option_vt">Video call</string>
     <string name="modify_call_option_vt_tx">Video transmit</string>
     <string name="modify_call_option_vt_rx">Video receive</string>
-    <string name="modify_call_option_voice">Voice Only</string>
+    <string name="modify_call_option_voice">Voice only</string>
 
     <!-- Message indicating video calls not allowed if user enabled TTY Mode -->
-    <string name="video_call_not_allowed_if_tty_enabled">Please disable TTY Mode to upgrade to video calls.</string>
+    <string name="video_call_not_allowed_if_tty_enabled">Please disable TTY mode to allow video calls</string>
 
     <!-- Message indicating that Video Started flowing for IMS-VT calls -->
-    <string name="player_started">Player Started</string>
+    <string name="player_started">Player started</string>
     <!-- Message indicating that Video Stopped flowing for IMS-VT calls -->
-    <string name="player_stopped">Player Stopped</string>
+    <string name="player_stopped">Player stopped</string>
     <!-- Message indicating that camera failure has occurred for the selected camera and
          as result camera is not ready -->
-    <string name="camera_not_ready">Camera not ready</string>
+    <string name="camera_not_ready">Camera is not ready</string>
     <!-- Message indicating that camera is ready/available -->
-    <string name="camera_ready">Camera ready</string>
+    <string name="camera_ready">Camera is ready</string>
     <!-- Message indicating unknown call session event -->
-    <string name="unknown_call_session_event">"Unkown call session event"</string>
+    <string name="unknown_call_session_event">Unkown call session event</string>
 
-    <string name="volume_boost_notify_enabled">"Volume boost ON."</string>
-    <string name="volume_boost_notify_disabled">"Volume boost OFF."</string>
-    <string name="volume_boost_notify_unavailable">"Extra volume is not available when Wired/Blue tooth headset is used."</string>
+    <string name="volume_boost_notify_enabled">Volume boost is enabled</string>
+    <string name="volume_boost_notify_disabled">Volume boost is disabled</string>
+    <string name="volume_boost_notify_unavailable">Extra volume is not available when using a headset</string>
     <string name="volume_boost_toast_position" translate="false">600</string>
-    <string name="onscreenMoreMenuText">More menu</string>
+
+    <string name="onscreenMoreMenuText">More options</string>
     <string name="menu_start_record">Record call</string>
     <string name="menu_stop_record">Stop recording</string>
     <string name="recording_time_text">Recording</string>
+
     <!-- Set Subscription screen: label sub 1 -->
-    <string name="sub_1">SUB 1</string>
+    <string name="sub_1">SIM 1</string>
     <!-- Set Subscription screen: label sub 2 -->
-    <string name="sub_2">SUB 2</string>
+    <string name="sub_2">SIM 2</string>
     <!-- Call substate label for call resumed -->
     <string name="call_substate_call_resumed">Call resumed</string>
     <!-- Call substate label for call connected suspended (audio) -->
-    <string name="call_substate_connected_suspended_audio">Call audio suspended</string>
+    <string name="call_substate_connected_suspended_audio">Call is connected, but audio is suspended</string>
     <!-- Call substate label for call connected suspended (video) -->
-    <string name="call_substate_connected_suspended_video">Call video suspended</string>
+    <string name="call_substate_connected_suspended_video">Call is connected, but video is suspended</string>
     <!-- Call substate label for avp retry -->
-    <string name="call_substate_avp_retry">Avp retry</string>
+    <string name="call_substate_avp_retry">Detecting video quality\u2026</string>
     <!-- Video quality changed message -->
-    <string name="video_quality_changed">Video quality changed to \u0020</string>
+    <string name="video_quality_changed">Video quality changed to <xliff:g id="quality" example="high">%1$s</xliff:g></string>
     <!-- Video quality High -->
-    <string name="video_quality_high">High</string>
+    <string name="video_quality_high">high</string>
     <!-- Video quality Medium -->
-    <string name="video_quality_medium">Medium</string>
+    <string name="video_quality_medium">medium</string>
     <!-- Video quality Low -->
-    <string name="video_quality_low">Low</string>
+    <string name="video_quality_low">low</string>
     <!-- Video quality Unknown -->
-    <string name="video_quality_unknown">Unknown</string>
+    <string name="video_quality_unknown">unknown</string>
 
 </resources>