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

Merge branch 'master' into master_sud

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-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle
This commit is contained in:
18401019693
2023-10-07 14:46:22 +08:00
parent 916a1447f0 20ccb37ccf
commit c3d4cb8d62
58 changed files with 1184 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1314,6 +1314,11 @@
<string name="trial_coupon">是否使用試用劵</string>
<string name="use_diamonds">使用鑽石</string>
<string name="live_send_red_packge_fans_group">加入粉絲團</string>
<string name="live_pk_link_error">抱歉，您的網絡不佳拉取對方畫面失敗</string>
<string name="live_user_dialog_tips">這家夥很懶，什麽都沒留下</string>
<string name="live_free_pk_empty_tips">沒有找到匹配結果~</string>
<string name="live_gift_dialog_select_add">確定添加</string>
<string name="interactive_game">互動遊戲</string>
<string name="interactive_game_room_list">房間列表</string>
<string name="interactive_game_room_game">游戲:</string>