Merge branch 'master' into dev_680_礼物展馆
# Conflicts: # 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 # gradle.properties # live/build.gradle
This commit is contained in:
@@ -1328,7 +1328,7 @@
|
||||
<string name="interactive_game_room_all">所有遊戲</string>
|
||||
<string name="interactive_game_create_room">創建房間</string>
|
||||
<string name="interactive_game_create_room_name">房間名稱:</string>
|
||||
<string name="interactive_game_create_room_number">房間號:</string>
|
||||
<string name="interactive_game_create_room_number">ID:</string>
|
||||
<string name="interactive_game_create_room_name_input">請輸入房間名</string>
|
||||
<string name="interactive_game_create_game_type">游戲類型:</string>
|
||||
<string name="interactive_game_create_game_sill">游戲門檻:</string>
|
||||
@@ -1502,4 +1502,8 @@
|
||||
<string name="pking_over">主播正在PK,稍後再試</string>
|
||||
<string name="gift_wall_achieve_put_on">佩戴</string>
|
||||
<string name="gift_wall_achieve_title">榮譽成就</string>
|
||||
<string name="live_guard_buy_coupon_tips_use">使用</string>
|
||||
<string name="live_guard_buy_coupon_tips_cancel">不使用</string>
|
||||
|
||||
<string name="sub_admission_fee">*將收取門檻的10%作為門票</string>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user