diff --git a/doc/~$便签开源代码泛读报告.docx b/doc/~$便签开源代码泛读报告.docx
new file mode 100644
index 0000000..e2d1946
Binary files /dev/null and b/doc/~$便签开源代码泛读报告.docx differ
diff --git a/doc/实践统计-阅读分析和维护开源软件.xlsx b/doc/实践统计-阅读分析和维护开源软件.xlsx
new file mode 100644
index 0000000..d27a692
Binary files /dev/null and b/doc/实践统计-阅读分析和维护开源软件.xlsx differ
diff --git a/doc/实践考评-阅读维护开源软件的团队自评报告模板.xlsx b/doc/实践考评-阅读维护开源软件的团队自评报告模板.xlsx
new file mode 100644
index 0000000..89cb04e
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的团队自评报告模板.xlsx differ
diff --git a/doc/实践考评-阅读维护开源软件的汇报模板.pptx b/doc/实践考评-阅读维护开源软件的汇报模板.pptx
new file mode 100644
index 0000000..49cbaad
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的汇报模板.pptx differ
diff --git a/doc/小米便签开源代码泛读报告.docx b/doc/小米便签开源代码泛读报告.docx
index 2078816..d210733 100644
Binary files a/doc/小米便签开源代码泛读报告.docx and b/doc/小米便签开源代码泛读报告.docx differ
diff --git a/src/res/drawable/ic_format_bold.xml b/src/res/drawable/ic_format_bold.xml
new file mode 100644
index 0000000..38022e6
--- /dev/null
+++ b/src/res/drawable/ic_format_bold.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/src/res/drawable/ic_format_italic.xml b/src/res/drawable/ic_format_italic.xml
new file mode 100644
index 0000000..1f3de06
--- /dev/null
+++ b/src/res/drawable/ic_format_italic.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
+</vector>
diff --git a/src/res/drawable/ic_format_size.xml b/src/res/drawable/ic_format_size.xml
new file mode 100644
index 0000000..878e630
--- /dev/null
+++ b/src/res/drawable/ic_format_size.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,4v3h5v12h3V7h5V4H9zM3,12h8v-3H3v3z"/>
+</vector>
diff --git a/src/res/drawable/ic_format_strikethrough.xml b/src/res/drawable/ic_format_strikethrough.xml
new file mode 100644
index 0000000..9fdfb16
--- /dev/null
+++ b/src/res/drawable/ic_format_strikethrough.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,19h4v-3h-4v3zM5,4v3h5v3h4V7h5V4H5zM3,14h18v-2H3v2z"/>
+</vector>
diff --git a/src/res/drawable/ic_format_underline.xml b/src/res/drawable/ic_format_underline.xml
new file mode 100644
index 0000000..a2e4f9f
--- /dev/null
+++ b/src/res/drawable/ic_format_underline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17c3.31,0 6,-2.69 6,-6V3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11V3H6v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2H5z"/>
+</vector>
diff --git a/src/res/drawable/ic_insert_image.xml b/src/res/drawable/ic_insert_image.xml
new file mode 100644
index 0000000..e91324e
--- /dev/null
+++ b/src/res/drawable/ic_insert_image.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/src/res/drawable/ic_list_mode.xml b/src/res/drawable/ic_list_mode.xml
new file mode 100644
index 0000000..eea1aab
--- /dev/null
+++ b/src/res/drawable/ic_list_mode.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,13h2v-2H3v2zm0,4h2v-2H3v2zm0,-8h2V7H3v2zm4,4h14v-2H7v2zm0,4h14v-2H7v2zM7,7v2h14V7H7z"/>
+</vector>
diff --git a/src/res/layout/activity_login.xml b/src/res/layout/activity_login.xml
index bd69481..8233c8c 100644
--- a/src/res/layout/activity_login.xml
+++ b/src/res/layout/activity_login.xml
@@ -73,15 +73,15 @@
             android:text="@string/btn_login"
             android:layout_marginBottom="16dp"
             android:backgroundTint="@color/primary"
-            style="?android:attr/buttonBarButtonStyle" />
+            android:textColor="@color/on_primary" />
 
         <Button
             android:id="@+id/btn_login_cancel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@android:string/cancel"
