/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-03-19 20:33:09 UTC
  • Revision ID: edam@waxworlds.org-20110319203309-5dzfyqrxwk94jtin
- formatting: removed some double-indents on overrunning lines
- updated TODO and NEWS
- rewrote central logic of parser so it makes more sense, looks nicer and has a small optimisation (getting name and params from line only when necessary)
- optimised unnecessary mutliple converting of lines to US-ASCII
- re-wrote line extraction from vcards so that we can lookahead for v3 folded lines
- added support for v3 folded lines

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>
97
 
        <string name="error_vcf_parse">"Error parsing vCard in "</string>
98
 
        <string name="error_vcf_parse_line">", line "</string>
 
96
        <string name="error_vcf_parse">"Error parsing vCard in: "</string>
99
97
        <string name="error_vcf_malformed">vCard is malformed</string>
100
 
        <string name="error_vcf_notenoughinfo">"vCard doesn't contain enough information to be used as a contact!"</string>
 
98
        <string name="error_vcf_noname">vCard has no entries that can be used as a contact name!</string>
101
99
        <string name="error_vcf_version">vCard uses an invalid version</string>
102
100
        <string name="error_vcf_charset">vCard uses unsupported charset</string>
103
101
        <string name="error_vcf_encoding">vCard uses unsupported encoding</string>