aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-10-11 05:27:09 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-11 05:27:09 +0800
commitb56caa827dd78a50928a6edb12140a16172386bc (patch)
tree73103cc2095716af7f6cbef22b0904302cdcd507
parente30c8ff3852d4056b8ed63a00675524913f8e2c4 (diff)
downloadgsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.tar
gsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.tar.gz
gsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.tar.bz2
gsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.tar.lz
gsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.tar.xz
gsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.tar.zst
gsoc2013-evolution-b56caa827dd78a50928a6edb12140a16172386bc.zip
Bug 598027 - Use vCard instead of VCard
-rwxr-xr-xaddressbook/tools/csv2vcard.in4
-rw-r--r--addressbook/util/eab-book-util.c2
-rw-r--r--help/C/evolution.xml2
-rw-r--r--help/no/usage-mail-org.sgml2
-rw-r--r--help/no/usage-mainwindow.sgml4
5 files changed, 7 insertions, 7 deletions
diff --git a/addressbook/tools/csv2vcard.in b/addressbook/tools/csv2vcard.in
index 5c82c46726..8c2961cf99 100755
--- a/addressbook/tools/csv2vcard.in
+++ b/addressbook/tools/csv2vcard.in
@@ -1,6 +1,6 @@
#!@PERL@ -w
#
-# cvs2vcard - Script to convert Outlook CSV files into VCard files
+# cvs2vcard - Script to convert Outlook CSV files into vCard files
# suitable to be imported into Evolution.
#
# Copyright (C) 2001 Ximian, Inc.
@@ -31,7 +31,7 @@ sub usage
print STDERR << "--EndOfUsage";
Takes a CSV-formatted list of contacts from Outlook and attempts to
-convert it into a list of VCards suitable for import into Evolution.
+convert it into a list of vCards suitable for import into Evolution.
Usage: $0 [infile outfile]
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 54e95e4950..84529c9214 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -216,7 +216,7 @@ eab_contact_list_from_string (const gchar *str)
q = p = str_stripped = g_string_free (gstr, FALSE);
- /* Note: The VCard standard says
+ /* Note: The vCard standard says
*
* vcard = "BEGIN" [ws] ":" [ws] "VCARD" [ws] 1*CRLF
* items *CRLF "END" [ws] ":" [ws] "VCARD"
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 1316a054a5..378744e895 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -853,7 +853,7 @@
<para>Before importing email from Netscape&z-3rdParty;, Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
<tip>
<para>Evolution uses standard file types for email and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <emphasis>mbox</emphasis> for email and <emphasis>iCal</emphasis> for calendar information.</para>
- <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export an address book, click File &gt; Save Address Book As VCard". If you want to export only one contact, click File &gt; Save Contact as VCard.</para>
+ <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export an address book, click File &gt; Save Address Book As vCard". If you want to export only one contact, click File &gt; Save Contact as vCard.</para>
</tip>
</section>
</section>
diff --git a/help/no/usage-mail-org.sgml b/help/no/usage-mail-org.sgml
index ce6f75e69c..896b510706 100644
--- a/help/no/usage-mail-org.sgml
+++ b/help/no/usage-mail-org.sgml
@@ -26,7 +26,7 @@
<para>
The addressbook format used by the GNOME, KDE, and
many other contact management applications. You
- should be able to export to VCard format from any
+ should be able to export to vCard format from any
address book application.
</para>
</listitem>
diff --git a/help/no/usage-mainwindow.sgml b/help/no/usage-mainwindow.sgml
index b7ff02ecf7..1387b404f6 100644
--- a/help/no/usage-mainwindow.sgml
+++ b/help/no/usage-mainwindow.sgml
@@ -328,7 +328,7 @@
<para>
The addressbook format used by the GNOME, KDE, and
many other contact management applications. You
- should be able to export to VCard format from any
+ should be able to export to vCard format from any
address book application.
</para>
</listitem>
@@ -1171,4 +1171,4 @@ Shows your pending tasks
</para>
</sect2>
</sect1>
-</chapter> \ No newline at end of file
+</chapter>