Merge upstream/main and resolve conflicts
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -164,6 +164,7 @@
|
||||
<string name="create_group_chat">Create Group Chat</string>
|
||||
<string name="quick_create">Quick Create</string>
|
||||
<string name="group_name">Group Name</string>
|
||||
<string name="group_name_hint">Please enter the name of the group chat</string>
|
||||
<string name="search_placeholder">Search</string>
|
||||
<string name="group_info_add_other">添加其他人</string>
|
||||
<string name="group_info_notice_setting">通知</string>
|
||||
|
||||
Reference in New Issue
Block a user