Merge upstream/main and resolve conflicts

2025-08-25 18:47:35 +08:00
parent df75c710e5
commit f2ab55d545
6 changed files with 114 additions and 33 deletions
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -169,6 +169,7 @@
    <string name="create_group_chat">创建群聊</string>
    <string name="quick_create">一键创建</string>
    <string name="group_name">群聊名称</string>
+    <string name="group_name_hint">请输入群聊名称</string>
    <string name="search_placeholder">搜索</string>
    <string name="group_info_add_other">添加其他人</string>
    <string name="group_info_notice_setting">通知</string>