From 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 24 Nov 2008 05:14:44 +0000
Subject: Merge revisions 36737:36810 from trunk.

svn path=/branches/kill-bonobo/; revision=36811
---
 mail/evolution-mail.schemas.in | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'mail/evolution-mail.schemas.in')

diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 5e328b5457..fbebba87cb 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -185,6 +185,20 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/composer/outlook_filenames</key>
+      <applyto>/apps/evolution/mail/composer/outlook_filenames</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Encode file names in an Outlook/GMail way</short>
+         <long>
+          Encode file names in the mail headers same as Outlook or GMail does, to let them understand localized file names sent by Evolution, because they do not follow the RFC 2231, but uses incorrect RFC 2047 standard.
+         </long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/apps/evolution/mail/composer/width</key>
       <applyto>/apps/evolution/mail/composer/width</applyto>
@@ -232,9 +246,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Disable or enable ellipsizing of folder names in folder tree</short>
+         <short>Disable or enable ellipsizing of folder names in side bar</short>
          <long>
-           Whether disable ellipsizing feature of folder names in folder tree.
+           Whether disable ellipsizing feature of folder names in side bar.
          </long>
       </locale>
     </schema>
-- 
cgit v1.2.3