[Commits] [SCM] claws branch, master, updated. 3.17.0-155-g6eba208

[claws at claws-mail.org]

The branch, master has been updated
       via  6eba2085ac98ff8e39eefbd046314954be2673cd (commit)
      from  eade694613c19ffe747ccb77466070e474e3f968 (commit)

Summary of changes:
 src/prefs_summaries.c |    4 ++--
 src/summaryview.c     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 6eba2085ac98ff8e39eefbd046314954be2673cd
Author: Paul <paul at claws-mail.org>
Date:   Thu Nov 8 19:39:24 2018 +0000

    modify label text

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 500137f..6509077 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -599,10 +599,10 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
 	PACK_CHECK_BUTTON
 		(vbox1, checkbtn_ask_mark_all_read,
-		 _("Confirm before marking all messages in a folder as read or unread"));
+		 _("Confirm when marking all messages as read or unread"));
 	PACK_CHECK_BUTTON
 		(vbox1, checkbtn_ask_override_colorlabel,
-		 _("Confirm before overriding color label of messages"));
+		 _("Confirm when changing color labels"));
 	PACK_CHECK_BUTTON
 		(vbox1, checkbtn_transhdr,
 		 _("Translate header names"));
diff --git a/src/summaryview.c b/src/summaryview.c
index e4976bf..c108424 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -6032,7 +6032,7 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
 				msg = _("Do you really want to reset the color label of all selected messages?");
 			else
 				msg = _("Do you really want to apply this color label to all selected messages?");
-			val = alertpanel_full(_("Set color label"), msg,
+			val = alertpanel_full(labelcolor == 0? _("Reset color label"): _("Set color label"), msg,
 				  GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
 				  TRUE, NULL, ALERT_QUESTION);
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail