ContactsCommon: Improve CAF strings

Change-Id: Ia8724c749e51028a92544bdf476fbbbfe51e6444

6 files changed, 41 insertions, 89 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6f2dd597..8e86c74a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -162,7 +162,6 @@
     <string name="dialog_new_contact_account" msgid="4107520273478326011">"在以下帐户中创建联系人："</string>
     <string name="import_from_sim" msgid="4749894687871835873">"从SIM卡导入"</string>
     <string name="import_from_sim_number" msgid="1232500923375370101">"从第<xliff:g id="SIM_NUMBER">%d</xliff:g>张SIM卡导入"</string>
-    <string name="export_to_sim">"导出到 SIM 卡"</string>
     <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"从存储设备导入"</string>
     <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"要取消导入“<xliff:g id="FILENAME">%s</xliff:g>”吗？"</string>
     <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"要取消导出“<xliff:g id="FILENAME">%s</xliff:g>”吗？"</string>
@@ -176,7 +175,6 @@
     <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="8720294715223591581">"存储设备中的 vCard 文件过多。"</string>
     <string name="fail_reason_too_many_vcard" product="default" msgid="3793454448838716962">"SD卡上的 vCard 文件过多。"</string>
     <string name="fail_reason_io_error" msgid="7736686553669161933">"I/O 错误"</string>
-    <string name="fail_reason_import_vcard">I/O 错误，无法导入 vCard <xliff:g id="name">%s</xliff:g></string>
     <string name="fail_reason_low_memory_during_import" msgid="3277485820827338116">"内存不足。该文件可能过大。"</string>
     <string name="fail_reason_vcard_parse_error" msgid="514012644716565082">"由于意外原因而无法解析 vCard。"</string>
     <string name="fail_reason_not_supported" msgid="388664373573337601">"不支持此格式。"</string>
@@ -234,7 +232,6 @@
     <string name="dialog_import_export" msgid="1125776851100740858">"导入/导出联系人"</string>
     <string name="dialog_import" msgid="5177004290082451296">"导入联系人"</string>
     <string name="share_error" msgid="665756457151793108">"无法分享此联系人。"</string>
-    <string name="share_failed">"联系人太多，分享失败。"</string>
     <string name="menu_search" msgid="7464453023659824700">"搜索"</string>
     <string name="menu_contacts_filter" msgid="586356478145511794">"要显示的联系人"</string>
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"要显示的联系人"</string>
@@ -252,33 +249,6 @@
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"来源：<xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g>，来源：<xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜索"</string>
-    <string name="exporting">"正在导出"</string>
-    <string name="reading_vcard_files">读取VCARD文件</string>
-    <string name="progressdialog_cancel">取消</string>
-    <string name="export_failed">"导出失败"</string>
-    <string name="sim_card_full">"发生错误，SIM卡已满。"</string>
-    <string name="export_finished">"导出结束"</string>
-    <string name="tag_too_long">"发生错误，联系人姓名过长。"</string>
-    <string name="sim_contacts_not_load">发生错误，SIM卡联系人未完全加载</string>
-    <string name="export_cancelled">导出操作被取消，<xliff:g id="insertCount">%s</xliff:g>条成功导出</string>
-    <string name="export_no_phone_or_email">导出失败, <xliff:g id="name">%s</xliff:g>没有电话号码或者邮箱地址</string>
-    <string name="import_from_sim_select">"选择SIM卡进行导入"</string>
-    <string name="no_sdcard_title" product="nosdcard">"存储设备不存在"</string>
-    <string name="no_sdcard_title" product="default">"无 SD 卡"</string>
-    <string name="deleteConfirmation_title">"要删除联系人吗？"</string>
-    <string name="deleteConfirmation">"将会删除此联系人。"</string>
-    <string name="slot_name">"卡"</string>
-    <string name="copy_done">复制成功！</string>
-    <string name="copy_failure">复制失败！</string>
-    <string name="card_no_space">卡记录已满，部分信息未复制</string>
-    <string name="select_path">请选择路径</string>
     <string name="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string>
     <string name="settings_contact_display_options_title" msgid="1020420603072835628">"联系人显示选项"</string>
