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

Merge branch 'master' into dev_20221020

Browse Source
This commit is contained in:
zlzw
2022-10-20 17:40:57 +08:00
parent 6f40ff969d 3c6b4d13a9
commit 461a23a790
9 changed files with 88 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/res/layout/view_float_settings.xml
View File

@@ -76,12 +76,15 @@
android:textSize="15sp" />
<TextView
android:id="@+id/hint"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/system_window_hint"
android:textColor="#FF9A9A9A"
android:textSize="13.5sp" />
android:textSize="13.5sp"
android:focusable="true" />
</LinearLayout>
<ImageView

47
common/src/main/res/values-en/strings.xml
View File

@@ -892,32 +892,33 @@ Limited ride And limited avatar frame</string>
<string name="login_invalid">Login failed, please log in again</string>
<string name="onlookers">onlookers</string>
<string name="open_noble">的直播間開通了</string>
<string name="open_noble">The live broadcast studio was opened</string>
<string name="baron">baron</string>
<string name="viscount">子爵</string>
<string name="marquis">侯爵</string>
<string name="duke">公爵</string>
<string name="king">国王</string>
<string name="emperor">皇帝</string>
<string name="better_emperor">超皇</string>
<string name="viscount">viscount</string>
<string name="marquis">The marquis DE</string>
<string name="duke">The duke</string>
<string name="king">The king</string>
<string name="emperor">The emperor</string>
<string name="better_emperor">Super huang</string>
<string name="login_wait">Please wait...</string>
<string name="slide_settings">滑動設置</string>
<string name="up_slide_settings">上下滑動切換直播間</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>
<string name="cannot_yourself">無法@自己</string>
<string name="total_star_value">總星值</string>
<string name="number_of_people_assisted">助力人數</string>
<string name="star_change">%s星挑战</string>
<string name="star_success">恭喜 %s，完成了%s %s星 挑戰，快去一睹主播芳容吧！</string>
<string name="star">星</string>
<string name="small_window_settings">小窗播放設置</string>
<string name="small_window">小窗播放</string>
<string name="slide_settings">The slide set</string>
<string name="up_slide_settings">Slide up and down to switch the broadcast room</string>
<string name="live_say_something_a">\ @user nickname \t\t hello ~</string>
<string name="oline_list">oline_list</string>
<string name="search_want">Search for people who want @</string>
<string name="online_audience">The online audience</string>
<string name="audience">The audience</string>
<string name="cannot_yourself">can not \@ myself</string>
<string name="total_star_value">Total star</string>
<string name="number_of_people_assisted">The number of power</string>
<string name="star_change">%sStar challenge</string>
<string name="star_success">Congratulations %s, completed %s %s star challenge, go to meet the host face!</string>
<string name="star">star</string>
<string name="small_window_settings">Small window play Settings</string>
<string name="small_window">Small window to play</string>
<string name="app_window">Minimize Play</string>
<string name="app_window_hint">Show when exiting the live room</string>
<string name="system_window">ALL Minimize Play</string>
<string name="system_window_hint">Show on other apps and pages</string>
<string name="system_window_hint">Show on other apps and pages \n Need to open the display</string>
<string name="to_open_the">Go to open</string>
</resources>

5
common/src/main/res/values/strings.xml
View File

@@ -929,7 +929,8 @@
<string name="small_window_settings">小窗播放設置</string>
<string name="small_window">小窗播放</string>
<string name="app_window">APP內小窗播放</string>
<string name="app_window_hint">讓直播間內容在本APP主頁面中小窗播放</string>
<string name="app_window_hint">退出直播間時在主界面顯示小窗</string>
<string name="system_window">APP全應用小窗播放</string>
<string name="system_window_hint">讓直播間內容在所有APP及頁面中小窗播放</string>
<string name="system_window_hint">在其他應用上及所有界面显示小窗\n需打開懸浮窗權限。</string>
<string name="to_open_the">前往打開</string>
</resources>