[Commits] [SCM] claws branch, quota-info, updated. 4.3.1-140-g25d53c104

[miras at claws-mail.org]

The branch, quota-info has been updated
       via  25d53c104355bb87cc3efca36164ea81ebe7c1e5 (commit)
       via  0e9f8dd748793210a745d5cde1f0e2bdeb17d4b7 (commit)
       via  75303bc85c77fe802d57e7762ab8ce736770631c (commit)
       via  e0155435215b3af4ea67626f5471a81bedb2cfe6 (commit)
       via  be299d7b85ea583d472c1422e787640af286399e (commit)
       via  2becb58d21d908430a4a72abe7c31f81bb91dc3e (commit)
      from  5c2df3a1c8a61c346218def056af51f6f39a1e93 (commit)

Summary of changes:
 manual/es/advanced.xml       | 14 +++++++
 src/common/defs.h            |  1 +
 src/folder_item_prefs.c      |  8 ++++
 src/folder_item_prefs.h      | 12 ++++++
 src/gtk/quicksearch.c        | 33 +++++++++--------
 src/messageview.c            |  4 +-
 src/prefs_filtering_action.c |  4 +-
 src/prefs_folder_item.c      | 88 +++++++++++++++++++++++++++++++++++++++++++-
 src/prefs_matcher.c          |  4 +-
 src/summaryview.c            | 30 ++++++++-------
 src/textview.c               |  8 +++-
 11 files changed, 169 insertions(+), 37 deletions(-)


- Log -----------------------------------------------------------------
commit 25d53c104355bb87cc3efca36164ea81ebe7c1e5
Merge: 0e9f8dd74 75303bc85
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Apr 19 23:27:19 2025 +0200

    Merge branch 'master' into quota-info


commit 0e9f8dd748793210a745d5cde1f0e2bdeb17d4b7
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Apr 19 23:25:46 2025 +0200

    Emphasize totals are account totals and not folder totals
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/summaryview.c b/src/summaryview.c
index 64501544d..532ae2be4 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2775,7 +2775,7 @@ static void summary_status_show(SummaryView *summaryview)
 		g_free(str);
 
         if (has_quota) {
-		str = g_strdup_printf(_("%d new, %d unread, %d total (%s) [used: %.2f%%]"),
+		str = g_strdup_printf(_("%d new, %d unread, %d total (%s) [Account used: %.2f%%]"),
 				n_new, n_unread, n_total,
 				to_human_readable((goffset)n_size),
 				(size*100*1.0)/limit*1.0);
@@ -2819,8 +2819,8 @@ static void summary_status_show(SummaryView *summaryview)
 					_("Locked:"), n_locked,
 					_("Ignored:"), n_ignored,
 					_("Watched:"), n_watched,
-					_("Size:"), s_size,
-					_("Limit:"), s_limit);
+					_("Account size:"), s_size,
+					_("Account Limit:"), s_limit);
 			g_free(s_size);
 			g_free(s_limit);
 		} else {
@@ -2857,7 +2857,7 @@ static void summary_status_show(SummaryView *summaryview)
 			ssize = g_strdup(to_human_readable((goffset)sel_size));
 			tsize = g_strdup(to_human_readable((goffset)n_size));
 			if (has_quota) {
-				str = g_strdup_printf(_("%d/%d selected (%s/%s), %d unread [used: %.2f%%]"),
+				str = g_strdup_printf(_("%d/%d selected (%s/%s), %d unread [Account used: %.2f%%]"),
 				n_selected, n_total, ssize, tsize, n_unread, (size*100*1.0)/limit*1.0);
 			} else {
 				str = g_strdup_printf(_("%d/%d selected (%s/%s), %d unread"),

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


hooks/post-receive
-- 
Claws Mail