-    <!-- Menu item used to initiate ip call -->
-    <string name="ip_call_by_slot">IP拨号通过<xliff:g id="subName">%s</xliff:g></string>
-    <string name="set_ip_number">设置IP号</string>
-    <string name="no_ip_number">没有IP号</string>
-    <string name="no_ip_number_on_sim_card">SIM卡上没有IP号</string>
-    <string name="ipcall_dialog_title">IP电话设置</string>
-    <string name="ipcall_dialog_edit_hint">请输入IP电话前缀</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index be49081d..9866c6fe 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -160,7 +160,6 @@
     <string name="listCustomView" msgid="1915154113477432033">"聯絡人自訂檢視"</string>
     <string name="listSingleContact" msgid="8525131203887307088">"單一聯絡人"</string>
     <string name="dialog_new_contact_account" msgid="4107520273478326011">"在帳戶下建立聯絡人"</string>
-    <string name="export_to_sim">"導出到 SIM 卡"</string>
     <string name="import_from_sim" msgid="4749894687871835873">"從 SIM 卡匯入"</string>
     <string name="import_from_sim_number" msgid="1232500923375370101">"從 SIM 卡 #<xliff:g id="SIM_NUMBER">%d</xliff:g> 匯入"</string>
     <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"從儲存裝置匯入"</string>
@@ -176,7 +175,6 @@
     <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="8720294715223591581">"儲存裝置中的 vCard 檔案過多。"</string>
     <string name="fail_reason_too_many_vcard" product="default" msgid="3793454448838716962">"SD 卡上的 vCard 檔案過多。"</string>
     <string name="fail_reason_io_error" msgid="7736686553669161933">"I/O 錯誤"</string>
-    <string name="fail_reason_import_vcard">I/O 錯誤，無法匯入vCard <xliff:g id="name">%s</xliff:g></string>
     <string name="fail_reason_low_memory_during_import" msgid="3277485820827338116">"記憶體不足，檔案可能過大。"</string>
     <string name="fail_reason_vcard_parse_error" msgid="514012644716565082">"由於意外因素，導致無法剖析 vCard。"</string>
     <string name="fail_reason_not_supported" msgid="388664373573337601">"不支援此格式。"</string>
@@ -253,22 +251,4 @@
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜尋"</string>
     <string name="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string>
     <string name="settings_contact_display_options_title" msgid="1020420603072835628">"聯絡人顯示選項"</string>
-    <string name="settings_contact_display_options_description" msgid="4130259058302284077">"設定聯絡人的顯示和排序方式。"</string>
-    <string name="exporting">"正在導出"</string>
-    <string name="reading_vcard_files">讀取Vcard文件</string>
-    <string name="export_failed">"導出失敗"</string>
-    <string name="sim_card_full">"發生錯誤，SIM卡已滿。"</string>
-    <string name="export_finished">"導出結束"</string>
-    <string name="export_no_phone_or_email">導出失敗, <xliff:g id="name">%s</xliff:g>沒有電話號碼或者郵箱地址</string>
-    <string name="tag_too_long">"發生錯誤，聯絡人姓名過長。"</string>
-    <string name="import_from_sim_select">"選擇SIM卡進行導入"</string>
-    <string name="no_sdcard_title" product="nosdcard">"無存儲設備"</string>
-    <string name="no_sdcard_title" product="default">"無 SD 卡"</string>
-    <string name="deleteConfirmation_title">"要刪除聯絡人嗎？"</string>
-    <string name="ContactMultiDeleteConfirmation">"將會刪除這些聯絡人。"</string>
-    <string name="slot_name">"卡"</string>
-
-    <string name="copy_done">複制成功！</string>
-    <string name="copy_failure">複制失敗！</string>
-    <string name="card_no_space">卡記錄已滿，部分信息未複制</string>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index c46412ba..52958407 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) 2014 The CyanogenMod Project
+     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.
@@ -20,41 +20,40 @@
     <string name="local_storage_account" product="default">Local phone account</string>
 
     <!-- CMCC -->