-            android:backgroundTint="@color/primary"
-            style="?android:attr/buttonBarButtonStyle" />
+            android:text="@string/cancel"
+            android:backgroundTint="@color/surface"
+            android:textColor="@color/text_primary" />
 
         <TextView
             android:id="@+id/tv_login_register"
diff --git a/src/res/layout/activity_register.xml b/src/res/layout/activity_register.xml
index 4dc45ef..2c1f861 100644
--- a/src/res/layout/activity_register.xml
+++ b/src/res/layout/activity_register.xml
@@ -97,10 +97,10 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@android:string/cancel"
+                android:text="@string/cancel"
                 android:layout_marginEnd="8dp"
-                android:backgroundTint="@color/primary"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:backgroundTint="@color/surface"
+                android:textColor="@color/text_primary" />
 
             <Button
                 android:id="@+id/btn_register"
@@ -110,7 +110,7 @@
                 android:text="@string/btn_register"
                 android:layout_marginStart="8dp"
                 android:backgroundTint="@color/primary"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:textColor="@color/on_primary" />
 
         </LinearLayout>
 
diff --git a/src/res/layout/note_edit.xml b/src/res/layout/note_edit.xml
index 7617d43..1de3c26 100644
--- a/src/res/layout/note_edit.xml
+++ b/src/res/layout/note_edit.xml
@@ -32,7 +32,102 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/surface"
-            android:elevation="4dp" />
+            android:elevation="4dp">
+
+            <!-- 格式化工具栏容器 -->
+            <LinearLayout
+                android:id="@+id/format_toolbar"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_gravity="start|center_vertical">
+
+                <ImageButton
+                    android:id="@+id/btn_font_size"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_format_size"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_font_size"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="20dp"
+                    android:background="@color/divider"
+                    android:layout_marginHorizontal="2dp" />
+
+                <ImageButton
+                    android:id="@+id/btn_bold"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_format_bold"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_bold"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+                <ImageButton
+                    android:id="@+id/btn_italic"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_format_italic"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_italic"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+                <ImageButton
+                    android:id="@+id/btn_underline"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_format_underline"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_underline"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+                <ImageButton
+                    android:id="@+id/btn_strikethrough"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_format_strikethrough"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_strikethrough"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="20dp"
+                    android:background="@color/divider"
+                    android:layout_marginHorizontal="4dp" />
+
+                <ImageButton
+                    android:id="@+id/btn_list_mode"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_list_mode"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_list_mode"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+                <ImageButton
+                    android:id="@+id/btn_insert_image"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:src="@drawable/ic_insert_image"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/menu_insert_image"
+                    android:scaleType="centerInside"
+                    app:tint="@color/text_primary" />
+
+            </LinearLayout>
+
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <LinearLayout
             android:id="@+id/note_title"
diff --git a/src/res/layout/note_list.xml b/src/res/layout/note_list.xml
index 7bbbb10..f131c4c 100644
--- a/src/res/layout/note_list.xml
+++ b/src/res/layout/note_list.xml
@@ -47,6 +47,41 @@
                 android:textAppearance="@style/TextAppearanceMedium"
                 android:textColor="@color/text_primary" />
 
+            <LinearLayout
+                android:id="@+id/search_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="8dp"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/search_input"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:hint="搜索便签"
+                    android:inputType="text"
+                    android:imeOptions="actionSearch"
+                    android:singleLine="true"
+                    android:background="@android:drawable/edit_text"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="12dp"
+                    android:textColor="@android:color/black"
+                    android:textColorHint="@android:color/darker_gray"
+                    android:textSize="16sp" />
+
+                <Button
+                    android:id="@+id/search_cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="取消"
+                    android:background="@android:color/transparent"
+                    android:textColor="@android:color/holo_blue_light"
+                    android:textSize="16sp" />
+
+            </LinearLayout>
+
         </com.google.android.material.appbar.MaterialToolbar>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/src/res/layout/search_box.xml b/src/res/layout/search_box.xml
