diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 63901da7cf..d65b909313 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,7 +14,7 @@ "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", - "@seafile/sdoc-editor": "0.5.47", + "@seafile/sdoc-editor": "0.5.48", "@seafile/seafile-calendar": "0.0.12", "@seafile/seafile-editor": "1.0.82", "@uiw/codemirror-extensions-langs": "^4.19.4", @@ -4615,9 +4615,9 @@ "integrity": "sha512-8rBbmAEuuwOAGHYGCtEzpx+bxAcGS+V30otMmhRe7bPAdh4E57RWgCa8x7pkzHGFlY1t5d+ILz1gojvPVMYQig==" }, "node_modules/@seafile/sdoc-editor": { - "version": "0.5.47", - "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.5.47.tgz", - "integrity": "sha512-FGm9w6Px8MB8k6kk/6VYdl1Wdg5ZZfBkLqXNyuEEn0DYFY86p3JEmR3dnj75diH5N2nW0bFt8Lz11i7aX7tGkw==", + "version": "0.5.48", + "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.5.48.tgz", + "integrity": "sha512-n8kagm3v2b9SDBikRvxnx8uzWENsIQ4aNF67UqNzltrUcicciVI6djZt2aIlSvMnIuEnPJtwvbmFe6s4DfQjvg==", "dependencies": { "@seafile/print-js": "1.6.5", "@seafile/react-image-lightbox": "2.0.4", @@ -31226,9 +31226,9 @@ "integrity": "sha512-8rBbmAEuuwOAGHYGCtEzpx+bxAcGS+V30otMmhRe7bPAdh4E57RWgCa8x7pkzHGFlY1t5d+ILz1gojvPVMYQig==" }, "@seafile/sdoc-editor": { - "version": "0.5.47", - "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.5.47.tgz", - "integrity": "sha512-FGm9w6Px8MB8k6kk/6VYdl1Wdg5ZZfBkLqXNyuEEn0DYFY86p3JEmR3dnj75diH5N2nW0bFt8Lz11i7aX7tGkw==", + "version": "0.5.48", + "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.5.48.tgz", + "integrity": "sha512-n8kagm3v2b9SDBikRvxnx8uzWENsIQ4aNF67UqNzltrUcicciVI6djZt2aIlSvMnIuEnPJtwvbmFe6s4DfQjvg==", "requires": { "@seafile/print-js": "1.6.5", "@seafile/react-image-lightbox": "2.0.4", diff --git a/frontend/package.json b/frontend/package.json index baf0c1df02..1b58546dc7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,7 @@ "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", - "@seafile/sdoc-editor": "0.5.47", + "@seafile/sdoc-editor": "0.5.48", "@seafile/seafile-calendar": "0.0.12", "@seafile/seafile-editor": "1.0.82", "@uiw/codemirror-extensions-langs": "^4.19.4", diff --git a/media/sdoc-editor/locales/cs/sdoc-editor.json b/media/sdoc-editor/locales/cs/sdoc-editor.json index 1f2df1402e..850d4b8746 100644 --- a/media/sdoc-editor/locales/cs/sdoc-editor.json +++ b/media/sdoc-editor/locales/cs/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Alignment", "Print": "Print", "Enter_more_character_start_search": "Enter more characters to start search", - "Create_file_name_sdoc": "Create {{file_name_sdoc}}" + "Create_file_name_sdoc": "Create {{file_name_sdoc}}", + "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?" } diff --git a/media/sdoc-editor/locales/de/sdoc-editor.json b/media/sdoc-editor/locales/de/sdoc-editor.json index dd873d8eeb..4e16b07875 100644 --- a/media/sdoc-editor/locales/de/sdoc-editor.json +++ b/media/sdoc-editor/locales/de/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Alignment", "Print": "Drucken", "Enter_more_character_start_search": "Enter more characters to start search", - "Create_file_name_sdoc": "Create {{file_name_sdoc}}" + "Create_file_name_sdoc": "Create {{file_name_sdoc}}", + "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?" } diff --git a/media/sdoc-editor/locales/en/sdoc-editor.json b/media/sdoc-editor/locales/en/sdoc-editor.json index c88b4f2c33..2f7cd7841a 100644 --- a/media/sdoc-editor/locales/en/sdoc-editor.json +++ b/media/sdoc-editor/locales/en/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Alignment", "Print": "Print", "Enter_more_character_start_search": "Enter more characters to start search", - "Create_file_name_sdoc": "Create {{file_name_sdoc}}" + "Create_file_name_sdoc": "Create {{file_name_sdoc}}", + "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?" } diff --git a/media/sdoc-editor/locales/es/sdoc-editor.json b/media/sdoc-editor/locales/es/sdoc-editor.json index a5827bf696..e4200cbfdf 100644 --- a/media/sdoc-editor/locales/es/sdoc-editor.json +++ b/media/sdoc-editor/locales/es/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Alignment", "Print": "Print", "Enter_more_character_start_search": "Enter more characters to start search", - "Create_file_name_sdoc": "Create {{file_name_sdoc}}" + "Create_file_name_sdoc": "Create {{file_name_sdoc}}", + "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?" } diff --git a/media/sdoc-editor/locales/fr/sdoc-editor.json b/media/sdoc-editor/locales/fr/sdoc-editor.json index d10d18f4cc..e830e4baa3 100644 --- a/media/sdoc-editor/locales/fr/sdoc-editor.json +++ b/media/sdoc-editor/locales/fr/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Alignment", "Print": "Imprimer", "Enter_more_character_start_search": "Enter more characters to start search", - "Create_file_name_sdoc": "Create {{file_name_sdoc}}" + "Create_file_name_sdoc": "Create {{file_name_sdoc}}", + "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?" } diff --git a/media/sdoc-editor/locales/it/sdoc-editor.json b/media/sdoc-editor/locales/it/sdoc-editor.json index dea2aa17b0..b3a5393c68 100644 --- a/media/sdoc-editor/locales/it/sdoc-editor.json +++ b/media/sdoc-editor/locales/it/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Alignment", "Print": "Print", "Enter_more_character_start_search": "Enter more characters to start search", - "Create_file_name_sdoc": "Create {{file_name_sdoc}}" + "Create_file_name_sdoc": "Create {{file_name_sdoc}}", + "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?" } diff --git a/media/sdoc-editor/locales/ru/sdoc-editor.json b/media/sdoc-editor/locales/ru/sdoc-editor.json index ceee031062..9ed3c205cd 100644 --- a/media/sdoc-editor/locales/ru/sdoc-editor.json +++ b/media/sdoc-editor/locales/ru/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "Выравнивание", "Print": "Печать", "Enter_more_character_start_search": "Введите больше символов, чтобы начать поиск", - "Create_file_name_sdoc": "Создать {{file_name_sdoc}}" + "Create_file_name_sdoc": "Создать {{file_name_sdoc}}", + "Source_document_changed_tip": "Исходный документ имеет параллельные изменения. Хотите объединить эти изменения в ревизию?" } diff --git a/media/sdoc-editor/locales/zh-CN/sdoc-editor.json b/media/sdoc-editor/locales/zh-CN/sdoc-editor.json index 31aedb3a7a..f094c39ee0 100644 --- a/media/sdoc-editor/locales/zh-CN/sdoc-editor.json +++ b/media/sdoc-editor/locales/zh-CN/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "对齐方式", "Print": "打印", "Enter_more_character_start_search": "输入更多字符开始搜索", - "Create_file_name_sdoc": "新建 {{file_name_sdoc}}" + "Create_file_name_sdoc": "新建 {{file_name_sdoc}}", + "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?" } diff --git a/media/sdoc-editor/locales/zh_CN/sdoc-editor.json b/media/sdoc-editor/locales/zh_CN/sdoc-editor.json index 31aedb3a7a..f094c39ee0 100644 --- a/media/sdoc-editor/locales/zh_CN/sdoc-editor.json +++ b/media/sdoc-editor/locales/zh_CN/sdoc-editor.json @@ -455,5 +455,6 @@ "Alignment_type": "对齐方式", "Print": "打印", "Enter_more_character_start_search": "输入更多字符开始搜索", - "Create_file_name_sdoc": "新建 {{file_name_sdoc}}" + "Create_file_name_sdoc": "新建 {{file_name_sdoc}}", + "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?" }