ContactsCommon: move CAF strings to cm_strings

Change-Id: I0670b6e3dab7d734f996331f51b7b112fa54c3a3

2 files changed, 81 insertions, 87 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 75b9f0ab..08c111f7 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.
@@ -18,4 +18,84 @@
     <!-- Virtual local storage account name -->
     <string name="local_storage_account" product="tablet">Local tablet account</string>
     <string name="local_storage_account" product="default">Local phone account</string>
+
+    <!-- CAF -->
+    <!-- Action string for managing SIM contacts -->
+    <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>
+    <!-- Action string for selecting (USB) storage for importing contacts [CHAR LIMIT=30] -->
+    <string name="import_from_sdcard" product="default">Import from storage</string>
+    <!-- Action string for selecting a SIM subscription for exporting contacts -->
+    <string name="export_to_sim_summary">Export to SIM <xliff:g id="sim_name">^1</xliff:g> - <xliff:g id="sim_number">^2</xliff:g></string>
+    <!-- Action string for selecting a SIM subscription for exporting contacts, without a phone number -->
+    <string name="export_to_sim_summary_no_number">Export to SIM <xliff:g id="sim_name">%1$s</xliff:g></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>
+    <!-- Action that exports all contacts to (USB) storage [CHAR LIMIT=25] -->
+    <string name="export_to_sdcard" product="default">Export to storage</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="label_groups">Group</string>
+    <string name="exporting">Exporting</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_to_sim_failed">Export failed, <xliff:g id="insertCount">%d</xliff:g> items are exported</string>
+
+    <string name="export_sim_card_full">Sim Card is full, <xliff:g id="insertCount">%d</xliff:g> items are exported</string>
+
+    <string name="export_failed">Export failed</string>
+
+    <string name="sim_card_full">Error, Sim Card is full.</string>
+
+    <string name="export_finished">Export finished</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>
+
+    <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="import_from_sim_select">Choose card to import</string>
+
+    <!-- Dialog title shown when (USB) storage does not exist [CHAR LIMIT=25] -->
+    <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]-->
+    <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>
+
+    <!-- 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="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="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="sd_card">SD card</string>
+    <string name="phone_storage">Phone storage</string>
+    <string name="select_sim">Select SIM</string>
+
+    <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>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04e515d8..fab8e973 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -419,30 +419,15 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
 
     <string name="dialog_new_contact_account">Create contact under account</string>
 
-    <!-- Action string for managing SIM contacts -->
-    <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>
-
     <!-- Action string for selecting SIM for importing contacts -->
     <string name="import_from_sim">Import from SIM card</string>
 
-    <!-- Action string for selecting (USB) storage for importing contacts [CHAR LIMIT=30] -->
-    <string name="import_from_sdcard" product="default">Import from storage</string>
-
     <!-- Action string for selecting a SIM subscription for importing contacts -->
     <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">^1</xliff:g> - <xliff:g id="sim_number">^2</xliff:g></string>
 
     <!-- Action string for selecting a SIM subscription for importing contacts, without a phone number -->
     <string name="import_from_sim_summary_no_number">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
 
-    <!-- Action string for selecting a SIM subscription for exporting contacts -->
-    <string name="export_to_sim_summary">Export to SIM <xliff:g id="sim_name">^1</xliff:g> - <xliff:g id="sim_number">^2</xliff:g></string>
-
-    <!-- Action string for selecting a SIM subscription for exporting contacts, without a phone number -->
-    <string name="export_to_sim_summary_no_number">Export to SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
-
     <!-- Action string for selecting a .vcf file to import contacts from [CHAR LIMIT=30] -->
     <string name="import_from_vcf_file" product="default">Import from .vcf file</string>
 
@@ -499,9 +484,6 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
          emitted some I/O error. Exact reason will be appended by the system. [CHAR LIMIT=NONE] -->
     <string name="fail_reason_io_error">I/O error</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>
-
     <!-- Failure reason show when Contacts app (especially vCard importer) encountered
          low memory problem and could not proceed its import procedure. [CHAR LIMIT=NONE] -->
     <string name="fail_reason_low_memory_during_import">Not enough memory. The file may be too large.</string>
@@ -654,9 +636,6 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <!-- Action that exports all contacts to a user selected destination. [CHAR LIMIT=25] -->
     <string name="export_to_vcf_file" product="default">Export to .vcf file</string>
 
-        <!-- Action that exports all contacts to (USB) storage [CHAR LIMIT=25] -->
-    <string name="export_to_sdcard" product="default">Export to storage</string>
-
     <!-- Contact preferences related strings -->
 
     <!-- Label of the "sort by" display option -->
@@ -692,8 +671,6 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <!-- Toast indicating that sharing a contact has failed. [CHAR LIMIT=NONE]  -->
     <string name="share_error">This contact can\'t be shared.</string>
 
-    <!-- Toast indicating that sharing too many contact has failed. [CHAR LIMIT=NONE]  -->
-    <string name="share_failed">Too many contacts, share failed</string>
     <!-- Menu item to search contacts -->
     <string name="menu_search">Search</string>
 
@@ -751,52 +728,6 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <!-- Attribution of a contact status update, when the time of update is known -->
     <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
 
-    <string name="label_groups">Group</string>
-
-    <string name="exporting">Exporting</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_to_sim_failed">Export failed, <xliff:g id="insertCount">%d</xliff:g> items are exported</string>
-
-    <string name="export_sim_card_full">Sim Card is full, <xliff:g id="insertCount">%d</xliff:g> items are exported</string>
-
-    <string name="export_failed">Export failed</string>
-
-    <string name="sim_card_full">Error, Sim Card is full.</string>
-
-    <string name="export_finished">Export finished</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>
-
-    <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="import_from_sim_select">Choose card to import</string>
-
-    <!-- Dialog title shown when (USB) storage does not exist [CHAR LIMIT=25] -->
-    <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]-->
-    <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>
     <!-- Font family used when drawing letters for letter tile avatars.
          Do not translate. -->
     <string name="letter_tile_letter_font_family">sans-serif-medium</string>
@@ -824,23 +755,6 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
 
     <!-- Title for dialog to select Phone Account for outgoing call.  [CHAR LIMIT=40] -->
     <string name="select_phone_account_for_calls">Call with</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="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="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="sd_card">SD card</string>
-    <string name="phone_storage">Phone storage</string>
-    <string name="select_sim">Select SIM</string>
-
-    <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 used for actions in the dialer call log and the quick contact card to initiate
          a call to an individual.  The user is prompted to enter a note which is sent along with