From a7699bb29f5ca0c09d68cbad65cd65bedf1307c5 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 27 Nov 2011 12:50:56 -0600
Subject: "citation-colour" -> "citation-color"

---
 data/evolution.convert                       | 2 +-
 data/org.gnome.evolution.mail.gschema.xml.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/evolution.convert b/data/evolution.convert
index d52b7e14e5..fe239736f3 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 43f6279b4b..150fff59c6 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>
-- 
cgit v1.2.3