[Commits] [SCM] claws branch, master, updated. 3.17.0-2-g779d80e

wwp at claws-mail.org wwp at claws-mail.org
Thu Aug 16 08:46:31 CEST 2018


The branch, master has been updated
       via  779d80e310ba19b54c4293dd94b59b39d952b12f (commit)
      from  b6d5a0d4d64ecfba7320cbdc6628ecd358574495 (commit)

Summary of changes:
 src/addrgather.c                                    |    2 +-
 src/crash.c                                         |    2 +-
 src/gtk/foldersort.c                                |    2 +-
 src/gtk/foldersort.h                                |    2 +-
 src/plugins/gdata/cm_gdata_contacts.c               |    2 +-
 src/plugins/gdata/cm_gdata_contacts.h               |    2 +-
 src/plugins/gdata/cm_gdata_prefs.c                  |    2 +-
 src/plugins/gdata/cm_gdata_prefs.h                  |    2 +-
 src/plugins/gdata/gdata_plugin.c                    |    2 +-
 src/plugins/gdata/gdata_plugin.h                    |    2 +-
 src/plugins/notification/notification_banner.h      |    2 +-
 src/plugins/notification/notification_command.c     |    2 +-
 src/plugins/notification/notification_command.h     |    2 +-
 src/plugins/notification/notification_core.c        |    2 +-
 src/plugins/notification/notification_core.h        |    2 +-
 src/plugins/notification/notification_foldercheck.c |    2 +-
 src/plugins/notification/notification_foldercheck.h |    2 +-
 src/plugins/notification/notification_hotkeys.c     |    2 +-
 src/plugins/notification/notification_hotkeys.h     |    2 +-
 src/plugins/notification/notification_indicator.c   |    2 +-
 src/plugins/notification/notification_indicator.h   |    2 +-
 src/plugins/notification/notification_lcdproc.c     |    2 +-
 src/plugins/notification/notification_lcdproc.h     |    2 +-
 src/plugins/notification/notification_pixbuf.c      |    2 +-
 src/plugins/notification/notification_pixbuf.h      |    2 +-
 src/plugins/notification/notification_plugin.c      |    2 +-
 src/plugins/notification/notification_plugin.h      |    2 +-
 src/plugins/notification/notification_popup.c       |    2 +-
 src/plugins/notification/notification_popup.h       |    2 +-
 src/plugins/notification/notification_prefs.c       |    2 +-
 src/plugins/notification/notification_prefs.h       |    2 +-
 src/plugins/notification/notification_trayicon.c    |    4 ++--
 src/plugins/notification/notification_trayicon.h    |    2 +-
 src/plugins/pdf_viewer/poppler_viewer.c             |    2 +-
 src/plugins/perl/perl_gtk.c                         |    2 +-
 src/plugins/perl/perl_gtk.h                         |    2 +-
 src/plugins/perl/perl_plugin.c                      |    2 +-
 src/plugins/perl/perl_plugin.h                      |    2 +-
 src/plugins/python/accounttype.c                    |    2 +-
 src/plugins/python/accounttype.h                    |    2 +-
 src/plugins/python/clawsmailmodule.c                |    2 +-
 src/plugins/python/clawsmailmodule.h                |    2 +-
 src/plugins/python/composewindowtype.c              |    2 +-
 src/plugins/python/composewindowtype.h              |    2 +-
 src/plugins/python/folderpropertiestype.c           |    2 +-
 src/plugins/python/folderpropertiestype.h           |    2 +-
 src/plugins/python/foldertype.c                     |    2 +-
 src/plugins/python/foldertype.h                     |    2 +-
 src/plugins/python/mailboxtype.c                    |    2 +-
 src/plugins/python/mailboxtype.h                    |    2 +-
 src/plugins/python/messageinfotype.c                |    2 +-
 src/plugins/python/messageinfotype.h                |    2 +-
 src/plugins/python/nodetype.c                       |    2 +-
 src/plugins/python/nodetype.h                       |    2 +-
 src/plugins/python/python_plugin.c                  |    2 +-
 src/plugins/rssyl/opml_export.c                     |    2 +-
 src/plugins/rssyl/opml_import.c                     |    2 +-
 src/plugins/rssyl/parse822.c                        |    2 +-
 src/plugins/rssyl/plugin.c                          |    2 +-
 src/plugins/rssyl/rssyl.c                           |    2 +-
 src/plugins/rssyl/rssyl_add_item.c                  |    2 +-
 src/plugins/rssyl/rssyl_cb_menu.c                   |    2 +-
 src/plugins/rssyl/rssyl_deleted.c                   |    2 +-
 src/plugins/rssyl/rssyl_gtk.c                       |    2 +-
 src/plugins/rssyl/rssyl_parse_feed.c                |    2 +-
 src/plugins/rssyl/rssyl_subscribe.c                 |    2 +-
 src/plugins/rssyl/rssyl_subscribe_gtk.c             |    2 +-
 src/plugins/rssyl/strutils.c                        |    2 +-
 src/prefs_msg_colors.c                              |    2 +-
 src/procmsg.h                                       |    2 +-
 70 files changed, 71 insertions(+), 71 deletions(-)


