[Commits] [SCM] claws branch, master, updated. 3.10.0-33-ge7dc27c

[ticho at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  e7dc27cfb0752e896174b4c18c41dbdc466b5ff9 (commit)
      from  bb5daa0fac6854a6db6234f6af31b901e81b8390 (commit)


- Log -----------------------------------------------------------------
commit e7dc27cfb0752e896174b4c18c41dbdc466b5ff9
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Jun 1 22:21:29 2014 +0200

    Revert commit dc6d8a1 to restore correct meaning of the silent_update feed setting.

diff --git a/src/plugins/rssyl/rssyl_gtk.c b/src/plugins/rssyl/rssyl_gtk.c
index 2c75492..24c2abe 100644
--- a/src/plugins/rssyl/rssyl_gtk.c
+++ b/src/plugins/rssyl/rssyl_gtk.c
@@ -426,7 +426,7 @@ static RSSylFeedProp *rssyl_gtk_prop_real(RSSylFolderItem *ritem)
 	row++;
 	/* Silent update - label */
 	silent_update_label =
-		gtk_label_new(_("<b>If an item changes, mark it as unread:</b>"));
+		gtk_label_new(_("<b>If an item changes, do not mark it as unread:</b>"));
 	gtk_label_set_use_markup(GTK_LABEL(silent_update_label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(silent_update_label), 0, 0.5);
 	gtk_table_attach(GTK_TABLE(table), silent_update_label, 0, 1, row, row+1,
@@ -436,11 +436,11 @@ static RSSylFeedProp *rssyl_gtk_prop_real(RSSylFolderItem *ritem)
 	/* Silent update - combobox */
 	feedprop->silent_update = gtk_combo_box_new_text();
 	gtk_combo_box_append_text(GTK_COMBO_BOX(feedprop->silent_update),
-			_("Always"));
+			_("Always mark as unread"));
 	gtk_combo_box_append_text(GTK_COMBO_BOX(feedprop->silent_update),
-			_("Only when its text has changed"));
+			_("If only its text has changed"));
 	gtk_combo_box_append_text(GTK_COMBO_BOX(feedprop->silent_update),
-			_("Never"));
+			_("Never mark as unread"));
 	gtk_table_attach(GTK_TABLE(table), feedprop->silent_update, 1, 2, row, row+1,
 			(GtkAttachOptions) (0),
 			(GtkAttachOptions) (0), 10, 5);

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

Summary of changes:
 src/plugins/rssyl/rssyl_gtk.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Claws Mail