Merge remote-tracking branch 'remotes/quic/ui_dev_2.0' into HEAD

Change-Id: Ibc079218a348574499304da141f64282b756ed17

47 files changed, 174 insertions, 1 deletions

diff --git a/res/drawable-hdpi/ic_contact_picture_sim.png b/res/drawable-hdpi/ic_contact_picture_sim.png
new file mode 100755
index 00000000..7b6cc26f
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture_sim.png
diff --git a/res/drawable-hdpi/ic_contact_picture_sim_1.png b/res/drawable-hdpi/ic_contact_picture_sim_1.png
new file mode 100755
index 00000000..ec2ebcb5
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture_sim_1.png
diff --git a/res/drawable-hdpi/ic_contact_picture_sim_2.png b/res/drawable-hdpi/ic_contact_picture_sim_2.png
new file mode 100755
index 00000000..3b68c682
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture_sim_2.png
diff --git a/res/drawable-hdpi/ic_contact_picture_sim_business.png b/res/drawable-hdpi/ic_contact_picture_sim_business.png
new file mode 100755
index 00000000..4df1ecd5
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture_sim_business.png
diff --git a/res/drawable-hdpi/ic_contact_picture_sim_personal.png b/res/drawable-hdpi/ic_contact_picture_sim_personal.png
new file mode 100755
index 00000000..44f4b930
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture_sim_personal.png
diff --git a/res/drawable-hdpi/ic_contact_picture_sim_primary.png b/res/drawable-hdpi/ic_contact_picture_sim_primary.png
new file mode 100755
index 00000000..a5bf9214
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture_sim_primary.png
diff --git a/res/drawable-hdpi/ic_menu_settings_holo_light.png b/res/drawable-hdpi/ic_menu_settings_holo_light.png
index b7bb5c41..ca012b85 100644..100755
--- a/res/drawable-hdpi/ic_menu_settings_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-hdpi/phone_account.png b/res/drawable-hdpi/phone_account.png
new file mode 100755
index 00000000..f2324885
--- /dev/null
+++ b/res/drawable-hdpi/phone_account.png
diff --git a/res/drawable-hdpi/sim1_account.png b/res/drawable-hdpi/sim1_account.png
new file mode 100755
index 00000000..2d9a51c0
--- /dev/null
+++ b/res/drawable-hdpi/sim1_account.png
diff --git a/res/drawable-hdpi/sim2_account.png b/res/drawable-hdpi/sim2_account.png
new file mode 100755
index 00000000..c512d524
--- /dev/null
+++ b/res/drawable-hdpi/sim2_account.png
diff --git a/res/drawable-hdpi/simcard_account.png b/res/drawable-hdpi/simcard_account.png
new file mode 100755
index 00000000..0ee3dac2
--- /dev/null
+++ b/res/drawable-hdpi/simcard_account.png
diff --git a/res/drawable-mdpi/ic_contact_picture_sim.png b/res/drawable-mdpi/ic_contact_picture_sim.png
new file mode 100755
index 00000000..dd63d11d
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_picture_sim.png
diff --git a/res/drawable-mdpi/ic_contact_picture_sim_1.png b/res/drawable-mdpi/ic_contact_picture_sim_1.png
new file mode 100755
index 00000000..4793a07e
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_picture_sim_1.png
diff --git a/res/drawable-mdpi/ic_contact_picture_sim_2.png b/res/drawable-mdpi/ic_contact_picture_sim_2.png
new file mode 100755
index 00000000..665a6714
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_picture_sim_2.png
diff --git a/res/drawable-mdpi/ic_contact_picture_sim_business.png b/res/drawable-mdpi/ic_contact_picture_sim_business.png
new file mode 100755
index 00000000..c266e266
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_picture_sim_business.png
diff --git a/res/drawable-mdpi/ic_contact_picture_sim_personal.png b/res/drawable-mdpi/ic_contact_picture_sim_personal.png
new file mode 100755
index 00000000..f1e75966
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_picture_sim_personal.png
diff --git a/res/drawable-mdpi/ic_contact_picture_sim_primary.png b/res/drawable-mdpi/ic_contact_picture_sim_primary.png
new file mode 100755
index 00000000..493067a9
--- /dev/null
+++ b/res/drawable-mdpi/ic_contact_picture_sim_primary.png
diff --git a/res/drawable-mdpi/ic_menu_settings_holo_light.png b/res/drawable-mdpi/ic_menu_settings_holo_light.png
index 1ebc112e..45a5ff0f 100644..100755
--- a/res/drawable-mdpi/ic_menu_settings_holo_light.png
+++ b/res/drawable-mdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-mdpi/phone_account.png b/res/drawable-mdpi/phone_account.png
new file mode 100755
index 00000000..1fa24f6c
--- /dev/null
+++ b/res/drawable-mdpi/phone_account.png
diff --git a/res/drawable-mdpi/sim1_account.png b/res/drawable-mdpi/sim1_account.png
new file mode 100755
index 00000000..cd80def2
--- /dev/null
+++ b/res/drawable-mdpi/sim1_account.png
diff --git a/res/drawable-mdpi/sim2_account.png b/res/drawable-mdpi/sim2_account.png
new file mode 100755
index 00000000..fd52224a
--- /dev/null
+++ b/res/drawable-mdpi/sim2_account.png
diff --git a/res/drawable-mdpi/simcard_account.png b/res/drawable-mdpi/simcard_account.png
new file mode 100755
index 00000000..e5a76881
--- /dev/null
+++ b/res/drawable-mdpi/simcard_account.png
diff --git a/res/drawable-xhdpi/ic_contact_picture_sim.png b/res/drawable-xhdpi/ic_contact_picture_sim.png
new file mode 100755
index 00000000..a39b7df0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_picture_sim.png
diff --git a/res/drawable-xhdpi/ic_contact_picture_sim_1.png b/res/drawable-xhdpi/ic_contact_picture_sim_1.png
new file mode 100755
index 00000000..300c0288
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_picture_sim_1.png
diff --git a/res/drawable-xhdpi/ic_contact_picture_sim_2.png b/res/drawable-xhdpi/ic_contact_picture_sim_2.png
new file mode 100755
index 00000000..c7ce4223
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_picture_sim_2.png
diff --git a/res/drawable-xhdpi/ic_contact_picture_sim_business.png b/res/drawable-xhdpi/ic_contact_picture_sim_business.png
new file mode 100755
index 00000000..abf631f9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_picture_sim_business.png
diff --git a/res/drawable-xhdpi/ic_contact_picture_sim_personal.png b/res/drawable-xhdpi/ic_contact_picture_sim_personal.png
new file mode 100755
index 00000000..e5f0cf0a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_picture_sim_personal.png
diff --git a/res/drawable-xhdpi/ic_contact_picture_sim_primary.png b/res/drawable-xhdpi/ic_contact_picture_sim_primary.png
new file mode 100755
index 00000000..543d6a7a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_contact_picture_sim_primary.png
diff --git a/res/drawable-xhdpi/ic_menu_settings_holo_light.png b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
index 68ba92bd..91d0444d 100644..100755
--- a/res/drawable-xhdpi/ic_menu_settings_holo_light.png
+++ b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-xhdpi/phone_account.png b/res/drawable-xhdpi/phone_account.png
new file mode 100755
index 00000000..a61f2034
--- /dev/null
+++ b/res/drawable-xhdpi/phone_account.png
diff --git a/res/drawable-xhdpi/sim1_account.png b/res/drawable-xhdpi/sim1_account.png
new file mode 100755
index 00000000..c0ae46f2
--- /dev/null
+++ b/res/drawable-xhdpi/sim1_account.png
diff --git a/res/drawable-xhdpi/sim2_account.png b/res/drawable-xhdpi/sim2_account.png
new file mode 100755
index 00000000..68fb25ce
--- /dev/null
+++ b/res/drawable-xhdpi/sim2_account.png
diff --git a/res/drawable-xhdpi/simcard_account.png b/res/drawable-xhdpi/simcard_account.png
new file mode 100755
index 00000000..92b382ee
--- /dev/null
+++ b/res/drawable-xhdpi/simcard_account.png
diff --git a/res/drawable-xxhdpi/ic_menu_settings_holo_light.png b/res/drawable-xxhdpi/ic_menu_settings_holo_light.png
index 5b672a3d..c87e0463 100644..100755
--- a/res/drawable-xxhdpi/ic_menu_settings_holo_light.png
+++ b/res/drawable-xxhdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-xxhdpi/phone_account.png b/res/drawable-xxhdpi/phone_account.png
new file mode 100755
index 00000000..04b06fda
--- /dev/null
+++ b/res/drawable-xxhdpi/phone_account.png
diff --git a/res/drawable-xxhdpi/sim1_account.png b/res/drawable-xxhdpi/sim1_account.png
new file mode 100755
index 00000000..9293bdbe
--- /dev/null
+++ b/res/drawable-xxhdpi/sim1_account.png
diff --git a/res/drawable-xxhdpi/sim2_account.png b/res/drawable-xxhdpi/sim2_account.png
new file mode 100755
index 00000000..4788f1cd
--- /dev/null
+++ b/res/drawable-xxhdpi/sim2_account.png
diff --git a/res/drawable-xxhdpi/simcard_account.png b/res/drawable-xxhdpi/simcard_account.png
new file mode 100755
index 00000000..e98fd1d9
--- /dev/null
+++ b/res/drawable-xxhdpi/simcard_account.png
diff --git a/res/drawable-xxxhdpi/ic_menu_settings_holo_light.png b/res/drawable-xxxhdpi/ic_menu_settings_holo_light.png
new file mode 100755
index 00000000..dfdd5798
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-xxxhdpi/phone_account.png b/res/drawable-xxxhdpi/phone_account.png
new file mode 100755
index 00000000..3d726f60
--- /dev/null
+++ b/res/drawable-xxxhdpi/phone_account.png
diff --git a/res/drawable-xxxhdpi/sim1_account.png b/res/drawable-xxxhdpi/sim1_account.png
new file mode 100755
index 00000000..389569ac
--- /dev/null
+++ b/res/drawable-xxxhdpi/sim1_account.png
diff --git a/res/drawable-xxxhdpi/sim2_account.png b/res/drawable-xxxhdpi/sim2_account.png
new file mode 100755
index 00000000..ce5d8ddb
--- /dev/null
+++ b/res/drawable-xxxhdpi/sim2_account.png
diff --git a/res/drawable-xxxhdpi/simcard_account.png b/res/drawable-xxxhdpi/simcard_account.png
new file mode 100755
index 00000000..5f18f34b
--- /dev/null
+++ b/res/drawable-xxxhdpi/simcard_account.png
diff --git a/res/layout/ip_prefix_dialog.xml b/res/layout/ip_prefix_dialog.xml
new file mode 100644
index 00000000..8a59b279
--- /dev/null
+++ b/res/layout/ip_prefix_dialog.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2015, 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/ip_prefix_dialog_edit"
+        android:layout_width="match_parent"
+        android:layout_height="45dip"
+        android:layout_margin="10dip"
+        android:inputType="phone"
+        android:hint="@string/ipcall_dialog_edit_hint"/>
+
+</LinearLayout>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index edd3f3ef..bc9d5383 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
   ~ Copyright (C) 2012 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -161,9 +161,11 @@
     <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_summary" msgid="2306434118233541675">"从 SIM 卡“<xliff:g id="SIM_NAME">^1</xliff:g>” - <xliff:g id="SIM_NUMBER">^2</xliff:g> 导入"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"从 SIM 卡“<xliff:g id="SIM_NAME">%1$s</xliff:g>”导入"</string>
