Merge branch 'dl2b'

Co-Authored-By: Claude Fable 5.1 <[email protected]>

# Conflicts:
#	apps/web/app/components/library/versions.tsx
This commit is contained in:
root committed 2026-09-29 22:15:35 +08:00
commit 606e97815f
11 files changed
+105 -35

No files matched your search

+8
View File
@@ -40,6 +40,14 @@ const REASONS: Record<string, ReasonText> = {
timeout: { text: "操作超时", action: "稍后重试" },
downloader_unavailable: { text: "下载器连不上", action: "在设置 → 下载器里测试连接" },
downloader_error: { text: "下载器报错", action: "查看下载器日志" },
// DL-2b:下载面板整理状态、下载计划里出现的码
blocked: { text: "有冲突要先处理", action: "去待处理" },
blocked_by_conflict: { text: "有冲突,暂不整理" },
transfer_failed: { text: "文件没有整理成功", action: "在整理记录里查看失败的文件" },
main_failed: { text: "主文件整理失败,附属文件一起跳过" },
not_imported_kind: { text: "这类文件不入库" },
target_root_not_managed: { text: "目标目录不是本工具管理的媒体库目录", action: "在设置 → 媒体库与目录里检查" },
download_removed: { text: "下载任务已从下载器删除" },
};
/**