From 0cc775cb06b312177dc8154a77d8dc5e9660fab1 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 2 Apr 2010 14:16:25 +0200
Subject: Bug #417412 - Improve "display text part of limited size" DoS strings

---
 mail/evolution-mail.schemas.in | 11 ++++++-----
 mail/mail-config.ui            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 09d875a361..72714bf562 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -710,9 +710,9 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Allows Evolution to display text part of limited size</short>
+         <short>Display only message texts not exceeding certain size</short>
          <long>
-         Enable to render message text part of limited size.
+         Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key.
          </long>
       </locale>
     </schema>
@@ -724,10 +724,11 @@
       <type>int</type>
       <default>4096</default>
       <locale name="C">
-         <short>Text message part limit</short>
+         <short>Message text limit for display</short>
          <long>
-         This decides the max size of the text part that can be formatted under
-         Evolution. The default is 4MB / 4096 KB and is specified in terms of KB.
+         This decides the max size of the message text that will be displayed under
+         Evolution, specified in terms of KB. The default is 4096 (4MB). This value
+         is used only when 'force_message_limit' key is activated.
          </long>
       </locale>
     </schema>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 663b34616f..d00e59873b 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -2928,7 +2928,7 @@ For example: "Work" or "Personal"</property>
                             <property name="spacing">4</property>
                             <child>
                               <object class="GtkCheckButton" id="mlimit_checkbutton">
-                                <property name="label" translatable="yes">Do not format messages when text si_ze exceeds</property>
+                                <property name="label" translatable="yes">Do not display messages when text si_ze exceeds</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-- 
cgit v1.2.3