summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
diff options
context:
space:
mode:
authorSailesh Nepal <sail@google.com>2016-02-17 02:16:02 -0800
committerSailesh Nepal <sail@google.com>2016-02-20 06:42:11 -0800
commit2b40aef364c04676fee6bff0e0367609cc809276 (patch)
tree7c92f403dbd28a67fce54450f61b77b964030686 /res/values-zh-rCN
parent3d7d24f05968c8dac5ecdd5b35489d12f4b6815c (diff)
downloadandroid_packages_apps_ContactsCommon-2b40aef364c04676fee6bff0e0367609cc809276.tar.gz
android_packages_apps_ContactsCommon-2b40aef364c04676fee6bff0e0367609cc809276.tar.bz2
android_packages_apps_ContactsCommon-2b40aef364c04676fee6bff0e0367609cc809276.zip
ContactsCommon: Fix duplicate strings
This CL fixes duplicate string resource errors I got when migrating ContactsCommon from make to gradle. It looks like the root cause of the error is the use of product="tablet" and product="nosdcard". As far as I can tell this approach for resources only works for bundled apps. Here were the duplicate resources and their resolution: - account_phone - moved to values-sw600dp/strings.xml - fail_reason_too_many_vcard - deleted, used in ExportVCardActivity but that code was also unused - composer_has_no_exportable_contact - moved to values-sw600dp/strings.xml - import_failure_no_vcard_file - deleted, unused - scanning_sdcard_failed_message - deleted, unused Bug: 26676586 Change-Id: I2a95c269215bee381ad95aa2f4fbb28c2d43d8fa
Diffstat (limited to 'res/values-zh-rCN')
-rw-r--r--res/values-zh-rCN/strings.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3dfd4bbe..473a72ac 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -89,7 +89,6 @@
<string name="list_filter_phones" msgid="3692815632088465422">"所有拥有电话号码的联系人"</string>
<string name="list_filter_phones_work" msgid="484839599760375521">"工作资料通讯录"</string>
<string name="view_updates_from_group" msgid="3310864388165884352">"查看最新动态"</string>
- <string name="account_phone" product="tablet" msgid="1143884271396601338">"仅保存在平板电脑中,不同步"</string>
<string name="account_phone" product="default" msgid="6104157990869081962">"仅保存在手机中,不同步"</string>
<string name="nameLabelsGroup" msgid="1817502703362057154">"姓名"</string>
<string name="nicknameLabelsGroup" msgid="6312795212164843246">"昵称"</string>
@@ -178,8 +177,6 @@
<string name="missing_required_permission" msgid="3120850759881656369">"您已停用某项必需权限。"</string>
<string name="fail_reason_error_occurred_during_export" msgid="8426833603664168716">"导出时出错:“<xliff:g id="EXACT_REASON">%s</xliff:g>”。"</string>
<string name="fail_reason_too_long_filename" msgid="3996610741248972232">"指定的文件名过长(“<xliff:g id="FILENAME">%s</xliff:g>”)。"</string>
- <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_low_memory_during_import" msgid="3277485820827338116">"内存不足。该文件可能过大。"</string>
<string name="fail_reason_vcard_parse_error" msgid="514012644716565082">"由于意外原因而无法解析 vCard。"</string>
@@ -197,7 +194,6 @@
<!-- no translation found for exporting_contact_list_message (141905615542638683) -->
<skip />
<string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"无法获取数据库信息。"</string>
- <string name="composer_has_no_exportable_contact" product="tablet" msgid="1534625366506752907">"没有可导出的联系人。如果您平板电脑上确实存有联系人信息,则可能是某些数据源不允许您从平板电脑中导出联系人信息。"</string>
<string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"没有可导出的联系人。如果您手机上确实存有联系人信息,则可能是某些数据源不允许您从手机中导出联系人信息。"</string>
<string name="composer_not_initialized" msgid="6514403866246950877">"vCard 制作程序未正确启动。"</string>
<string name="exporting_contact_failed_title" msgid="6059039606302373945">"无法导出"</string>
@@ -218,13 +214,9 @@
<string name="vcard_unknown_filename" msgid="4832657686149881554">"联系人"</string>
<string name="caching_vcard_message" msgid="6635485116655518520">"正在将 vCard 缓存到本地临时存储空间。实际导入操作即将开始。"</string>
<string name="vcard_import_failed" msgid="4105296876768072508">"无法导入 vCard。"</string>
- <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"未在存储设备中找到 vCard 文件。"</string>
- <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"未在SD卡上找到 vCard 文件。"</string>
<string name="nfc_vcard_file_name" msgid="305679412445157370">"通过NFC收到的联系人"</string>
<string name="confirm_export_title" msgid="3240899428149018226">"要导出联系人吗?"</string>
<string name="caching_vcard_title" msgid="9185299351381102305">"正在缓存"</string>
- <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="8442457519490864500">"无法扫描存储设备(原因:“<xliff:g id="FAIL_REASON">%s</xliff:g>”)。"</string>
- <string name="scanning_sdcard_failed_message" product="default" msgid="1409798274361146091">"无法扫描SD卡(原因:“<xliff:g id="FAIL_REASON">%s</xliff:g>”)。"</string>
<string name="progress_notifier_message" msgid="359931715339778107">"正在导入 - <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>:<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"导出为 .vcf 文件"</string>
<string name="display_options_sort_list_by" msgid="8635268562263708102">"排序方式"</string>