Merge remote-tracking branch 'upstream/master'

# Conflicts: # app/src/main/java/io/legado/app/help/SourceAnalyzer.kt # app/src/main/res/values-es-rES/strings.xml # app/src/main/res/values-ja-rJP/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rHK/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values-zh/strings.xml # app/src/main/res/values/strings.xml
2022-09-02 11:25:50 +08:00
parent 15bae4b00a 2955e0bc2b
commit 406eb8bd84
52 changed files with 409 additions and 127 deletions
@@ -1023,4 +1023,6 @@
    <string name="post_review_url">发送回复URL（postReviewUrl）</string>
    <string name="post_quote_url">发送回复段评URL（postQuoteUrl）</string>
    <string name="delete_review_url">删除段评URL（deleteUrl）</string>
+    <string name="tag_explore_enabled">标志:发现已启用</string>
+    <string name="tag_explore_disabled">标志:发现已禁用</string>
 </resources>