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

Merge remote-tracking branch 'origin/语音房_6.6.4_'

Browse Source 
# 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:
18401019693
2024-01-15 10:03:00 +08:00
parent 7627219e77 f22f8fcb4b
commit 0b15df41b8
70 changed files with 2926 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/res/values-en-rUS/string.xml
View File

@@ -666,7 +666,7 @@
<string name="receive_awards">ReceiveAwards</string>
<string name="one_free">One free gift privilege!</string>
<string name="send">Send out</string>
<string name="send">Send</string>
<string name="sorry">I am sorry</string>
<string name="video">video</string>
<string name="FILE_PROVIDER">myname.pdlive.shayu.fileprovider</string>
@@ -1441,4 +1441,8 @@ Limited ride And limited avatar frame</string>
<string name="sys_msg_day"></string>
<string name="main_suspension_war_order">BattlePass</string>
<string name="game_review_input">Comment</string>
<string name="game_review_view_information">Information</string>
<string name="game_review_view_unmute">Unmute</string>
<string name="game_review_view_sound_off">Mute</string>
</resources>