aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/evolution.convert2
-rw-r--r--data/org.gnome.evolution.mail.gschema.xml.in2
-rw-r--r--mail/em-format-html.h2
-rw-r--r--modules/mail/e-mail-shell-settings.c2
4 files changed, 4 insertions, 4 deletions
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>
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index ab66504cec..1efd7d0be6 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 cc94dfb63c..c74dd3eee0 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",