Contacts: Impove CAF strings

Change-Id: I3dc684161a66a687a3277a45c49344606f26a392

4 files changed, 76 insertions, 79 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bae2036d5..bdc9fbca7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -102,17 +102,6 @@
     <string name="contactSavedToast" msgid="7152589189385441091">"此联系人已保存。"</string>
     <string name="contactSavedErrorToast" msgid="3207250533172944892">"无法保存联系人更改。"</string>
     <string name="contactPhotoSavedErrorToast" msgid="4079032272022979114">"无法保存联系人照片更改。"</string>
-    <string name="contactSavedToSimCardError">"发生错误，正在载入SIM卡联系人。"</string>
-    <string name="airplane_mode_on">"发生错误，当前处于飞行模式。"</string>
-    <string name="number_anr_too_long">"发生错误，电话号码过长。"</string>
-    <string name="email_address_too_long">"发生错误，邮箱地址过长。"</string>
-    <string name="sim_card_full">"发生错误，SIM卡已满。"</string>
-    <string name="tag_too_long">"发生错误，联系人姓名过长。"</string>
-    <string name="no_phone_number">请输入手机号码。</string>
-    <string name="invalid_phone_number">"发生错误，电话号码不合法。"</string>
-    <string name="invalid_number_type">"发生错误，号码类型不合法。"</string>
-    <string name="no_phone_number_or_email">请输入手机号码或者邮箱地址。</string>
-    <string name="memory_card_full">错误, 内存已满.</string>
     <string name="importConfirmation_title" msgid="1418215926447642260">"要导入联系人吗？"</string>
     <string name="edit_before_call">"拨号前编辑号码"</string>
     <string name="groupSavedToast" msgid="1168756874239833756">"群组已保存。"</string>
@@ -246,30 +235,9 @@
     <string name="keep_local" msgid="1258761699192993322">"本地保存"</string>
     <string name="add_account" msgid="8201790677994503186">"添加帐户"</string>
     <string name="add_new_account" msgid="5748627740680940264">"添加新帐户"</string>
-    <string name="select_all">"全选"</string>
     <string name="btn_ok">"确定"</string>
     <string name="btn_cancel">"取消"</string>
-    <string name="search_bar_hint">"搜索联系人"</string>
-    <string name="menu_sendViaSMS">通过短信发送联系人</string>
-    <string name="deleteConfirmation_title">"要删除联系人吗？"</string>
-    <string name="ContactMultiDeleteConfirmation">"将会删除这些联系人。"</string>
-    <string name="delete_contacts_title">"删除联系人"</string>
-    <string name="delete_contacts_message">"正在删除..."</string>
-    <string name="delete_termination">"删除结束"</string>
-    <string name="ContactMultiImportConfirmation">"将会导入这些联系人。"</string>
-    <string name="import_sim_contacts_title">"导入联系人"</string>
-    <string name="import_sim_contacts_message">"正在导入..."</string>
-    <!-- Import from sim card -->
-    <string name="import_finish">"导入完成"</string>
     <string name="import_stop">"导入停止"</string>
-    <string name="too_many_contacts_add_to_group">联系人过多，应该少于<xliff:g id="count">%d</xliff:g>个</string>
-    <!-- add for MemoryStatusActivity -->
-    <string name="menu_memory_status">"存储器状态"</string>
-    <string name="memory_status_title">"存储器状态"</string>
-    <string name="memory_size">"容量:"</string>
-    <string name="memory_available">"可用"</string>
-    <string name="memory_used">"已用:"</string>
-    <string name="calculating_status_now">正在计算存储状态…</string>
     <string name="menu_export_database" msgid="2659719297530170820">"导出数据库文件"</string>
     <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"添加新联系人"</string>
     <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"查看更多"</string>
@@ -311,10 +279,6 @@
     <string name="no_empty_email_in_usim">"卡上电子邮件空间已满，部分邮件信息将不会复制 "</string>
     <string name="add_to_white">加入白名单</string>
     <string name="add_to_black">加入黑名单</string>
-    <string name="title_del_call">删除</string>
-    <string name="delete_call_title">删除通话记录</string>
-    <string name="delete_call_message">删除通话记录 ...</string>
-    <string name="delete_call_alert">"确定要删除选中的通话记录吗?"</string>
     <string name="add_blacklist_success">"这个号码已经成功添加到黑名单。"</string>
     <string name="add_whitelist_success">"这个号码已经成功添加到白名单。"</string>
     <string name="remove_blacklist_success">"这个号码已经成功从黑名单移除。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3d242a6e7..e2b0d5314 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -231,21 +231,8 @@
     <string name="keep_local" msgid="1258761699192993322">"儲存在本機中"</string>
     <string name="add_account" msgid="8201790677994503186">"新增帳戶"</string>
     <string name="add_new_account" msgid="5748627740680940264">"新增帳戶"</string>
