Merge remote-tracking branch 'origin/master'
# 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:
@@ -1162,4 +1162,14 @@
|
||||
<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>
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user