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
This commit is contained in:
kunfei
2022-05-30 20:42:08 +08:00
24 changed files with 104 additions and 25 deletions
+3 -1
View File
@@ -992,6 +992,8 @@
<string name="download_book_fail">Download Fail</string>
<string name="upload_to_remote">Upload</string>
<string name="add_remote_book">WebDavBook</string>
<string name="bitmap_cache_size_summary">Current cache max size %1$s MB</string>
<string name="bitmap_cache_size">bitmap cache size</string>
<string name="export_pics_file">Export Picture Files</string>
<!-- string end -->
</resources>