Merge branch 'dev_use_discounts'

# Conflicts:
#	common/src/main/res/values/strings.xml
This commit is contained in:
2023-03-31 17:27:24 +08:00
8 changed files with 294 additions and 47 deletions

View File

@@ -1109,5 +1109,8 @@
<string name="replacement_reset_confirmed_cancel3">当前心愿单未保存</string>
<string name="replacement_reset_confirmed_cancel4">不保存</string>
<string name="live_use_discount_content">您有一張%s是否使用使用後開通花費鉆石%s返還金豆%s</string>
<string name="live_use_discount_no">不使用</string>
<string name="live_use_discount_yes">使用</string>
</resources>