Merge remote-tracking branch 'origin/main' into feat/changes-md-reading

# Conflicts:
#	src/client/MarkdownHtml.tsx
This commit is contained in:
lhh010 committed 2026-09-06 22:59:56 +08:00
commit 8456d77a92
52 files changed
+1647 -51

No files matched your search

+14
View File
@@ -214,6 +214,13 @@ export const zh = {
addToConversation: '添加到对话',
copyRelative: '复制相对地址',
copyAbsolute: '复制绝对地址',
rename: '重命名',
renameInvalid: '名称不能为空,且不能包含路径分隔符。',
delete: '删除',
deleteTitle: '删除「{name}」?',
deleteDescFile: '将永久删除该文件,此操作不可撤销。',
deleteDescDir: '将永久删除该目录及其全部内容,此操作不可撤销。',
dismiss: '关闭',
download: '下载',
uploadFiles: '上传文件',
uploadFolder: '上传文件夹',
@@ -652,6 +659,13 @@ export const en: Record<keyof typeof zh, string> = {
addToConversation: 'Add to conversation',
copyRelative: 'Copy relative path',
copyAbsolute: 'Copy absolute path',
rename: 'Rename',
renameInvalid: 'The name cannot be empty or contain path separators.',
delete: 'Delete',
deleteTitle: 'Delete "{name}"?',
deleteDescFile: 'This permanently deletes the file. This cannot be undone.',
deleteDescDir: 'This permanently deletes the directory and everything inside it. This cannot be undone.',
dismiss: 'Dismiss',
download: 'Download',
uploadFiles: 'Upload files',
uploadFolder: 'Upload folder',