-    <string name="import_contacts_sim">Import contacts from SIM?</string>
-    <string name="import_contacts_sim_confirm">Import</string>
-    <string name="import_contacts_sim_cancel">Cancel</string>
+    <string name="import_contacts_sim">Import contacts from SIM card?</string>
 
     <!-- CAF -->
     <!-- Action string for managing SIM contacts -->
-    <string name="manage_sim_contacts"> Manage SIM card contacts</string>
+    <string name="manage_sim_contacts">Manage SIM card contacts</string>
+
     <!-- Action that exports all contacts to SIM -->
     <string name="export_to_sim">Export to SIM card</string>
-    <!--The failed reason shown when importting some a vCard file -->
-    <string name="fail_reason_import_vcard">I/O error,couldn\'t import vCard <xliff:g id="name">%s</xliff:g></string>
+
+    <!--The failed reason shown when importing a vCard file -->
+    <string name="fail_reason_import_vcard">\'<xliff:g id="name">%s</xliff:g>\' could not be imported due to an I/O error</string>
+
     <!-- Toast indicating that sharing too many contact has failed. [CHAR LIMIT=NONE]  -->
-    <string name="share_failed">Too many contacts, share failed</string>
+    <string name="contact_share_failed_toast">No more than <xliff:g id="count">%d</xliff:g> contacts can be shared</string>
  
     <string name="label_groups">Group</string>
-    <string name="exporting">Exporting</string>
+    <string name="exporting">Exporting\u2026</string>
+
     <!-- Message while reading multiple vCard files "(current number) of (total number) files"
           The order of "current number" and "total number" cannot be changed -->
     <string name="reading_vcard_files"><xliff:g id="current_number">%1$s</xliff:g> of <xliff:g id="total_number">%2$s</xliff:g> files</string>
-    <string name="progressdialog_cancel">Cancel</string>
 
     <string name="export_failed">Export failed</string>
-
-    <string name="sim_card_full">Error, Sim Card is full.</string>
-
+    <string name="sim_card_full">SIM card is full</string>
     <string name="export_finished">Export finished</string>
+    <string name="tag_too_long">Contact name is too long</string>
+    <string name="sim_contacts_not_loaded">Unable to load SIM contacts</string>
 
-    <string name="tag_too_long">Error, Contact name is too long.</string>
-
-    <string name="sim_contacts_not_load">Error, SIM contacts have not been loaded completely.</string>
+    <plurals name="export_cancelled">
+        <item quantity="one">Export was cancelled, %d item was exported</item>
+        <item quantity="other">Export was cancelled, %d items were exported</item>
+    </plurals>
 
-    <string name="export_cancelled">Export is canceled, <xliff:g id="insertCount">%s</xliff:g>items are exported</string>
-
-    <string name="export_no_phone_or_email">Export failed, <xliff:g id="name">%s</xliff:g>has not phone number or
-         email address</string>
+    <string name="export_no_phone_or_email"><xliff:g id="name">%s</xliff:g> does not have a phone number or email address</string>
 
     <string name="import_from_sim_select">Choose card to import</string>
 
@@ -62,28 +61,31 @@
     <string name="no_sdcard_title" product="nosdcard">Storage unavailable</string>
     <!-- Dialog title shown when SD Card does not exist -->
     <string name="no_sdcard_title" product="default">No SD card</string>
-        <!-- Confirmation dialog title after users selects to delete a contact. [CHAR LIMIT=25]-->
+
+    <!-- Confirmation dialog title after users selects to delete a contact. [CHAR LIMIT=25]-->
     <string name="deleteConfirmation_title">Delete contact?</string>
+
     <!-- Confirmation dialog contents after users selects to delete a Writable contact. -->
     <string name="deleteConfirmation">This contact will be deleted.</string>
-        <!-- The slot common name -->
-    <string name="slot_name">SIM</string>
-    <string name="copy_done">Copy done！</string>
-    <string name="copy_failure">Copy Failed！</string>
-    <string name="card_no_space">Card has no space ,some record copy failed</string>
+
+    <string name="copy_done">Contact was copied successfully</string>
+    <string name="copy_failure">Copying the contact failed</string>
+    <string name="card_no_space">Copying the contact failed, SIM card is full</string>
  
     <!-- Detailed description of the preference section that allows users to configure how they
          want their contacts to be displayed. [CHAR LIMIT=128] -->
     <string name="settings_contact_display_options_description">Configure how your contacts are displayed and sorted.</string>
