From f8c6f43b92cb34a6fed765510aa66b9d839e981a Mon Sep 17 00:00:00 2001
From: 1024jp <1024jp@wolfrosch.com>
Date: Mon, 11 Dec 2023 21:14:13 +0900
Subject: [PATCH] Update release notes

---
 CHANGELOG.md                                  |  4 +--
 .../Resources/en.lproj/pgs/releasenotes.html  | 29 +++++++++++++++++++
 .../Resources/ja.lproj/pgs/releasenotes.html  | 29 +++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d584ffcf9a..53a0825e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,8 @@
 ### Fixes
 
 - Fix an issue on CotEditor 4.7.0 that documents did not update when the file was modified by a command-line process.
-- Fix an issue on CotEditor 4.7.0 that some actions, such as scripts, could not performed via the Quick Action bar.
-- Fix an issue on CotEditor 4.7.0 that last letters of some script name with a period could be wrongly interpreted as shortcut keys.
+- Fix an issue on CotEditor 4.7.0 that the last letter of some script names with a period could be wrongly interpreted as shortcut keys.
+- Fix an issue on CotEditor 4.7.0 that some kinds of actions, such as scripts, could not performed via the Quick Action bar.
 - Fix an issue on CotEditor 4.7.0 that the Quick Actions bar dropped to draw the Shift key in some shortcuts.
 
 
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
index 4d96210029..f8c675df40 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
@@ -16,6 +16,35 @@
 <h1>Release notes for CotEditor</h1>
 
 
+<article>
+	<header>
+		<h1>CotEditor 4.7.1</h1>
+		<p>release: <time>2023-12-12</time></p>
+	</header>
+
+
+	<section>
+		<h2>New Features</h2>
+
+		<ul>
+			<li>Add “Join Lines” command to the Text menu.</li>
+		</ul>
+	</section>
+
+
+	<section>
+		<h2>Fixes</h2>
+
+		<ul>
+			<li>Fix an issue on CotEditor 4.7.0 that documents did not update when the file was modified by a command-line process.</li>
+			<li>Fix an issue on CotEditor 4.7.0 that the last letter of some script names with a period could be wrongly interpreted as shortcut keys.</li>
+			<li>Fix an issue on CotEditor 4.7.0 that some kinds of actions, such as scripts, could not performed via the Quick Action bar.</li>
+			<li>Fix an issue on CotEditor 4.7.0 that the Quick Actions bar dropped to draw the Shift key in some shortcuts.</li>
+		</ul>
+	</section>
+</article>
+
+
 <article>
 	<header>
 		<h1>CotEditor 4.7.0</h1>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
index 42ba7239ad..120ab1a27d 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
@@ -16,6 +16,35 @@
 <h1>CotEditorのリリースノート</h1>
 
 
+<article>
+	<header>
+		<h1>CotEditor 4.7.1</h1>
+		<p>リリース: <time>2023-12-12</time></p>
+	</header>
+
+
+	<section>
+		<h2>新機能</h2>
+
+		<ul>
+			<li>「テキスト」メニューに「行を結合」コマンドを追加</li>
+		</ul>
+	</section>
+
+
+	<section>
+		<h2>修正</h2>
+
+		<ul>
+			<li>コマンドラインプロセスから書類ファイルが編集されたときに書類が更新されないことがあったCotEditor 4.7.0の不具合を修正</li>
+			<li>スクリプト名の末尾がピリオドと文字のとき、その文字がショートカットキーとして解釈されてしまうことがあったCotEditor 4.7.0の不具合を修正</li>
+			<li>クイックアクションバーからスクリプトなどのいくつかのタイプのアクションが実行できなかったCotEditor 4.7.0の不具合を修正</li>
+			<li>クックアクションバーがショートカットのShiftキーを描画しないことがあったCotEditor 4.7.0の不具合を修正</li>
+		</ul>
+	</section>
+</article>
+
+
 <article>
 	<header>
 		<h1>CotEditor 4.7.0</h1>