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:
@@ -1427,4 +1427,11 @@ Limited ride And limited avatar frame</string>
|
||||
<string name="live_data_tip">* Non-real-time calculation of data</string>
|
||||
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
|
||||
<string name="live_data_msg1">This live information</string>
|
||||
<string name="message_chat_msg_read_tip">[Read]</string>
|
||||
<string name="message_chat_msg_unread_tip">[Unread]</string>
|
||||
<string name="all_chats">All Chats</string>
|
||||
<string name="online_only">Show Online </string>
|
||||
<string name="offline_only">Show Offline </string>
|
||||
<string name="read_only">Show Read </string>
|
||||
<string name="unread_only">Show Unread </string>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user