Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2

# Conflicts:
#	common/src/main/res/values-en-rUS/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle
This commit is contained in:
ningwenqiang
2024-09-06 14:05:47 +08:00
50 changed files with 2025 additions and 598 deletions

View File

@@ -1619,4 +1619,11 @@
<string name="live_data_msg2">歷史數據可在主播中心查看</string>
<string name="live_data_msg1">本場直播信息</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>