Improve CAF strings

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

Change-Id: I8f75e816026bcd606946110500f5289a5237a341

2 files changed, 0 insertions, 78 deletions

diff --git a/res/values-zh-rCN/qtistrings.xml b/res/values-zh-rCN/qtistrings.xml
deleted file mode 100644
index 25f18c0c9..000000000
--- a/res/values-zh-rCN/qtistrings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted provided that the following conditions are
-  ~ met:
-  ~      Redistributions of source code must retain the above copyright
-  ~       notice, this list of conditions and the following disclaimer.
-  ~      Redistributions in binary form must reproduce the above
-  ~       copyright notice, this list of conditions and the following
-  ~       disclaimer in the documentation and/or other materials provided
-  ~       with the distribution.
-  ~      Neither the name of The Linux Foundation nor the names of its
-  ~       contributors may be used to endorse or promote products derived
-  ~       from this software without specific prior written permission.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-  ~ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  ~ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-  ~ ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-  ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  ~ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  ~ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-  ~ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  ~ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  ~ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-  ~ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ~
-  -->
-
-<!-- The xml contains Qti specific resource strings neede for any value added features. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="video_call_upgrade">不能升级！</string>
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e06db32ba..0eb70e679 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -110,9 +110,6 @@
     <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_incoming_volte">4G语音通话来电</string>
-    <string name="type_outgoing_volte">外拨4G语音通话</string>
-    <string name="type_missed_volte">未接4G语音通话</string>
     <string name="type_voicemail" msgid="5153139450668549908">"语音信箱"</string>
     <string name="type_rejected" msgid="7783201828312472691">"拒接的来电"</string>
     <string name="type_blocked" msgid="3521686227115330015">"屏蔽的来电"</string>
@@ -135,8 +132,6 @@
     <string name="callDetailsDurationFormat" msgid="6061406028764382234">"<xliff:g id="MINUTES">%s</xliff:g> 分钟 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
 
     <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] -->
-    <string name="menu_add_to_4g_conference_call">"加入 4G 电话会议"</string>
-    <string name="menu_4g_conference_call">"4G 电话会议"</string>
     <string name="add_2sec_pause">"延长暂停时间2秒"</string>
     <string name="add_wait">"延长等待时间"</string>
 
@@ -296,30 +291,6 @@
     <string name="clear">清除</string>
     <string name="description_clear_search">清除搜索记录</string>
     <string name="recentCalls_empty">"您没有任何通话记录"</string>
-    <!-- The description text for the call log tab.
-    Note: AccessibilityServices use this attribute to announce what the view represents.
-    This is especially valuable for views without textual representation like ImageView.
-    [CHAR LIMIT=NONE] -->
-    <string name="recentCallsIconLabel">"通话记录"</string>
-    <!-- Menu item used to call a contact from the call log -->
-    <string name="recentCalls_callNumber">"呼叫<xliff:g id="NAME">%s</xliff:g>"</string>
-    <!-- Text for a menu item to report a call as having been incorrectly identified.
-         [CHAR LIMIT=30] -->
-    <string name="call_detail_menu_report">"报告错误的号码"</string>
-    <!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it -->
-    <string name="recentCalls_editNumberBeforeCall">"呼叫之前编辑号码"</string>
-    <!-- Menu item used to add a number from the call log to contacts -->
-    <string name="recentCalls_addToContact">"添加到联系人"</string>
-    <!-- Menu item used to remove a single call from the call log -->
-    <string name="recentCalls_removeFromRecentList">"从通话记录中删除"</string>
-    <!-- Menu item used to remove all calls from the call log -->
-    <string name="recentCalls_deleteAll">"清除通话记录"</string>
-    <!-- Menu item used to delete a voicemail. [CHAR LIMIT=30] -->
-    <string name="recentCalls_trashVoicemail">"删除语音邮件"</string>
-    <!-- Menu item used to share a voicemail. [CHAR LIMIT=30] -->
-    <string name="recentCalls_shareVoicemail">"分享语音邮件"</string>
-    <!-- Label of the button displayed when the call log is empty. Allows the user to make a call. -->
-    <string name="recentCalls_empty_action">"拨打电话"</string>
     <!-- String resource for the font-family to use for the call log activity's title
          Do not translate. -->
     <string name="call_log_activity_title_font_family">sans-serif-light</string>
@@ -330,21 +301,7 @@
     <string name="recentIncoming_empty">"您没有任何来电。"</string>
     <!-- Text displayed when the list of outgoing calls is empty -->
     <string name="recentOutgoing_empty">"您没有任何外拨电话。"</string>
-    <!-- Text displayed when the list of missed calls is empty -->
-    <string name="recentMissed_empty">"您没有任何未接电话。"</string>
-    <!-- Text displayed when the list of voicemails is empty -->
-    <string name="recentVoicemails_empty">"您未收到任何语音邮件。"</string>
 
-    <string name="add_to_white_list">"加入白名单"</string>
-    <string name="add_to_black_list">"加入黑名单"</string>
-    <string name="remove_from_black_list">"从黑名单中移除"</string>
-    <string name="remove_from_white_list">"从白名单中移除"</string>
-    <string name="firewall_remove_success">"已成功移除"</string>
-    <string name="yes">"是"</string>
-    <string name="no">"否"</string>
-    <string name="input_number">"输入号码"</string>
-    <string name="speed_dial_cancel">"取消"</string>
-    <string name="speed_dial_ok">"确定"</string>
     <string name="call_data_info_label">"通话/流量计时器"</string>
     <string name="call_data_info_description">"语音通话时长和流量使用时间"</string>
     <string name="alert_call_over_wifi">"将通过 Wi-Fi 拨打电话。"</string>