Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/assets/updateLog.md # 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-05-30 20:42:08 +08:00
parent ff8f06c578 e41a457c6b
commit bacfe8f3e2
24 changed files with 104 additions and 25 deletions
@@ -991,6 +991,8 @@
    <string name="download_book_fail">Download Fail</string>
    <string name="upload_to_remote">Upload</string>
    <string name="add_remote_book">WebDav书籍</string>
-
+    <string name="bitmap_cache_size_summary">当前最大缓存 %1$s MB</string>
+    <string name="bitmap_cache_size">图片绘制缓存</string>
+    <string name="export_pics_file">TXT导出图片</string>
    <!-- string end -->
 </resources>