aboutsummaryrefslogtreecommitdiffstats
path: root/composer
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 /composer
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 'composer')
-rw-r--r--composer/ChangeLog15
-rw-r--r--composer/evolution-composer.ui1
-rw-r--r--composer/mail-composer.error.xml4
3 files changed, 18 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1eeb5bb7e2..56e33a762b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-01 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #428384
+
+ * mail-composer.error.xml:
+ Improve buttons in the "exit-unsaved" dialog by replacing "Cancel"
+ with "Continue Editing" and "Save Message" with "Save Draft".
+ Suggested by bytesmythe.
+
+2008-07-20 Bharath Acharya <abharath@novell.com>
+
+ ** Fix for bug #200147
+
+ * evolution-composer.ui: Added a Template placeholder
+
2008-07-09 Milan Crha <mcrha@redhat.com>
** Fix for bug #206592
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index 7413770af9..1b8957640f 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -9,6 +9,7 @@
<menuitem action='save'/>
<menuitem action='save-as'/>
<menuitem action='save-draft'/>
+ <placeholder name='template-holder'/>
<separator/>
<menuitem action='print-preview'/>
<menuitem action='print'/>
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 210756bb52..6f76887bc8 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -46,8 +46,8 @@
<_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
<_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
<button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
+ <button _label="_Continue Editing" response="GTK_RESPONSE_CANCEL"/>
+ <button _label="_Save Draft" response="GTK_RESPONSE_YES"/>
</error>
<error id="no-build-message" type="error" modal="true">