Merge remote-tracking branch 'origin/master'
# Conflicts: # common/src/main/res/values/strings.xml
This commit is contained in:
@@ -915,6 +915,11 @@
|
||||
<string name="slide_settings">滑動設置</string>
|
||||
<string name="up_slide_settings">上下滑動切換直播間</string>
|
||||
<string name="login_wait">請稍後</string>
|
||||
<string name="live_say_something_a">\@用户昵称\t\t你好啊~</string>
|
||||
<string name="oline_list">在线列表</string>
|
||||
<string name="search_want">搜索想要@的人</string>
|
||||
<string name="online_audience">在線觀眾</string>
|
||||
<string name="audience">觀眾</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user