- Log -----------------------------------------------------------------
commit 779d80e310ba19b54c4293dd94b59b39d952b12f
Author: wwp <wwp at free.fr>
Date:   Thu Aug 16 08:45:55 2018 +0200

    Fix/normalize product name in few places in UI and in several source
    files.

diff --git a/src/addrgather.c b/src/addrgather.c
index d2e28c8..9c8f97a 100644
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -251,7 +251,7 @@ static gboolean addrgather_dlg_harvest() {
 			contact->name = g_strdup(person->last_name);
 		if (! contact->name || strlen(contact->name) < 1)
 			contact->name = g_strdup(person->email);
-		contact->remarks = g_strdup(N_("address added by claws-mail"));
+		contact->remarks = g_strdup(N_("address added by Claws Mail"));
 		contact->email = g_strdup(person->email);
 		contact->book = g_strdup(name);
 		addressbook_dbus_add_contact(contact, &error);
diff --git a/src/crash.c b/src/crash.c
index fcb5e40..ae1d4b1 100644
--- a/src/crash.c
+++ b/src/crash.c
@@ -481,7 +481,7 @@ static const gchar *get_operating_system(void)
 
 /*!
  *\brief	see if the crash dialog is allowed (because some
- *		developers may prefer to run claws-mail under gdb...)
+ *		developers may prefer to run Claws Mail under gdb...)
  */
 static gboolean is_crash_dialog_allowed(void)
 {
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index df0c0c1..fe5717d 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2018 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/foldersort.h b/src/gtk/foldersort.h
index 505dbb2..331bd12 100644
--- a/src/gtk/foldersort.h
+++ b/src/gtk/foldersort.h
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2018 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index 1c6ba7d..63531b0 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
  * Copyright (C) 2011 Holger Berndt
  * Copyright (C) 2011-2016 the Claws Mail team
  *
diff --git a/src/plugins/gdata/cm_gdata_contacts.h b/src/plugins/gdata/cm_gdata_contacts.h
index 1be697c..9b70faa 100644
--- a/src/plugins/gdata/cm_gdata_contacts.h
+++ b/src/plugins/gdata/cm_gdata_contacts.h
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
  * Copyright (C) 2011 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/cm_gdata_prefs.c b/src/plugins/gdata/cm_gdata_prefs.c
index 83a23a6..c5e35bd 100644
--- a/src/plugins/gdata/cm_gdata_prefs.c
+++ b/src/plugins/gdata/cm_gdata_prefs.c
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
  * Copyright (C) 2011 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/cm_gdata_prefs.h b/src/plugins/gdata/cm_gdata_prefs.h
index b99f77f..eb4c8d8 100644
--- a/src/plugins/gdata/cm_gdata_prefs.h
+++ b/src/plugins/gdata/cm_gdata_prefs.h
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
  * Copyright (C) 2011 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/gdata_plugin.c b/src/plugins/gdata/gdata_plugin.c
index e623d96..d7ded2d 100644
--- a/src/plugins/gdata/gdata_plugin.c
+++ b/src/plugins/gdata/gdata_plugin.c
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
  * Copyright (C) 2011 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/gdata_plugin.h b/src/plugins/gdata/gdata_plugin.h
index eb9c363..ba508a2 100644
--- a/src/plugins/gdata/gdata_plugin.h
+++ b/src/plugins/gdata/gdata_plugin.h
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
  * Copyright (C) 2011 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_banner.h b/src/plugins/notification/notification_banner.h
index e529686..55ab7f6 100644
--- a/src/plugins/notification/notification_banner.h
+++ b/src/plugins/notification/notification_banner.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_command.c b/src/plugins/notification/notification_command.c
index ac4bfb8..c7a1806 100644
--- a/src/plugins/notification/notification_command.c
+++ b/src/plugins/notification/notification_command.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_command.h b/src/plugins/notification/notification_command.h
index 9656f18..8b62566 100644
--- a/src/plugins/notification/notification_command.h
+++ b/src/plugins/notification/notification_command.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c
index 967f67f..c585b2c 100644
--- a/src/plugins/notification/notification_core.c
+++ b/src/plugins/notification/notification_core.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_core.h b/src/plugins/notification/notification_core.h
index b1ed955..d3efc16 100644
--- a/src/plugins/notification/notification_core.h
+++ b/src/plugins/notification/notification_core.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index 43e22c9..f53537d 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -1,5 +1,5 @@
 
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_foldercheck.h b/src/plugins/notification/notification_foldercheck.h
index 0da6313..361663e 100644
--- a/src/plugins/notification/notification_foldercheck.h
+++ b/src/plugins/notification/notification_foldercheck.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_hotkeys.c b/src/plugins/notification/notification_hotkeys.c
index 0674666..f2d51f0 100644
--- a/src/plugins/notification/notification_hotkeys.c
+++ b/src/plugins/notification/notification_hotkeys.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_hotkeys.h b/src/plugins/notification/notification_hotkeys.h
index 54c4e96..5a75e5b 100644
--- a/src/plugins/notification/notification_hotkeys.h
+++ b/src/plugins/notification/notification_hotkeys.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_indicator.c b/src/plugins/notification/notification_indicator.c
index 083ff54..920a768 100644
--- a/src/plugins/notification/notification_indicator.c
+++ b/src/plugins/notification/notification_indicator.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_indicator.h b/src/plugins/notification/notification_indicator.h
index bc1be5e..95360c0 100644
--- a/src/plugins/notification/notification_indicator.h
+++ b/src/plugins/notification/notification_indicator.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_lcdproc.c b/src/plugins/notification/notification_lcdproc.c
index 491045f..874caa7 100644
--- a/src/plugins/notification/notification_lcdproc.c
+++ b/src/plugins/notification/notification_lcdproc.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_lcdproc.h b/src/plugins/notification/notification_lcdproc.h
index e8371e7..71f753a 100644
--- a/src/plugins/notification/notification_lcdproc.h
+++ b/src/plugins/notification/notification_lcdproc.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_pixbuf.c b/src/plugins/notification/notification_pixbuf.c
index 23448fb..f50d3d1 100644
--- a/src/plugins/notification/notification_pixbuf.c
+++ b/src/plugins/notification/notification_pixbuf.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_pixbuf.h b/src/plugins/notification/notification_pixbuf.h
index 25392b3..a18ac72 100644
--- a/src/plugins/notification/notification_pixbuf.h
+++ b/src/plugins/notification/notification_pixbuf.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_plugin.c b/src/plugins/notification/notification_plugin.c
index 2798e3a..18671d6 100644
--- a/src/plugins/notification/notification_plugin.c
+++ b/src/plugins/notification/notification_plugin.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_plugin.h b/src/plugins/notification/notification_plugin.h
index eef161c..9b42e2c 100644
--- a/src/plugins/notification/notification_plugin.h
+++ b/src/plugins/notification/notification_plugin.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
index 9a7dde8..35ca9a6 100644
--- a/src/plugins/notification/notification_popup.c
+++ b/src/plugins/notification/notification_popup.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_popup.h b/src/plugins/notification/notification_popup.h
index c4317f6..449e98c 100644
--- a/src/plugins/notification/notification_popup.h
+++ b/src/plugins/notification/notification_popup.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index a384ced..e82a5c3 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2015 Hiroyuki Yamamoto and the Claws Mail team
  * Copyright (C) 2005-2015 Holger Berndt
  *
diff --git a/src/plugins/notification/notification_prefs.h b/src/plugins/notification/notification_prefs.h
index 5f8189c..2234de0 100644
--- a/src/plugins/notification/notification_prefs.h
+++ b/src/plugins/notification/notification_prefs.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index e93c7ad..ee7689d 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt and the Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
  */
 
 /* This module is of course inspired by the trayicon plugin which is
- * shipped with Claws-Mail, copyrighted by the Claws-Mail Team. */
+ * shipped with Claws Mail, copyrighted by the Claws Mail Team. */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/plugins/notification/notification_trayicon.h b/src/plugins/notification/notification_trayicon.h
index b72609d..65c2731 100644
--- a/src/plugins/notification/notification_trayicon.h
+++ b/src/plugins/notification/notification_trayicon.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
  * Copyright (C) 2005-2007 Holger Berndt and the Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index 33ab2d2..737837d 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -90,7 +90,7 @@ static void pdf_viewer_show_controls(PdfViewer *viewer, gboolean show);
 static gboolean pdf_viewer_scroll_page(MimeViewer *_viewer, gboolean up);
 static void pdf_viewer_scroll_one_line(MimeViewer *_viewer, gboolean up);
 
-/** Claws-Mail Plugin functions*/
+/** Claws Mail Plugin functions */
 gint plugin_init(gchar **error);
 const gchar *plugin_name(void);
 const gchar *plugin_desc(void);
diff --git a/src/plugins/perl/perl_gtk.c b/src/plugins/perl/perl_gtk.c
index f69feb9..ae60465 100644
--- a/src/plugins/perl/perl_gtk.c
+++ b/src/plugins/perl/perl_gtk.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_gtk.h b/src/plugins/perl/perl_gtk.h
index 75fae32..f570208 100644
--- a/src/plugins/perl/perl_gtk.h
+++ b/src/plugins/perl/perl_gtk.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c
index 9c69566..afeb83c 100644
--- a/src/plugins/perl/perl_plugin.c
+++ b/src/plugins/perl/perl_plugin.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_plugin.h b/src/plugins/perl/perl_plugin.h
index f2d6a9f..d461a1a 100644
--- a/src/plugins/perl/perl_plugin.h
+++ b/src/plugins/perl/perl_plugin.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/accounttype.c b/src/plugins/python/accounttype.c
index 63588c2..c86a6c3 100644
--- a/src/plugins/python/accounttype.c
+++ b/src/plugins/python/accounttype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/accounttype.h b/src/plugins/python/accounttype.h
index 07328d6..15c6bbd 100644
--- a/src/plugins/python/accounttype.h
+++ b/src/plugins/python/accounttype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/clawsmailmodule.c b/src/plugins/python/clawsmailmodule.c
index d86ae72..e6eddeb 100644
--- a/src/plugins/python/clawsmailmodule.c
+++ b/src/plugins/python/clawsmailmodule.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009-2012 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/clawsmailmodule.h b/src/plugins/python/clawsmailmodule.h
index 1f1056f..371a3c4 100644
--- a/src/plugins/python/clawsmailmodule.h
+++ b/src/plugins/python/clawsmailmodule.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/composewindowtype.c b/src/plugins/python/composewindowtype.c
index 822cc7f..b7c3311 100644
--- a/src/plugins/python/composewindowtype.c
+++ b/src/plugins/python/composewindowtype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/composewindowtype.h b/src/plugins/python/composewindowtype.h
index 14ddc26..4e1020e 100644
--- a/src/plugins/python/composewindowtype.h
+++ b/src/plugins/python/composewindowtype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/folderpropertiestype.c b/src/plugins/python/folderpropertiestype.c
index c5fcd30..0c43e9a 100644
--- a/src/plugins/python/folderpropertiestype.c
+++ b/src/plugins/python/folderpropertiestype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/folderpropertiestype.h b/src/plugins/python/folderpropertiestype.h
index 752f082..1b5973e 100644
--- a/src/plugins/python/folderpropertiestype.h
+++ b/src/plugins/python/folderpropertiestype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/foldertype.c b/src/plugins/python/foldertype.c
index ae27f8f..6bb0b9e 100644
--- a/src/plugins/python/foldertype.c
+++ b/src/plugins/python/foldertype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/foldertype.h b/src/plugins/python/foldertype.h
index aa27a5a..bfc1b11 100644
--- a/src/plugins/python/foldertype.h
+++ b/src/plugins/python/foldertype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/mailboxtype.c b/src/plugins/python/mailboxtype.c
index aa4be0e..becfe64 100644
--- a/src/plugins/python/mailboxtype.c
+++ b/src/plugins/python/mailboxtype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/mailboxtype.h b/src/plugins/python/mailboxtype.h
index 58c49d6..1def4b5 100644
--- a/src/plugins/python/mailboxtype.h
+++ b/src/plugins/python/mailboxtype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/messageinfotype.c b/src/plugins/python/messageinfotype.c
index 62794af..da58934 100644
--- a/src/plugins/python/messageinfotype.c
+++ b/src/plugins/python/messageinfotype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009-2014 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/messageinfotype.h b/src/plugins/python/messageinfotype.h
index 301275a..9ccdb64 100644
--- a/src/plugins/python/messageinfotype.h
+++ b/src/plugins/python/messageinfotype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/nodetype.c b/src/plugins/python/nodetype.c
index 70f4978..1632e27 100644
--- a/src/plugins/python/nodetype.c
+++ b/src/plugins/python/nodetype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/nodetype.h b/src/plugins/python/nodetype.h
index 735ef58..29d1244 100644
--- a/src/plugins/python/nodetype.h
+++ b/src/plugins/python/nodetype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index 03c2ea4..db4ff8f 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
  * Copyright (C) 2009 Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/rssyl/opml_export.c b/src/plugins/rssyl/opml_export.c
index 6bde580..dfc7c90 100644
--- a/src/plugins/rssyl/opml_export.c
+++ b/src/plugins/rssyl/opml_export.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * This file (C) 2008 Andrej Kacian <andrej at kacian.sk>
  *
  * - Export feed list to OPML
diff --git a/src/plugins/rssyl/opml_import.c b/src/plugins/rssyl/opml_import.c
index 1c37909..7544c5f 100644
--- a/src/plugins/rssyl/opml_import.c
+++ b/src/plugins/rssyl/opml_import.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/parse822.c b/src/plugins/rssyl/parse822.c
index e45c9c9..b153936 100644
--- a/src/plugins/rssyl/parse822.c
+++ b/src/plugins/rssyl/parse822.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/plugin.c b/src/plugins/rssyl/plugin.c
index 3dd6436..5b82343 100644
--- a/src/plugins/rssyl/plugin.c
+++ b/src/plugins/rssyl/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index c400e96..c98590e 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index 922ad4e..25ce836 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 5874326..79e70ea 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index 4da0f83..497ed34 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_gtk.c b/src/plugins/rssyl/rssyl_gtk.c
index 7ed6692..1fd4ecf 100644
--- a/src/plugins/rssyl/rssyl_gtk.c
+++ b/src/plugins/rssyl/rssyl_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_parse_feed.c b/src/plugins/rssyl/rssyl_parse_feed.c
index 237a2fe..265001b 100644
--- a/src/plugins/rssyl/rssyl_parse_feed.c
+++ b/src/plugins/rssyl/rssyl_parse_feed.c
@@ -203,7 +203,7 @@ gboolean rssyl_parse_feed(RFolderItem *ritem, Feed *feed)
 	rssyl_folder_read_existing(ritem);
 
 	if( claws_is_exiting() ) {
-		debug_print("RSSyl: Claws-Mail is exiting, bailing out\n");
+		debug_print("RSSyl: Claws Mail is exiting, bailing out\n");
 		log_print(LOG_PROTOCOL, RSSYL_LOG_ABORTED_EXITING, ritem->url);
 		folder_item_update_thaw();
 		return TRUE;
diff --git a/src/plugins/rssyl/rssyl_subscribe.c b/src/plugins/rssyl/rssyl_subscribe.c
index a5a0024..1af78c5 100644
--- a/src/plugins/rssyl/rssyl_subscribe.c
+++ b/src/plugins/rssyl/rssyl_subscribe.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index 04dc977..72fe502 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index 7ef6098..eb15b75 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 2005 Andrej Kacian <andrej at kacian.sk>
  *
  * - a strreplace function (something like sed's s/foo/bar/g)
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 76f73b9..eb7cf94 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -1,5 +1,5 @@
 /*
- * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2017 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procmsg.h b/src/procmsg.h
index d1cb479..1dda93d 100644
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -81,7 +81,7 @@
 #define MSG_RETRCPT_GOT		(1U << 17)   /* got return receipt */
  	
 /* RESERVED */
-#define	MSG_RESERVED_CLAWS	(1U << 30)   /* for claws-mail */
+#define	MSG_RESERVED_CLAWS	(1U << 30)   /* for Claws Mail */
 #define	MSG_RESERVED		(1U << 31)
 
 #define MSG_MOVE		(1U << 0)

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list