[evolution] "citation-colour" -> "citation-color"

[Matthew Barnes <mbarnes src gnome org>]

commit a7699bb29f5ca0c09d68cbad65cd65bedf1307c5
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Nov 27 12:50:56 2011 -0600

    "citation-colour" -> "citation-color"

 data/evolution.convert                       |    2 +-
 data/org.gnome.evolution.mail.gschema.xml.in |    2 +-
 mail/em-format-html.h                        |    2 +-
 modules/mail/e-mail-shell-settings.c         |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/data/evolution.convert b/data/evolution.convert
index d52b7e1..fe23973 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -112,7 +112,7 @@ address-count = /apps/evolution/mail/display/address_count
 animate-images = /apps/evolution/mail/display/animate_images
 caret-mode = /apps/evolution/mail/display/caret_mode
 charset = /apps/evolution/mail/display/charset
-citation-colour = /apps/evolution/mail/display/citation_colour
+citation-color = /apps/evolution/mail/display/citation_colour
 composer-charset = /apps/evolution/mail/composer/charset
 composer-current-folder = /apps/evolution/mail/composer/current_folder
 composer-gallery-path = /apps/evolution/mail/composer/gallery_path
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 43f6279..150fff5 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -155,7 +155,7 @@
       <_summary>Mark citations in the message "Preview"</_summary>
       <_description>Mark citations in the message "Preview".</_description>
     </key>
-    <key name="citation-colour" type="s">
+    <key name="citation-color" type="s">
       <default>'#737373'</default>
       <_summary>Citation highlight color</_summary>
       <_description>Citation highlight color.</_description>
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index ab66504..1efd7d0 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -193,7 +193,7 @@ struct _EMFormatHTMLPObject {
  * @text_colour:
  * @frame_colour:
  * @content_colour:
- * @citation_colour:
+ * @citation_color:
  * @load_http:2:
  * @load_http_now:1:
  * @mark_citations:1:
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index cc94dfb..c74dd3e 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -128,7 +128,7 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
 	e_shell_settings_install_property_for_key (
 		"mail-citation-color",
 		MAIL_SCHEMA,
-		"citation-colour");
+		"citation-color");
 
 	e_shell_settings_install_property_for_key (
 		"mail-confirm-expunge",