[Commits] [SCM] claws branch, master, updated. 4.1.0-16-g483668f09

[paul at claws-mail.org]

The branch, master has been updated
       via  483668f092adda735a4628355a7922d28b9d53fc (commit)
      from  05e53c2a9d9ab784fe5bc197b450b91253758f3e (commit)

Summary of changes:
 src/addrharvest.c     | 4 ++--
 src/exportldif.c      | 4 ++--
 src/folderview.c      | 4 ++--
 src/gtk/icon_legend.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 483668f092adda735a4628355a7922d28b9d53fc
Author: Paul <paul at claws-mail.org>
Date:   Wed May 18 15:46:52 2022 +0100

    normalise spelling of sub-folder

diff --git a/src/addrharvest.c b/src/addrharvest.c
index cb46a04d2..b14ac5290 100644
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2022 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -191,7 +191,7 @@ void addrharvest_set_folder_size(
 /*
  * Specify folder recursion.
  * Entry: harvester Harvester object.
- *        value     TRUE to process sub-folders, FALSE to process folder only.
+ *        value     TRUE to process subfolders, FALSE to process folder only.
  */
 void addrharvest_set_recurse(
 	AddressHarvester* harvester, const gboolean value )
diff --git a/src/exportldif.c b/src/exportldif.c
index fb8f8b5a2..f3273203a 100644
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
+ * Copyright (C) 2003-2022 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -509,7 +509,7 @@ static void exportldif_fmt_folder(
 	/* Export entries in this folder */
 	exportldif_fmt_person( ctl, stream, folder );
 
-	/* Export entries in sub-folders */
+	/* Export entries in subfolders */
 	node = folder->listFolder;
 	while( node ) {
 		AddrItemObject *aio = node->data;
diff --git a/src/folderview.c b/src/folderview.c
index a552ba090..c48aefc13 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -869,13 +869,13 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
 	if (read) {
 		title = _("Mark all as read");
 		message = recursive? _("Do you really want to mark all mails in this "
-							"folder and its sub-folders as read?") :
+							"folder and its subfolders as read?") :
 							_("Do you really want to mark all mails in this "
 							"folder as read?");
 	} else {
 		title = _("Mark all as unread");
 		message = recursive? _("Do you really want to mark all mails in this "
-							"folder and its sub-folders as unread?") :
+							"folder and its subfolders as unread?") :
 							_("Do you really want to mark all mails in this "
 							"folder as unread?");
 	}
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index a61d8c851..d7570ad70 100644
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -88,7 +88,7 @@ static gchar *legend_icon_desc[] = {
 	N_("Folder (normal, opened)"),
 	N_("Folder with read messages hidden"),
 	N_("Folder contains marked messages"),
-	N_("IMAP folder which contains sub-folders only"),
+	N_("IMAP folder which contains subfolders only"),
 	N_("IMAP mailbox showing only subscribed folders"),
 };
 

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


hooks/post-receive
-- 
Claws Mail