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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	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
This commit is contained in:
zlzw 2023-05-17 16:48:02 +08:00
commit 17decb63fa
4 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/res/values-en-rUS/string.xml
View File

@ -1149,6 +1149,17 @@ Limited ride And limited avatar frame</string>
<string name="delete_account1">Do you want to delete the account</string> <string name="delete_account1">Do you want to delete the account</string>
<string name="delete_account2">After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue?</string> <string name="delete_account2">After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue?</string>
<string name="delete_account3">Confirm deletion</string> <string name="delete_account3">Confirm deletion</string>
<string name="complete_information">Fill And gift</string>
<string name="complete_information_consumable">Fill in the \'*\' option to complete</string>
<string name="love_powder">True love powder\nPhoto Frame(7 days)</string>
<string name="golden_beans_128">128 Golden Beans</string>
<string name="love_powder_medal">True love powder\nMedal (7 days)</string>
<string name="man_student">MAN</string>
<string name="girl_student">GIRL</string>
<string name="complete_information_hint">Backpack, please check</string>
<string name="complete_information_hint3">Leave without a gift</string>
<string name="complete_information_hint2">Love you</string>
<string name="you_guide_me">Can you guide me</string>
<string name="dialog_live_gift_noble">This gift is exclusive to the nobility~</string> <string name="dialog_live_gift_noble">This gift is exclusive to the nobility~</string>
<string name="dialog_live_gift_guard">"This gift is exclusive to guardianship~ "</string> <string name="dialog_live_gift_guard">"This gift is exclusive to guardianship~ "</string>
<string name="dialog_live_gift_fans">This gift is exclusive to the fan group~</string> <string name="dialog_live_gift_fans">This gift is exclusive to the fan group~</string>

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

@ -1161,4 +1161,15 @@
<string name="live_vote_hide_text">投票中</string> <string name="live_vote_hide_text">投票中</string>
<string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string> <string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string>
<string name="live_anchor_vote_tip">請完整填寫</string> <string name="live_anchor_vote_tip">請完整填寫</string>
<string name="complete_information_consumable">填寫“*”的選項可完成</string>
<string name="love_powder">真愛粉\n頭像框(7天)</string>
<string name="golden_beans_128">128金豆</string>
<string name="love_powder_medal">真愛粉\n勛章(7天)</string>
<string name="man_student">男生</string>
<string name="girl_student">女生</string>
<string name="complete_information_hint">已將獎勵發送至您的背包，請注意查看。</string>
<string name="complete_information_hint3">離開會讓您失去獎勵，您確認離開嗎？</string>
<string name="complete_information_hint2">愛你，愛你</string>
<string name="you_guide_me">指導下我好嗎</string>
<string name="complete_information">完整填寫領大禮</string>
</resources> </resources>

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

@ -1160,4 +1160,15 @@
<string name="live_vote_hide_text">投票中</string> <string name="live_vote_hide_text">投票中</string>
<string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string> <string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string>
<string name="live_anchor_vote_tip">請完整填寫</string> <string name="live_anchor_vote_tip">請完整填寫</string>
<string name="complete_information_consumable">填寫“*”的選項可完成</string>
<string name="love_powder">真愛粉\n頭像框(7天)</string>
<string name="golden_beans_128">128金豆</string>
<string name="love_powder_medal">真愛粉\n勛章(7天)</string>
<string name="man_student">男生</string>
<string name="girl_student">女生</string>
<string name="complete_information_hint">已將獎勵發送至您的背包，請注意查看。</string>
<string name="complete_information_hint3">離開會讓您失去獎勵，您確認離開嗎？</string>
<string name="complete_information_hint2">愛你，愛你</string>
<string name="you_guide_me">指導下我好嗎</string>
<string name="complete_information">完整填寫領大禮</string>
</resources> </resources>

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

@ -1162,4 +1162,14 @@
<string name="live_vote_hide_text">投票中</string> <string name="live_vote_hide_text">投票中</string>
<string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string> <string name="live_room_vote_over_tip">%s \n 問答框%s秒后消失</string>
<string name="live_anchor_vote_tip">請完整填寫</string> <string name="live_anchor_vote_tip">請完整填寫</string>
<string name="complete_information_consumable">填寫“*”的選項可完成</string>
<string name="love_powder">真愛粉\n頭像框(7天)</string>
<string name="golden_beans_128">128金豆</string>
<string name="love_powder_medal">真愛粉\n勛章(7天)</string>
<string name="man_student">男生</string>
<string name="girl_student">女生</string>
<string name="complete_information_hint">已將獎勵發送至您的背包，請注意查看。</string>
<string name="complete_information_hint3">離開會讓您失去獎勵，您確認離開嗎？</string>
<string name="complete_information_hint2">愛你，愛你</string>
<string name="you_guide_me">指導下我好嗎</string>
</resources> </resources>