+
     <!-- Menu item used to initiate ip call -->
-    <string name="ip_call_by_slot">IP Call by <xliff:g id="subName">%s</xliff:g></string>
-    <string name="set_ip_number">Set IP Number</string>
+    <string name="ip_call_by_slot">IP call via <xliff:g id="subName">%s</xliff:g></string>
     <string name="no_ip_number">No IP number</string>
     <string name="no_ip_number_on_sim_card">No IP number on SIM card</string>
-    <string name="ipcall_dialog_title">IP call setting</string>
+    <string name="set_ip_number">Set IP number</string>
+    <string name="ipcall_dialog_title">IP call settings</string>
     <string name="ipcall_dialog_edit_hint">Please input the IP prefix</string>
-    <string name="Import_All">Import Contacts From All SIMs</string>
-    <string name="select_path">Select Path</string>
+
+    <string name="import_contacts_from_all_cards">Import contacts from all SIM cards</string>
+    <string name="select_path">Select path</string>
     <string name="select_sim">Select SIM</string>
 
 </resources>
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 4a4f362a..e0504dec 100755..100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -650,9 +650,9 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
 
                      // add toast handler when export is canceled
                     case TOAST_EXPORT_CANCELED:
-                        int exportCount = msg.arg1;
-                        Toast.makeText(mPeople,mPeople.getString(R.string.export_cancelled,
-                            String.valueOf(exportCount)), Toast.LENGTH_SHORT).show();
+                        String text = mPeople.getResources().getQuantityString(
+                                R.plurals.export_cancelled, msg.arg1, msg.arg1);
+                        Toast.makeText(mPeople, text, Toast.LENGTH_SHORT).show();
                         break;
 
                     // add toast handler when no phone or email
@@ -663,7 +663,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                                 Toast.LENGTH_SHORT).show();
                         break;
                     case TOAST_SIM_CARD_NOT_LOAD_COMPLETE:
-                        Toast.makeText(mPeople, R.string.sim_contacts_not_load,
+                        Toast.makeText(mPeople, R.string.sim_contacts_not_loaded,
                                 Toast.LENGTH_SHORT).show();
                         break;
                 }
@@ -691,7 +691,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
 
             // add a cancel button to let user cancel explicitly.
             mExportProgressDlg.setButton(DialogInterface.BUTTON_NEGATIVE,
-                mPeople.getString(R.string.progressdialog_cancel),
+                mPeople.getString(android.R.string.cancel),
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java b/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java
index 5cf1d08a..a54f791a 100755..100644
--- a/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportSIMContactsDialogFragment.java
@@ -18,13 +18,13 @@ public class ImportSIMContactsDialogFragment extends DialogFragment {
         // Use the Builder class for convenient dialog construction
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(R.string.import_contacts_sim)
-                .setPositiveButton(R.string.import_contacts_sim_confirm,
+                .setPositiveButton(android.R.string.ok,
                         new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         ImportExportDialogFragment.show(getFragmentManager(),
                                 false, ImportSIMContactsDialogFragment.class);
                     }})
-                .setNegativeButton(R.string.import_contacts_sim_cancel,
+                .setNegativeButton(android.R.string.cancel,
                         new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         // Nothing to do
diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/common/util/AccountSelectionUtil.java
index 299c3e27..dcccb1c7 100755..100644
--- a/src/com/android/contacts/common/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/common/util/AccountSelectionUtil.java
@@ -288,7 +288,7 @@ public class AccountSelectionUtil {
         for (i = 1; i <= numPhones; i++) {
             subList[i-1] = "SIM" + i;
         }
-        subList[i-1] = context.getString(R.string.Import_All);
+        subList[i-1] = context.getString(R.string.import_contacts_from_all_cards);
         builder.setSingleChoiceItems(subList, -1, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {