Merge remote-tracking branch 'origin/新潘多拉' into 新潘多拉

# Conflicts:
#	app/tmp/full-r8-config.txt
#	gradle.properties
This commit is contained in:
18142669586
2024-09-05 17:16:03 +08:00
32 changed files with 1595 additions and 369 deletions

View File

@@ -1604,5 +1604,11 @@
<string name="live_end_view_ban_reason">違規原因:</string>
<string name="live_end_view_ban_content">處罰內容:</string>
<string name="live_end_view_ban_timer">處罰時間:</string>
<string name="message_chat_msg_read_tip">[已讀]</string>
<string name="message_chat_msg_unread_tip">[未讀]</string>
<string name="all_chats">全部聊天</string>
<string name="online_only">僅展示在線</string>
<string name="offline_only">僅展示離線</string>
<string name="read_only">展示對方已讀</string>
<string name="unread_only">展示對方未讀</string>
</resources>