new file mode 100644
index 0000000..6ab37a9
--- /dev/null
+++ b/src/res/layout/search_box.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="8dp"
+    android:background="@android:color/transparent">
+
+    <EditText
+        android:id="@+id/search_input"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:hint="搜索便签"
+        android:inputType="text"
+        android:imeOptions="actionSearch"
+        android:singleLine="true"
+        android:background="@android:drawable/edit_text"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:textColor="@android:color/black"
+        android:textColorHint="@android:color/darker_gray"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/search_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="取消"
+        android:background="@android:color/transparent"
+        android:textColor="@android:color/holo_blue_light"
+        android:textSize="16sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/res/menu/note_edit.xml b/src/res/menu/note_edit.xml
index 6ec1950..d71553e 100644
--- a/src/res/menu/note_edit.xml
+++ b/src/res/menu/note_edit.xml
@@ -23,12 +23,8 @@
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
 
-    <item
-        android:id="@+id/menu_insert_image"
-        android:icon="@android:drawable/ic_menu_camera"
-        android:title="@string/menu_insert_image"
-        app:showAsAction="never"
-        android:orderInCategory="2" />
+    <!-- 插入图片、列表模式已移至工具栏 -->
+
     <item
         android:id="@+id/menu_delete"
         android:icon="@android:drawable/ic_menu_delete"
@@ -36,13 +32,7 @@
         app:showAsAction="never"
         android:orderInCategory="4" />
 
-    <item
-        android:id="@+id/menu_font_size"
-        android:title="@string/menu_font_size"/>
-
-    <item
-        android:id="@+id/menu_list_mode"
-        android:title="@string/menu_list_mode" />
+    <!-- 字体大小和格式选项已移至工具栏，从菜单中移除 -->
 
     <item
         android:id="@+id/menu_share"
@@ -60,23 +50,4 @@
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
 
-    <item
-        android:id="@+id/menu_bold"
-        android:title="@string/menu_bold"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_italic"
-        android:title="@string/menu_italic"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_underline"
-        android:title="@string/menu_underline"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_strikethrough"
-        android:title="@string/menu_strikethrough"
-        app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/src/res/values/oss_config.xml b/src/res/values/oss_config.xml
new file mode 100644
index 0000000..7623e15
--- /dev/null
+++ b/src/res/values/oss_config.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 
+    阿里云OSS配置文件
+    ================================
+    重要提示：以下参数需要您从阿里云控制台获取并填写
+    ================================
+    
+    获取方式：
+    1. 登录阿里云控制台：https://oss.console.aliyun.com/
+    2. 创建或选择您的OSS Bucket
+    3. 在"概览"页面查看Endpoint
+    4. 在"AccessKey管理"中创建或查看AccessKey
+    
+    安全建议：
+    - 不要将AccessKey提交到版本控制系统
+    - 建议使用RAM子账号并限制权限
+    - 生产环境建议使用STS临时凭证
+    -->
+
+    <!-- OSS服务端点 - 根据您的Bucket所在区域填写 -->
+    <!-- 示例：华东1（杭州）：https://oss-cn-hangzhou.aliyuncs.com -->
+    <!-- 示例：华北2（北京）：https://oss-cn-beijing.aliyuncs.com -->
+    <!-- 示例：华南1（深圳）：https://oss-cn-shenzhen.aliyuncs.com -->
+    <string name="oss_endpoint">https://oss-cn-wuhan-lr.aliyuncs.com</string>
+
+    <!-- 阿里云AccessKey ID -->
+    <!-- 在阿里云控制台的"AccessKey管理"中创建 -->
+    <string name="oss_access_key_id">LTAI5tAiNrYEtYykvN9xNn3w</string>
+
+    <!-- 阿里云AccessKey Secret -->
+    <!-- 在阿里云控制台的"AccessKey管理"中创建 -->
+    <string name="oss_access_key_secret">JnRHqdTMBIoaONvEPNB8RyypZPADaM</string>
+
+    <!-- OSS存储桶名称 -->
+    <!-- 在阿里云OSS控制台创建Bucket时指定的名称 -->
+    <string name="oss_bucket_name">mini-notes</string>
+
+    <!-- OSS文件存储路径前缀 -->
+    <!-- 所有便签数据将存储在此路径下 -->
+    <string name="oss_file_prefix">notes/</string>
+
+    <!-- OSS连接超时时间（毫秒） -->
+    <integer name="oss_connection_timeout">300000</integer>
+
+    <!-- OSS Socket超时时间（毫秒） -->
+    <integer name="oss_socket_timeout">300000</integer>
+
+    <!-- OSS最大重试次数 -->
+    <integer name="oss_max_retry_count">30</integer>
+</resources>
diff --git a/src/res/values/strings.xml b/src/res/values/strings.xml
index 7c85b72..0b11910 100644
--- a/src/res/values/strings.xml
+++ b/src/res/values/strings.xml
@@ -17,139 +17,140 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Notes</string>
-    <string name="app_widget2x2">Notes 2x2</string>
-    <string name="app_widget4x4">Notes 4x4</string>
-    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
-    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <string name="app_name">小米便签</string>
+    <string name="app_widget2x2">便签 2x2</string>
+    <string name="app_widget4x4">便签 4x4</string>
+    <string name="widget_havenot_content">未找到关联便签，点击创建关联便签。</string>
+    <string name="widget_under_visit_mode">隐私模式，无法查看便签内容</string>
     <string name="notelist_string_info">...</string>
