aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config.glade
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-08-08 12:26:12 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-08 12:26:12 +0800
commitcea054cd54d84479352a43bbabc19c9ce9af5efb (patch)
treeba02763209ba0f22989024004f57689071603ec5 /mail/mail-config.glade
parent91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff)
downloadgsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'mail/mail-config.glade')
-rw-r--r--mail/mail-config.glade6
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 867f786f9f..41e5b27465 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -4962,7 +4962,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<widget class="GtkCheckButton" id="mlimit_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not format text contents in messages if the text si_ze exceeds</property>
+ <property name="label" translatable="yes">Do not format messages when text si_ze exceeds</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -5646,7 +5646,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<widget class="GtkCheckButton" id="chkPromptWantHTML">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that do not want them</property>
+ <property name="label" translatable="yes">_Prompt on sending HTML mail to contacts that do not want them</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -6847,7 +6847,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<child>
<widget class="GtkLabel" id="label590">
<property name="visible">True</property>
- <property name="label" translatable="yes">This option will be overridden if a match for custom junk headers is found.</property>
+ <property name="label" translatable="yes">Option is ignored if a match for custom junk headers is found.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>