Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

This commit is contained in:
hch
2024-03-22 10:14:07 +08:00
13 changed files with 53 additions and 27 deletions

View File

@@ -25,7 +25,7 @@
<string name="refresh_footer_nothing">No more data</string>
<string name="black">Pull black</string>
<string name="black_ing">Relieving blackout</string>
<string name="chat_remarks">Remarks</string>
<string name="chat_remarks">Modify remarks</string>
<string name="chat_report">Report</string>
<string name="bonus_sign">Sign in immediately</string>
<string name="bonus_sign_1">Continuously signed in</string>
@@ -781,7 +781,8 @@
<string name="black_add">Add to blacklist</string>
<string name="black_error">Failed to join blacklist</string>
<string name="black_succer_more">Blacklist removed successfully</string>
<string name="black_succer_more">Succeeded in removing the blacklist</string>
<string name="black_more">Remove blacklist</string>
<string name="black_error_more">Failed to remove blacklist</string>
<string name="reply">Reply</string>

View File

@@ -823,6 +823,7 @@
<string name="black_add">加入黑名單</string>
<string name="black_error">加入黑名单失败</string>
<string name="black_succer_more">移除黑名单成功</string>
<string name="black_more">移除黑名單</string>
<string name="black_error_more">移除黑名单失败</string>
<string name="reply">回復</string>

View File

@@ -823,6 +823,7 @@
<string name="black_add">加入黑名單</string>
<string name="black_error">加入黑名单失败</string>
<string name="black_succer_more">移除黑名单成功</string>
<string name="black_more">移除黑名單</string>
<string name="black_error_more">移除黑名单失败</string>
<string name="reply">回復</string>

View File

@@ -822,6 +822,7 @@
<string name="black_add">加入黑名單</string>
<string name="black_error">加入黑名單失敗</string>
<string name="black_succer_more">移除黑名單成功</string>
<string name="black_more">移除黑名單</string>
<string name="black_error_more">移除黑名單失敗</string>
<string name="reply">回復</string>

View File

@@ -25,7 +25,7 @@
<string name="refresh_footer_nothing">No more data</string>
<string name="black">Pull black</string>
<string name="black_ing">Relieving blackout</string>
<string name="chat_remarks">Remarks</string>
<string name="chat_remarks">Modify remarks</string>
<string name="chat_report">Report</string>
<string name="bonus_sign">Sign in immediately</string>
<string name="bonus_sign_1">Continuously signed in</string>
@@ -780,7 +780,8 @@
<string name="black_succer">Successfully joined the blacklist</string>
<string name="black_error">Failed to join blacklist</string>
<string name="black_succer_more">Blacklist removed successfully</string>
<string name="black_succer_more">Succeeded in removing the blacklist</string>
<string name="black_more">Remove blacklist</string>
<string name="black_error_more">Failed to remove blacklist</string>
<string name="reply">Reply</string>