-    <string name="notelist_menu_new">Add note</string>
-    <string name="delete_remind_time_message">Delete reminder successfully</string>
-    <string name="set_remind_time_message">Set reminder</string>
-    <string name="note_alert_expired">Expired</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="delete_remind_time_message">删除提醒成功</string>
+    <string name="set_remind_time_message">设置提醒</string>
+    <string name="note_alert_expired">已过期</string>
     <string name="format_date_ymd">yyyyMMdd</string>
     <string name="format_datetime_mdhm">MMMd kk:mm</string>
-    <string name="notealert_ok">Got it</string>
-    <string name="notealert_enter">Take a look</string>
-    <string name="note_link_tel">Call</string>
-    <string name="note_link_email">Send email</string>
-    <string name="note_link_web">Browse web</string>
-    <string name="note_link_other">Open map</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notealert_enter">查看</string>
+    <string name="note_link_tel">拨打电话</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="note_link_other">打开地图</string>
     <!-- Text export file information -->
     <string name="file_path">/MIUI/notes/</string>
     <string name="file_name_txt_format">notes_%s.txt</string>
     <!-- notes list string -->
     <string name="format_folder_files_count">(%d)</string>
-    <string name="menu_create_folder">New Folder</string>
-    <string name="menu_export_text">Export text</string>
-    <string name="menu_sync">Sync</string>
-    <string name="menu_sync_cancel">Cancel syncing</string>
-    <string name="menu_setting">Settings</string>
-    <string name="menu_search">Search</string>
-    <string name="menu_delete">Delete</string>
-    <string name="menu_move">Move to folder</string>
-    <string name="menu_select_title">%d selected</string>
-    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
-    <string name="menu_select_all">Select all</string>
-    <string name="menu_deselect_all">Deselect all</string>
-    <string name="menu_font_size">Font size</string>
-    <string name="menu_font_small">Small</string>
-    <string name="menu_font_normal">Medium</string>
-    <string name="menu_font_large">Large</string>
-    <string name="menu_font_super">Super</string>
-    <string name="menu_list_mode">Enter check list</string>
-    <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_folder_view">View folder</string>
-    <string name="menu_folder_delete">Delete folder</string>
-    <string name="menu_folder_change_name">Change folder name</string>
-    <string name="menu_bold">Bold</string>
-    <string name="menu_italic">Italic</string>
-    <string name="menu_underline">Underline</string>
-    <string name="menu_strikethrough">Strikethrough</string>
-    <string name="menu_pin">Pin</string>
-    <string name="folder_exist">The folder %1$s exist, please rename</string>
-    <string name="menu_share">Share</string>
-    <string name="menu_insert_image">Insert image</string>
-    <string name="image_insert_title">Insert image</string>
-    <string name="image_insert_gallery">Choose from gallery</string>
-    <string name="image_insert_camera">Take a photo</string>
-    <string name="image_content_description">Attachment image</string>
-    <string name="delete_image">Delete image</string>
-    <string name="confirm_delete_image">Are you sure you want to delete this image?</string>
-    <string name="permission_denied">Permission denied, cannot access image</string>
-    <string name="image_added">Image added successfully</string>
-    <string name="image_deleted">Image deleted</string>
-    <string name="failed_to_add_image">Failed to add image</string>
-    <string name="camera_preview_title">Preview Photo</string>
-    <string name="camera_preview_image">Preview image</string>
-    <string name="camera_retake">Retake</string>
-    <string name="camera_confirm">Confirm</string>
-    <string name="menu_send_to_desktop">Send to home</string>
-    <string name="menu_alert">Remind me</string>
-    <string name="menu_remove_remind">Delete reminder</string>
-    <string name="menu_title_select_folder">Select folder</string>
-    <string name="menu_move_parent_folder">Parent folder</string>
-    <string name="info_note_enter_desktop">Note added to home</string>
-    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
-    <string name="alert_title_delete">Delete selected notes</string>
-    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
-    <string name="alert_message_delete_note">Confirm to delete this note?</string>
-    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_select_title">已选择 %d 项</string>
+    <string name="menu_select_none">未选择任何项目，操作无效</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_font_size">字体大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_normal">中</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_folder_delete">删除文件夹</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_bold">粗体</string>
+    <string name="menu_italic">斜体</string>
+    <string name="menu_underline">下划线</string>
+    <string name="menu_strikethrough">删除线</string>
+    <string name="menu_pin">置顶</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_insert_image">插入图片</string>
+    <string name="image_insert_title">插入图片</string>
+    <string name="image_insert_gallery">从相册选择</string>
+    <string name="image_insert_camera">拍照</string>
+    <string name="image_content_description">附件图片</string>
+    <string name="delete_image">删除图片</string>
+    <string name="confirm_delete_image">确定要删除这张图片吗？</string>
+    <string name="permission_denied">权限被拒绝，无法访问图片</string>
+    <string name="image_added">图片添加成功</string>
+    <string name="image_deleted">图片已删除</string>
+    <string name="failed_to_add_image">添加图片失败</string>
+    <string name="camera_preview_title">预览照片</string>
+    <string name="camera_preview_image">预览图片</string>
+    <string name="camera_retake">重拍</string>
+    <string name="camera_confirm">确认</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="menu_move_parent_folder">上级文件夹</string>
+    <string name="info_note_enter_desktop">便签已添加到桌面</string>
+    <string name="alert_message_delete_folder">确定要删除文件夹及其中的便签吗？</string>
+    <string name="alert_title_delete">删除选中的便签</string>
+    <string name="alert_message_delete_notes">确定要删除选中的 %d 条便签吗？</string>
+    <string name="alert_message_delete_note">确定要删除这条便签吗？</string>
+    <string name="format_move_notes_to_folder">已将选中的 %1$d 条便签移动到 %2$s 文件夹</string>
     <!-- Error information -->
