From 5c41d6c4a48f2b23f76e15b61a81129bbf6ad082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Thu, 26 Oct 2023 21:25:45 +0200
Subject: [PATCH] core: add version 4.1.1

---
 ChangeLog.adoc    | 13 +++++++++++++
 ReleaseNotes.adoc | 13 +++++++++++++
 version.sh        |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index bfc434d5b..dbfdb424b 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -20,6 +20,19 @@ New features::
   * core, alias, trigger: allow wildcard in commands `/bar`, `/item`, `/proxy`, `/alias` and `/trigger` (issue #1956)
   * irc: add option irc.look.ignore_tag_messages (issue #989)
 
+Bug fixes::
+
+  * core: fix crash when a custom bar item name is already used by a default bar item (issue #2034)
+  * core: fix random timeouts when a lot of concurrent processes are launched with hook_process (issue #2033)
+  * irc: revert compute of nick colors to case sensitive way, deprecate again infos "irc_nick_color" and "irc_nick_color_name" (issue #194, issue #2032)
+
+Build::
+
+  * core: make libintl.h required if CMake option ENABLE_NLS is enabled (issue #2031)
+
+[[v4.1.1]]
+== Version 4.1.1 (2023-10-26)
+
 Bug fixes::
 
   * core: fix crash when a custom bar item name is already used by a default bar item (issue #2034)
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
index 3c89262e8..3acd0fdde 100644
--- a/ReleaseNotes.adoc
+++ b/ReleaseNotes.adoc
@@ -31,6 +31,19 @@ The infos irc_nick_color and irc_nick_color_name are deprecated again, and the
 algorithm to compute IRC nick colors has been reverted to case sensitive. +
 The server name has been removed from arguments.
 
+[[v4.1.1]]
+== Version 4.1.1 (2023-10-26)
+
+[[v4.1.1_custom_bar_items]]
+=== Custom bar items
+
+Custom bar items must now have a different name than default bar items
+(for example the custom bar item name `time` is now forbidden).
+
+If you have such names in your config, WeeChat will now fail to load them
+(this should not happen anyway, since such bar items can not be properly used
+or can cause a crash of WeeChat).
+
 [[v4.1.0]]
 == Version 4.1.0 (2023-10-15)
 
diff --git a/version.sh b/version.sh
index eb3cad85b..1c3cde224 100755
--- a/version.sh
+++ b/version.sh
@@ -39,7 +39,7 @@
 #     devel-number   the devel version as hex number ("0x04010000" for "4.1.0-dev")
 #
 
-weechat_stable="4.1.0"
+weechat_stable="4.1.1"
 weechat_devel="4.2.0-dev"
 
 stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)