aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-20 00:24:07 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-20 00:24:07 +0800
commit3b32549c69267295a9a7b482e4a6ca2db9e6c73f (patch)
treec6ebb240b7a676e2d2f233e84d9f3d77f09b07ba /data
parentb9eebfcb4f371ce3549264a97983b5f9cb6493df (diff)
downloadgsoc2013-evolution-3b32549c69267295a9a7b482e4a6ca2db9e6c73f.tar.gz
gsoc2013-evolution-3b32549c69267295a9a7b482e4a6ca2db9e6c73f.tar.zst
gsoc2013-evolution-3b32549c69267295a9a7b482e4a6ca2db9e6c73f.zip
And yet more GSettings migration on the mail component
Diffstat (limited to 'data')
-rw-r--r--data/evolution.convert7
-rw-r--r--data/org.gnome.evolution.mail.gschema.xml.in15
2 files changed, 20 insertions, 2 deletions
diff --git a/data/evolution.convert b/data/evolution.convert
index ea70dc8880..774d791a76 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -83,12 +83,16 @@ charset = /apps/evolution/mail/display/charset
citation-colour = /apps/evolution/mail/display/citation_colour
composer-charset = /apps/evolution/mail/composer/charset
composer-current-folder = /apps/evolution/mail/composer/current_folder
+composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list
composer-height = /apps/evolution/mail/composer/height
composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to
composer-inline-spelling = /apps/evolution/mail/composer/inline_spelling
composer-magic-links = /apps/evolution/mail/composer/magic_links
composer-magic-smileys = /apps/evolution/mail/composer/magic_smileys
-composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list
+composer-message-attribution = /apps/evolution/mail/composer/message_attribution
+composer-message-forward = /apps/evolution/mail/composer/message_forward
+composer-message-original = /apps/evolution/mail/composer/message_original
+composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim
composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom
composer-request-receipt = /apps/evolution/mail/composer/request_receipt
composer-send-html = /apps/evolution/mail/composer/send_html
@@ -101,7 +105,6 @@ composer-show-post-from = /apps/evolution/mail/composer/show_post_from
composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to
composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames
composer-top-signature = /apps/evolution/mail/composer/top_signature
-composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim
composer-width = /apps/evolution/mail/composer/width
default-account = /apps/evolution/mail/default_account
enable-vfolders = /apps/evolution/mail/display/enable_vfolders
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 649dca1ed8..35092ccfff 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -25,6 +25,21 @@
<_summary>Automatic emoticon recognition</_summary>
<_description>Recognize emoticons in text and replace them with images.</_description>
</key>
+ <key name="composer-message-attribution" type="s">
+ <default>''</default>
+ <_summary>Attribute message</_summary>
+ <_description>The text that is inserted when replying to a message, attributing the message to the original author</_description>
+ </key>
+ <key name="composer-message-forward" type="s">
+ <default>''</default>
+ <_summary>Forward message</_summary>
+ <_description>The text that is inserted when forwarding a message, saying that the forwarded message follows</_description>
+ </key>
+ <key name="composer-message-original" type="s">
+ <default>''</default>
+ <_summary>Original message</_summary>
+ <_description>The text that is inserted when replying to a message (top posting), saying that the original message follows</_description>
+ </key>
<key name="composer-group-reply-to-list" type="b">
<default>false</default>
<_summary>Group Reply replies to list</_summary>