-    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
-    <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_note_not_exist">The note is not exist</string>
-    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
-    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
-    <string name="success_sdcard_export">Export successful</string>
-    <string name="failed_sdcard_export">Export fail</string>
-    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="error_sdcard_unmounted">SD卡正忙，暂不可用</string>
+    <string name="error_sdcard_export">导出失败，请检查SD卡</string>
+    <string name="error_note_not_exist">便签不存在</string>
+    <string name="error_note_empty_for_clock">抱歉，无法在空白便签上设置闹钟</string>
+    <string name="error_note_empty_for_send_to_desktop">抱歉，无法将空白便签发送到桌面</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="format_exported_file_location">导出文本文件 (%1$s) 到SD卡 (%2$s) 目录</string>
 
-    <string name="preferences_title">Settings</string>
-    <string name="preferences_user_center_title">User Center</string>
-    <string name="preferences_user_center_summary">Current user: %1$s</string>
-    <string name="preferences_user_center_not_logged_in">Not logged in</string>
-    <string name="menu_login">Login</string>
-    <string name="menu_register">Register</string>
-    <string name="menu_logout">Logout</string>
-    <string name="toast_logout_success">Logout successful</string>
-    <string name="preferences_bg_random_appear_title">New note background color random</string>
-    <string name="preferences_elder_mode_title">Elder mode</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_user_center_title">用户中心</string>
+    <string name="preferences_user_center_summary">当前用户：%1$s</string>
+    <string name="preferences_user_center_not_logged_in">未登录</string>
+    <string name="menu_login">登录</string>
+    <string name="menu_register">注册</string>
+    <string name="menu_logout">退出登录</string>
+    <string name="toast_logout_success">退出登录成功</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_elder_mode_title">长辈模式</string>
 