+    <string name="export_to_sim">"导出到 SIM 卡"</string>
     <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"从 .vcf 文件导入"</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>
@@ -178,6 +180,7 @@
     <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>
@@ -228,6 +231,7 @@
     <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>
@@ -245,9 +249,38 @@
     <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_to_sim_failed">"导出失败，<xliff:g id="insertCount">%d</xliff:g>条成功导出"</string>
+    <string name="export_sim_card_full">"SIM卡已满，<xliff:g id="insertCount">%d</xliff:g>条成功导出"</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="sd_card">SD 卡</string>
+    <string name="phone_storage">手机内存</string>
     <string name="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string>
     <string name="settings_contact_display_options_title" msgid="1020420603072835628">"联系人显示选项"</string>
     <string name="select_account_dialog_title" msgid="5509088895267310568">"帐户"</string>
     <string name="set_default_account" msgid="3865970860434642695">"一律使用这张卡进行通话"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"用于外拨电话的帐户"</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 3dc3cfd1..3e5ef1ab 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -161,6 +161,7 @@
     <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_summary" msgid="2306434118233541675">"從 SIM 卡 <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> 匯入"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"從 SIM 卡 <xliff:g id="SIM_NAME">%1$s</xliff:g> 匯入"</string>
@@ -178,6 +179,7 @@
     <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>
@@ -247,6 +249,24 @@
     <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_to_sim_failed">"導出失敗，<xliff:g id="insertCount">%d</xliff:g>條成功導出"</string>
+    <string name="export_sim_card_full">"SIM卡已滿，<xliff:g id="insertCount">%d</xliff:g>條成功導出"</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>
     <string name="select_account_dialog_title" msgid="5509088895267310568">"帳戶"</string>
     <string name="set_default_account" msgid="3865970860434642695">"一律使用這張 SIM 卡通話"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"選擇通話帳戶"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2c093e7a..dd5cefbf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -425,6 +425,12 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <!-- 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>
 
@@ -493,6 +499,9 @@ 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>
@@ -645,6 +654,9 @@ 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 -->
@@ -680,6 +692,8 @@ 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>
 
@@ -737,6 +751,52 @@ 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-light</string>
@@ -764,4 +824,21 @@ 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>
 </resources>