/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
3
3
<!--
4
4
 * strings.xml
5
5
 *
6
 
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
 
6
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
7
7
 *
8
8
 * This file is part of the Import Contacts program (hereafter referred
9
9
 * to as "this program"). For more information, see
10
 
 * http://ed.am/dev/android/import-contacts
 
10
 * http://www.waxworlds.org/edam/software/android/import-contacts
11
11
 *
12
12
 * This program is free software: you can redistribute it and/or modify
13
13
 * it under the terms of the GNU General Public License as published by
46
46
        <string name="filechooser_title_file">Choose File</string>
47
47
        <string name="filechooser_current_dir"><b>Selected Directory:</b></string>
48
48
        <string name="filechooser_current_file"><b>Selected File:</b></string>
49
 
        <string name="filechooser_ok">OK</string>
 
49
        <string name="filechooser_ok">Ok</string>
50
50
        <string name="filechooser_path_sdcard">SD Card</string>
51
51
 
52
52
        <string name="vcf_title">Import vCard Files</string>
82
82
        <string name="mergeprompt_always">Always do this, stop asking!</string>
83
83
 
84
84
        <string name="error_title">An error occured!</string>
85
 
        <string name="error_ok">OK</string>
 
85
        <string name="error_ok">Ok</string>
86
86
        <string name="error_continue">Continue</string>
87
87
        <string name="error_abort">Abort</string>
88
88
 
94
94
        <string name="error_fileisempty">"File is empty: "</string>
95
95
        <string name="error_ioerror">"Can\'t read file: "</string>
96
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>
 
97
        <string name="error_vcf_parse">"Error parsing vCard in: "</string>
99
98
        <string name="error_vcf_malformed">vCard is malformed</string>
100
99
        <string name="error_vcf_notenoughinfo">"vCard doesn't contain enough information to be used as a contact!"</string>
101
100
        <string name="error_vcf_version">vCard uses an invalid version</string>