yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_6.5.2'

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2023-05-17 16:20:10 +08:00
parent e28c6228ad 82b3b23470
commit c1c8921f59
50 changed files with 1926 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/res/values-zh/strings.xml
View File

@@ -1145,4 +1145,21 @@
<string name="delete_account2">點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？</string>
<string name="delete_account3">確認刪除</string>
<string name="complete_information">完整填寫領大禮</string>
<string name="dialog_live_gift_noble">該禮物是貴族專屬禮物噢~</string>
<string name="dialog_live_gift_guard">該禮物是守護專屬禮物噢~</string>
<string name="dialog_live_gift_fans">"該禮物是粉絲團專屬禮物噢~ "</string>
<string name="dialog_live_gift_open_noble">開通貴族</string>
<string name="dialog_live_gift_open_guard">開通守護</string>
<string name="dialog_live_gift_open_fans">開通粉絲團</string>
<string name="dialog_live_function_qa">發啟問答</string>
<string name="dialog_anchor_create_qa_submit">發啟問答</string>
<string name="dialog_anchor_create_qa_cancel">取消</string>
<string name="dialog_anchor_create_qa_question">問題設置：</string>
<string name="dialog_anchor_create_qa_answer">答案設置：</string>
<string name="live_vote_close_title">是否提前結束本次投票？</string>
<string name="live_vote_close_yes">是</string>
<string name="live_vote_close_no">否</string>
<string name="live_vote_hide_text">投票中</string>
<string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string>
<string name="live_anchor_vote_tip">請完整填寫</string>
</resources>