[evolution] Bug 598027 - Use vCard instead of VCard



commit b56caa827dd78a50928a6edb12140a16172386bc
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 10 16:27:09 2009 -0500

    Bug 598027 - Use vCard instead of VCard

 addressbook/tools/csv2vcard.in   |    4 ++--
 addressbook/util/eab-book-util.c |    2 +-
 help/C/evolution.xml             |    2 +-
 help/no/usage-mail-org.sgml      |    2 +-
 help/no/usage-mainwindow.sgml    |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/addressbook/tools/csv2vcard.in b/addressbook/tools/csv2vcard.in
index 5c82c46..8c2961c 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 54e95e4..84529c9 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 1316a05..378744e 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 ce6f75e..896b510 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 b7ff02e..1387b40 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>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]