[Commits] [SCM] claws branch, master, updated. 3.18.0-302-g2fb4305ca

[paul at claws-mail.org]

The branch, master has been updated
       via  2fb4305cab537002c4887f9d086169b2d3c73629 (commit)
      from  37aa87d1be7ebf8c7094aab29da85ad0213d970a (commit)

Summary of changes:
 src/common/utils.c                          | 6 +++---
 src/plugins/bogofilter/bogofilter_gtk.c     | 2 +-
 src/plugins/bsfilter/bsfilter_gtk.c         | 2 +-
 src/plugins/spamassassin/spamassassin_gtk.c | 2 +-
 src/prefs_account.c                         | 2 +-
 src/prefs_compose_writing.c                 | 2 +-
 src/prefs_matcher.c                         | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 2fb4305cab537002c4887f9d086169b2d3c73629
Author: paul <paul at claws-mail.org>
Date:   Fri Dec 17 11:42:40 2021 +0000

    fix bug 4556, 'Filesize in kilobytes versus kibibytes'

diff --git a/src/common/utils.c b/src/common/utils.c
index 5b6f1b98d..f0ea272ac 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -182,9 +182,9 @@ gchar *to_human_readable(goffset size)
 	register int t = 0, r = 0;
 	if (b_format == NULL) {
 		b_format  = _("%dB");
-		kb_format = _("%d.%02dKB");
-		mb_format = _("%d.%02dMB");
-		gb_format = _("%.2fGB");
+		kb_format = _("%d.%02dKiB");
+		mb_format = _("%d.%02dMiB");
+		gb_format = _("%.2fGiB");
 	}
 
 	if (size < (goffset)1024) {
diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 78b4b1a95..6303086c5 100644
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -178,7 +178,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 			_("Messages larger than this will not be checked"));
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size_spinbtn), TRUE);
 
-	max_size_kb_label = gtk_label_new(_("KB"));
+	max_size_kb_label = gtk_label_new(_("KiB"));
 	gtk_widget_show(max_size_kb_label);
 	gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
diff --git a/src/plugins/bsfilter/bsfilter_gtk.c b/src/plugins/bsfilter/bsfilter_gtk.c
index 55d9de822..4d5daaaf7 100644
--- a/src/plugins/bsfilter/bsfilter_gtk.c
+++ b/src/plugins/bsfilter/bsfilter_gtk.c
@@ -159,7 +159,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
 			_("Messages larger than this will not be checked"));
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size_spinbtn), TRUE);
 
-	max_size_kb_label = gtk_label_new(_("KB"));
+	max_size_kb_label = gtk_label_new(_("KiB"));
 	gtk_widget_show(max_size_kb_label);
 	gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 3eb52f4d3..6eb1d3b95 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -386,7 +386,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 			_("Messages larger than this will not be checked"));
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size_spinbtn), TRUE);
 
-	max_size_kb_label = gtk_label_new(_("KB"));
+	max_size_kb_label = gtk_label_new(_("KiB"));
 	gtk_widget_show(max_size_kb_label);
 	gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
diff --git a/src/prefs_account.c b/src/prefs_account.c
index b1dd0ccb4..25ef0bd8a 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1715,7 +1715,7 @@ static void receive_create_widget_func(PrefsPage * _page,
 	gtk_widget_show (size_limit_spinbtn);
 	gtk_box_pack_start (GTK_BOX (hbox1), size_limit_spinbtn, FALSE, FALSE, 0);
 
-	label = gtk_label_new (_("KB"));
+	label = gtk_label_new (_("KiB"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
 
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index 2f7213d22..9fe7a1afa 100644
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -205,7 +205,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
 	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_warn_large_insert_size),
 			TRUE);
 
- 	label_warn_large_insert_size = gtk_label_new(_("KB into message body "));
+ 	label_warn_large_insert_size = gtk_label_new(_("KiB into message body "));
 	gtk_widget_show (label_warn_large_insert_size);
 	gtk_box_pack_start (GTK_BOX (hbox_warn_large_insert),
 			label_warn_large_insert_size, FALSE, FALSE, 0);
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 0c3e11b64..aac05e92c 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -361,8 +361,8 @@ static void prefs_matcher_models_create(void)
 
 	store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
 	COMBOBOX_ADD(store, _("bytes"), SIZE_UNIT_BYTES);
-	COMBOBOX_ADD(store, _("kilobytes"), SIZE_UNIT_KBYTES);
-	COMBOBOX_ADD(store, _("megabytes"), SIZE_UNIT_MBYTES);
+	COMBOBOX_ADD(store, _("kibibytes"), SIZE_UNIT_KBYTES);
+	COMBOBOX_ADD(store, _("mebibytes"), SIZE_UNIT_MBYTES);
 	matcher.model_size_units = GTK_TREE_MODEL(store);
 	
 	store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);

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


hooks/post-receive
-- 
Claws Mail