gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve code conflict in book.js

Browse Source
This commit is contained in:
Nriver 2024-08-07 11:48:24 +08:00
parent 8f6087068e
commit 3d955abd31
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/translations/cn/translation.json
View File

@ -868,7 +868,7 @@
"no_attachments": "此笔记没有附件。" "no_attachments": "此笔记没有附件。"
}, },
"book": { "book": {
"no_children_help": "此类型为书籍的笔记没有任何子笔记，因此没有内容显示。请参阅 <a href=\"https://github.com/zadam/trilium/wiki/Book-note\">wiki</a> 了解详情" "no_children_help": "此类型为书籍的笔记没有任何子笔记，因此没有内容显示。请参阅 <a href=\"https://github.com/TriliumNext/Docs/blob/main/Wiki/book-note.md\">wiki</a> 了解详情"
}, },
"editable_code": { "editable_code": {
"placeholder": "在这里输入您的代码笔记内容..." "placeholder": "在这里输入您的代码笔记内容..."

2
src/public/translations/en/translation.json
View File

@ -869,7 +869,7 @@
"no_attachments": "This note has no attachments." "no_attachments": "This note has no attachments."
}, },
"book": { "book": {
"no_children_help": "This note of type Book doesn't have any child notes so there's nothing to display. See <a href=\"https://github.com/zadam/trilium/wiki/Book-note\">wiki</a> for details." "no_children_help": "This note of type Book doesn't have any child notes so there's nothing to display. See <a href=\"https://github.com/TriliumNext/Docs/blob/main/Wiki/book-note.md\">wiki</a> for details."
}, },
"editable_code": { "editable_code": {
"placeholder": "Type the content of your code note here..." "placeholder": "Type the content of your code note here..."