-    <string name="select_all">"全選"</string>
     <string name="btn_ok">"確定"</string>
     <string name="btn_cancel">"取消"</string>
-    <string name="menu_sendViaSMS">通過簡訊發送聯絡人</string>
-    <string name="deleteConfirmation_title">"要刪除聯絡人嗎？"</string>
-    <string name="importConfirmation_title">"要導入聯絡人嗎？"</string>
-    <string name="contactDeletedToast">"此聯絡人已刪除。"</string>
-    <string name="ContactMultiDeleteConfirmation">"將會刪除這些聯絡人。"</string>
-    <string name="delete_contacts_title">"删除聯絡人"</string>
-    <string name="delete_contacts_message">"正在删除..."</string>
-    <string name="ContactMultiImportConfirmation">"將會導入這些聯絡人。"</string>
-    <string name="import_sim_contacts_title">"導入聯絡人"</string>
-    <string name="import_sim_contacts_message">"正在導入..."</string>
-    <!-- Import from sim card -->
-    <string name="import_finish">導入完成</string>
     <string name="import_stop">導入停止</string>
     <string name="menu_export_database" msgid="2659719297530170820">"匯出資料庫檔案"</string>
     <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"新增聯絡人"</string>
diff --git a/res/values/cm_plurals.xml b/res/values/cm_plurals.xml
new file mode 100644
index 000000000..78b466bce
--- /dev/null
+++ b/res/values/cm_plurals.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="contacts_selected">
+        <item quantity="one">%d selected</item>
+        <item quantity="other">%d selected</item>
+    </plurals>
+
+    <plurals name="ContactMultiImportConfirmation">
+        <item quantity="one">%d contact will be imported.</item>
+        <item quantity="other">%d contacts will be imported.</item>
+    </plurals>
+    <plurals name="import_progress">
+        <item quantity="one">%d contact imported</item>
+        <item quantity="other">%d contacts imported</item>
+    </plurals>
+
+    <plurals name="ContactMultiDeleteConfirmation">
+        <item quantity="one">%d contact will be deleted.</item>
+        <item quantity="other">%d contacts will be deleted.</item>
+    </plurals>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 78cdb23db..96c48a6c5 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -2,10 +2,13 @@
 <!--
      Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
      Copyright (C) 2014-2015 The CyanogenMod Project
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
+
           http://www.apache.org/licenses/LICENSE-2.0
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -13,41 +16,45 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="menu_moveGroupMembers">Move group members</string>
-    <string name="importConfirmation_title">Import contact?</string>
-    <!-- Toast displayed when a contact is deleted [CHAR LIMIT=NONE] -->
-    <string name="contactDeletedToast">Contact deleted.</string>
     <!-- Toast displayed when saving a contact to sim card failed -->
-    <string name="contactSavedToSimCardError">Error, Loading Sim Contacts.</string>
-    <string name="airplane_mode_on">Error, Airplane mode is on.</string>
-    <string name="number_anr_too_long">Error, Number is too long.</string>
-    <string name="email_address_too_long">Error, Email Address is too long.</string>
-    <string name="sim_card_full">Error, Sim Card is full.</string>
-    <string name="tag_too_long">Error, Contact name is too long.</string>
-    <string name="no_phone_number">Please insert phone number.</string>
-    <string name="invalid_phone_number">Error, Number is invalid.</string>
-    <string name="invalid_number_type">Error, Number type is invalid.</string>
+    <string name="contactSavedToSimCardError">Could not save the selected contacts to the SIM card</string>
+    <string name="airplane_mode_on">SIM card can not be accessed while airplane mode is enabled</string>
+    <string name="number_anr_too_long">Number is too long</string>
+    <string name="email_address_too_long">Email address is too long</string>
+    <string name="sim_card_full">SIM card is full</string>
+    <string name="tag_too_long">Contact name is too long</string>
+    <string name="invalid_phone_number">Phone number is invalid</string>
+    <string name="invalid_number_type">Number type is invalid</string>
     <string name="no_phone_number_or_email">Please insert phone number or email address.</string>
-    <string name="memory_card_full">Error, Memory is almost full.</string>
+    <string name="memory_card_full">Contact could not be saved, phone memory is full</string>
+
     <!-- The title of "groups" tab. [CHAR LIMIT=14] -->
     <string name="contacts_groups_label">Groups</string>