-    <string name="button_delete">Delete</string>
-    <string name="call_record_folder_name">Call notes</string>
-    <string name="hint_foler_name">Input name</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="hint_foler_name">输入名称</string>
 
     <!-- 用户登录/注册相关字符串 -->
-    <string name="title_login">Login</string>
-    <string name="title_register">Register</string>
-    <string name="btn_login">Login</string>
-    <string name="btn_register">Register</string>
-    <string name="text_register_account">Don\'t have an account? Register</string>
-    <string name="hint_username">Username</string>
-    <string name="hint_login_password">Password</string>
-    <string name="hint_confirm_password">Confirm Password</string>
-    <string name="error_username_empty">Username cannot be empty</string>
-    <string name="error_login_failed">Username or password is incorrect</string>
-    <string name="error_username_exists">Username already exists</string>
-    <string name="error_register_failed">Registration failed</string>
-    <string name="toast_login_success">Login successful</string>
-    <string name="toast_register_success">Registration successful</string>
-    <string name="error_sync_not_available">Sync feature is no longer available</string>
+    <string name="title_login">登录</string>
+    <string name="title_register">注册</string>
+    <string name="btn_login">登录</string>
+    <string name="btn_register">注册</string>
+    <string name="cancel">取消</string>
+    <string name="text_register_account">还没有账号？立即注册</string>
+    <string name="hint_username">用户名</string>
+    <string name="hint_login_password">密码</string>
+    <string name="hint_confirm_password">确认密码</string>
+    <string name="error_username_empty">用户名不能为空</string>
+    <string name="error_login_failed">用户名或密码错误</string>
+    <string name="error_username_exists">用户名已存在</string>
+    <string name="error_register_failed">注册失败</string>
+    <string name="toast_login_success">登录成功</string>
+    <string name="toast_register_success">注册成功</string>
+    <string name="error_sync_not_available">同步功能已不再可用</string>
 
-    <string name="search_label">Searching Notes</string>
-    <string name="search_hint">Search notes</string>
-    <string name="search_setting_description">Text in your notes</string>
-    <string name="search">Notes</string>
-    <string name="datetime_dialog_ok">set</string>
-    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="search_label">搜索便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_setting_description">便签中的文本</string>
+    <string name="search">便签</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="datetime_dialog_cancel">取消</string>
     <plurals name="search_results_title">
-         <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+         <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> 条结果 \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->
-        <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+        <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> 条结果 \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
     </plurals>
 
-    <string name="change_background_color">Change background color</string>
+    <string name="change_background_color">更改背景颜色</string>
 
     <!-- 便签加锁相关字符串 -->
     <string name="menu_lock">加锁</string>
@@ -169,6 +170,8 @@
     <string name="title_change_password">修改密码</string>
     <string name="title_verify_password">验证密码</string>
     <string name="hint_enter_password">请输入密码</string>
+    <string name="btn_forgot_password">忘记密码</string>
+    <string name="title_forgot_password">忘记密码</string>
     <string name="hint_password">密码</string>
     <string name="hint_new_password">新密码</string>
     <string name="hint_old_password">原密码</string>
@@ -195,4 +198,7 @@
     <string name="error_folder_password_empty">密码不能为空</string>
     <string name="error_folder_password_wrong">密码错误</string>
 
+    <!-- OSS云同步相关字符串 -->
+    <string name="oss_config_invalid">OSS配置无效，请检查配置文件</string>
+    <string name="oss_upload_failed">上传到云端失败</string>
 </resources>
diff --git a/src/res/xml/preferences.xml b/src/res/xml/preferences.xml
index f007d0b..87639b8 100644
--- a/src/res/xml/preferences.xml
+++ b/src/res/xml/preferences.xml
@@ -28,10 +28,7 @@
             android:key="pref_key_bg_random_appear"
             android:title="@string/preferences_bg_random_appear_title"
             android:defaultValue="false" />
-        <CheckBoxPreference
-            android:key="pref_key_elder_mode"
-            android:title="@string/preferences_elder_mode_title"
-            android:defaultValue="false" />
+        <!-- 长辈模式已移除 -->
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/preferences_security_category">