diff options
author | Sailesh Nepal <sail@google.com> | 2016-02-17 02:16:02 -0800 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2016-02-20 06:42:11 -0800 |
commit | 2b40aef364c04676fee6bff0e0367609cc809276 (patch) | |
tree | 7c92f403dbd28a67fce54450f61b77b964030686 /res/values-ms-rMY | |
parent | 3d7d24f05968c8dac5ecdd5b35489d12f4b6815c (diff) | |
download | android_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-ms-rMY')
-rw-r--r-- | res/values-ms-rMY/strings.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 90844b85..2c274b77 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -89,7 +89,6 @@ <string name="list_filter_phones" msgid="3692815632088465422">"Semua kenalan dengan nombor telefon"</string> <string name="list_filter_phones_work" msgid="484839599760375521">"Kenalan Profil Kerja"</string> <string name="view_updates_from_group" msgid="3310864388165884352">"Lihat kemas kini"</string> - <string name="account_phone" product="tablet" msgid="1143884271396601338">"Tablet sahaja, tidak disegerakkan"</string> <string name="account_phone" product="default" msgid="6104157990869081962">"Telefon sahaja, tidak disegerakkan"</string> <string name="nameLabelsGroup" msgid="1817502703362057154">"Nama"</string> <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nama panggilan"</string> @@ -178,8 +177,6 @@ <string name="missing_required_permission" msgid="3120850759881656369">"Anda telah melumpuhkan kebenaran yang diperlukan."</string> <string name="fail_reason_error_occurred_during_export" msgid="8426833603664168716">"Ralat berlaku semasa eksport: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string> <string name="fail_reason_too_long_filename" msgid="3996610741248972232">"Nama fail yang diperlukan terlalu panjang (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string> - <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="8720294715223591581">"Terlalu banyak fail vCard dalam simpanan."</string> - <string name="fail_reason_too_many_vcard" product="default" msgid="3793454448838716962">"Terlalu banyak fail vCard pada kad SD."</string> <string name="fail_reason_io_error" msgid="7736686553669161933">"Ralat I/O"</string> <string name="fail_reason_low_memory_during_import" msgid="3277485820827338116">"Tidak cukup memori. Fail itu mungkin terlalu besar."</string> <string name="fail_reason_vcard_parse_error" msgid="514012644716565082">"Tidak dapat menghurai vCard atas sebab-sebab yang tidak dijangka."</string> @@ -199,7 +196,6 @@ <!-- no translation found for exporting_contact_list_message (141905615542638683) --> <skip /> <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Tidak boleh mendapatkan maklumat pangkalan data."</string> - <string name="composer_has_no_exportable_contact" product="tablet" msgid="1534625366506752907">"Tiada kenalan dieksport. Jika anda mempunyai kenalan pada tablet anda, sesetengah pembekal data mungkin tidak membenarkan kenalan dieksport daripada tablet."</string> <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Tiada kenalan boleh dieksport. Jika anda mempunyai kenalan pada telefon anda, sesetengah pembekal data tidak boleh membenarkan kenalan dieksport dari telefon."</string> <string name="composer_not_initialized" msgid="6514403866246950877">"Komposer vCard tidak bermula dengan betul."</string> <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Tidak dapat mengeksport"</string> @@ -220,13 +216,9 @@ <string name="vcard_unknown_filename" msgid="4832657686149881554">"kenalan"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Membuat cache vCard ke storan sementara setempat. Pengimportan sebenar akan bermula tidak lama lagi."</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Tidak dapat mengimport vCard."</string> - <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Tiada fail vCard ditemui dalam storan"</string> - <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Tiada fail vCard ditemui pada kad SD."</string> <string name="nfc_vcard_file_name" msgid="305679412445157370">"Diterima dr NFC"</string> <string name="confirm_export_title" msgid="3240899428149018226">"Eksport kenalan?"</string> <string name="caching_vcard_title" msgid="9185299351381102305">"Mengcache"</string> - <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="8442457519490864500">"Storan tidak dapat diimbas. (Alasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string> - <string name="scanning_sdcard_failed_message" product="default" msgid="1409798274361146091">"Kad SD tidak dapat diimbas. (Alasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string> <string name="progress_notifier_message" msgid="359931715339778107">"Mengimport <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">"Eksport ke fail .vcf"</string> <string name="display_options_sort_list_by" msgid="8635268562263708102">"Isih mengikut"</string> |