/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to res/values/strings.xml

  • Committer: edam
  • Date: 2011-05-30 15:33:01 UTC
  • Revision ID: edam@waxworlds.org-20110530153301-oor6ci9b3hf9clul
- refactored some code to do with how contacts are imported
- Vcards (and ContactData) instances now generate a CacheIdentifier when they are finalised so that ContactData instances that do not have enough information to identify them can be discovered then
- importContact() now calls the private method checkForDuplicate(), renamed from isImportRequired(), and return if it is not
- importContact() and checkForDuplicate() now use the ContactData's generated CacheIdentifier

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/values/strings.xml
93
93
        <string name="error_filenotfound">"Can't open file: "</string>
94
94
        <string name="error_fileisempty">"File is empty: "</string>
95
95
        <string name="error_ioerror">"Can\'t read file: "</string>
 
96
        <string name="error_unabletoaddcontact">Unable to add contact to device!</string>
96
97
        <string name="error_vcf_parse">"Error parsing vCard in: "</string>
97
98
        <string name="error_vcf_malformed">vCard is malformed</string>
98
 
        <string name="error_vcf_noname">vCard has no entries that can be used as a contact name!</string>
 
99
        <string name="error_vcf_notenoughinfo">"vCard doesn't contain enough information to be used as a contact!"</string>
99
100
        <string name="error_vcf_version">vCard uses an invalid version</string>
100
101
        <string name="error_vcf_charset">vCard uses unsupported charset</string>
101
102
        <string name="error_vcf_encoding">vCard uses unsupported encoding</string>