Merge branch 'master' into master

This commit is contained in:
Xwite
2022-02-07 19:49:45 +08:00
committed by GitHub
19 changed files with 108 additions and 103 deletions
+1 -2
View File
@@ -9,8 +9,6 @@
<string name="menu_backup">Inicio</string>
<string name="menu_restore">Restaurar</string>
<string name="menu_import_old">Importar datos de Legado</string>
<string name="mkdirs">Crear carpeta</string>
<string name="mkdirs_description">Crea una carpeta de respaldo bajo el nombre de Legado.</string>
<string name="webdav_cache_backup">Respaldo de caché de libros sin conexión</string>
<string name="webdav_cache_backup_s">Exporta localmente lo respalda para su exportación</string>
<string name="backup_path">Respaldar para</string>
@@ -929,5 +927,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">子文件夹</string>
<!-- string end -->
</resources>
+1 -2
View File
@@ -9,8 +9,6 @@
<string name="menu_backup">Home</string>
<string name="menu_restore">Restore</string>
<string name="menu_import_old">Import Legado data</string>
<string name="mkdirs">Create a subfolder</string>
<string name="mkdirs_description">Create a folder named Legado as the backup folder.</string>
<string name="webdav_cache_backup">Offline cache book backup</string>
<string name="webdav_cache_backup_s">Export to local and back up to the exports directory under the legado folder</string>
<string name="backup_path">Backup to</string>
@@ -932,5 +930,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">子文件夹</string>
<!-- string end -->
</resources>
+1 -2
View File
@@ -9,8 +9,6 @@
<string name="menu_backup">Início</string>
<string name="menu_restore">Restaurar</string>
<string name="menu_import_old">Importar dados ao Legado</string>
<string name="mkdirs">Criar uma subpasta</string>
<string name="mkdirs_description">Criar uma pasta de Backup com o nome Legado.</string>
<string name="webdav_cache_backup">Backup do cache dos livros para leitura off-line</string>
<string name="webdav_cache_backup_s">Exportar localmente e fazer Backup à pasta de exportação</string>
<string name="backup_path">Backup para</string>
@@ -930,5 +928,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">子文件夹</string>
<!-- string end -->
</resources>
+1 -2
View File
@@ -8,8 +8,6 @@
<string name="menu_backup">Home</string>
<string name="menu_restore">還原</string>
<string name="menu_import_old">導入閲讀數據</string>
<string name="mkdirs">創建子文件夾</string>
<string name="mkdirs_description">創建 legado 文件夾作爲備份路徑</string>
<string name="webdav_cache_backup">離線緩存書籍備份</string>
<string name="webdav_cache_backup_s">導出本地同時備份到legado文件夾下exports目錄</string>
<string name="backup_path">備份路徑</string>
@@ -929,5 +927,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">子文件夹</string>
<!-- string end -->
</resources>
+1 -2
View File
@@ -8,8 +8,6 @@
<string name="menu_backup">備份</string>
<string name="menu_restore">復原</string>
<string name="menu_import_old">匯入閱讀資料</string>
<string name="mkdirs">建立子資料夾</string>
<string name="mkdirs_description">建立legado資料夾作為備份資料夾</string>
<string name="webdav_cache_backup">離線快取書籍備份</string>
<string name="webdav_cache_backup_s">匯出本機同時備份到legado資料夾下exports目錄</string>
<string name="backup_path">備份路徑</string>
@@ -931,5 +929,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">子文件夹</string>
<!-- string end -->
</resources>
+1 -2
View File
@@ -8,8 +8,6 @@
<string name="menu_backup">Home</string>
<string name="menu_restore">恢复</string>
<string name="menu_import_old">导入阅读数据</string>
<string name="mkdirs">创建子文件夹</string>
<string name="mkdirs_description">创建legado文件夹作为备份文件夹</string>
<string name="webdav_cache_backup">离线缓存书籍备份</string>
<string name="webdav_cache_backup_s">导出本地同时备份到legado文件夹下exports目录</string>
<string name="backup_path">备份路径</string>
@@ -931,5 +929,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">子文件夹</string>
<!-- string end -->
</resources>
+1 -2
View File
@@ -9,8 +9,6 @@
<string name="menu_backup">Home</string>
<string name="menu_restore">Restore</string>
<string name="menu_import_old">Import Legado data</string>
<string name="mkdirs">Create a subfolder</string>
<string name="mkdirs_description">Create a folder named Legado as the backup folder.</string>
<string name="webdav_cache_backup">Offline cache book backup</string>
<string name="webdav_cache_backup_s">Export to local and back up to the exports directory under the legado folder</string>
<string name="backup_path">Backup to</string>
@@ -932,5 +930,6 @@
<string name="less_than">小于</string>
<string name="check_source_config_summary">校验超时: %1$s秒\n校验项目:%2$s</string>
<string name="record_debug_log">记录调试日志</string>
<string name="sub_dir">Sub dir</string>
<!-- string end -->
</resources>
+3 -5
View File
@@ -27,11 +27,9 @@
android:summary="@string/web_dav_pw_s"
app:iconSpaceReserved="false" />
<io.legado.app.ui.widget.prefs.SwitchPreference
android:key="webDavCreateDir"
android:defaultValue="true"
android:title="@string/mkdirs"
android:summary="@string/mkdirs_description"
<io.legado.app.ui.widget.prefs.EditTextPreference
android:key="webDavDir"
android:title="@string/sub_dir"
app:allowDividerAbove="false"
app:allowDividerBelow="false"
app:iconSpaceReserved="false" />