+    <string name="menu_moveGroupMembers">Move group members</string>
     <string name="title_move_members">Move members</string>
-    <string name="message_add_members">Add members...</string>
-    <string name="message_move_members">Move members...</string>
-    <string name="cancel_operation">Operation is canceled.</string>
+    <string name="message_move_members">Moving members\u2026</string>
     <string name="message_can_not_move_members">Can not move members</string>
     <string name="edit_before_call">Edit number before call</string>
-    <string name="select_all">All</string>
     <string name="menu_sendViaSMS">Send contact via SMS</string>
+
+    <string name="select_all">All</string>
+
+    <!-- Choose Sim Card to Import -->
+    <string name="import_sim_contacts_title">Import SIM contacts</string>
+    <string name="import_sim_contacts_message">Importing SIM contacts\u2026</string>
+    <!-- Confirmation dialog title after users selects to import a contact. [CHAR LIMIT=25]-->
+    <string name="importConfirmation_title">Import contact?</string>
+    <string name="import_finish">Import finished</string>
+
+    <!-- Multi Delete Contacts related strings -->
+    <string name="delete_contacts_title">Delete contacts</string>
+    <string name="delete_contacts_message">Deleting contacts\u2026</string>
     <!-- Confirmation dialog title after users selects to delete a contact. [CHAR LIMIT=25]-->
     <string name="deleteConfirmation_title">Delete contact?</string>
-    <string name="import_sim_contacts_title">Import sim contacts</string>
-    <string name="import_sim_contacts_message">Importing sim contacts\u2026</string>
     <plurals name="ContactMultiImportConfirmation">
         <item quantity="one">%d contact will be imported.</item>
         <item quantity="other">%d contacts will be imported.</item>
     </plurals>
-    <string name="import_finish">"Import finished"</string>
     <plurals name="import_progress">
         <item quantity="one">%d contact imported</item>
         <item quantity="other">%d contacts imported</item>
@@ -63,16 +70,14 @@
         <item quantity="other">%d contacts will be deleted.</item>
     </plurals>
     <string name="ContactMultiDeleteConfirmation">These contacts will be deleted.</string>
-    <string name="delete_contacts_title">Delete Contacts</string>
-    <string name="delete_contacts_message">Deleting Contacts\u2026</string>
     <string name="delete_termination">"Delete is termination"</string>
+    <!-- Toast displayed when a contact is deleted [CHAR LIMIT=NONE] -->
+    <string name="contactDeletedToast">Contact deleted</string>
+
     <!-- add for MemoryStatusActivity -->
     <string name="menu_memory_status">Memory status</string>
-    <string name="memory_status_title">Memory status</string>
     <string name="memory_size">Total:</string>
-    <string name="memory_available">Available</string>
     <string name="memory_used">Used:</string>
-    <string name="calculating_status_now">Calculating Status now...</string>
     <string name="contact_detail_picture_description">Picture. Select to change</string>
 
     <string name="btn_ok">Ok</string>
@@ -83,15 +88,20 @@
     <string name="ContactMultiImportConfirmation">These contacts will be imported.</string>
     <string name="import_stop">"Import stopped"</string>
 
-    <string name="menu_copyTo">"Copy to "</string>
-    <string name="no_empty_email_in_usim">"Email is full, some record copy failed "</string>
     <string name="add_to_white">Add to whitelist</string>
     <string name="add_to_black">Add to blacklist</string>
+    <string name="calculating_status_now">Calculating status\u2026</string>
+
+    <string name="menu_copyTo">Copy to <xliff:g id="destination">%s</xliff:g></string>
+    <string name="copy_to_target_sim">SIM card</string>
+    <string name="copy_to_target_msim">SIM card <xliff:g id="index">%d</xliff:g></string>
+    <string name="no_empty_email_in_usim">USIM contact does not have an available email field, unable to copy messages.</string>
     <string name="voicemail">Voicemail</string>
+
     <string name="select_call_title">Select call logs</string>
     <string name="delete_call_title">Delete call logs</string>
-    <string name="delete_call_message">Deleting call logs ...</string>
-    <string name="delete_call_alert">Sure to delete the call logs selected?</string>
+    <string name="delete_call_message">Deleting call logs\u2026</string>
+    <string name="delete_call_alert">Delete selected call logs?</string>
     <string name="title_del_call">Delete</string>
     <string name="title_add_members">Add members</string>
     <string name="add_blacklist_success">"This number has been added in blacklist successfully."</string>