From cc1ba4e4b5002bed22202e04bb326bf3df22349b Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sat, 1 Jul 2023 19:29:42 +0800
Subject: [PATCH] changelog

---
 src/i18n/CHANGELOG-en_US.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/CHANGELOG-en_US.md b/src/i18n/CHANGELOG-en_US.md
index 04537e3..69bfa66 100644
--- a/src/i18n/CHANGELOG-en_US.md
+++ b/src/i18n/CHANGELOG-en_US.md
@@ -1,3 +1,10 @@
-### 今日笔记 v1.2.0
+### Daily Note Today v1.2.0
 
-- 设置界面样式改版。随着插件功能逐渐复杂，设置页面也逐渐变得凌乱，本次更新改版了设置页面，使其看上去更加井然有序。
+- Interface style of the settings page has been revamped
+
+    As the plugin's functionality gradually becomes more complex, the settings page has become more cluttered. In this update, we have redesigned the settings page to make it look more organized.
+
+- Improved diary conflict detection feature
+
+    1. Added an "Auto Merge" button, which automatically combines all conflicting diaries into one page, avoiding the hassle of manual handling.
+    2. Added a new setting to disable the "Auto Open Diary" feature on mobile devices, preventing diary conflicts on mobile devices.