Merge remote-tracking branch 'origin/develop' into feature/client_typescript_port1

This commit is contained in:
Elian Doran 2024-12-14 11:12:25 +02:00
commit bc756b1450
No known key found for this signature in database
2 changed files with 3 additions and 2 deletions

View File

@ -24,7 +24,7 @@ const TPL = `
<div>
<label>
<input type="checkbox" name="multiline-toolbar" />
Display the toolbar on multiple lines if it doesn't fit.
${t("editing.editor_type.multiline-toolbar")}
</label>
</div>
</div>

View File

@ -1555,7 +1555,8 @@
"fixed": {
"title": "Fixed",
"description": "editing tools appear in the \"Formatting\" ribbon tab."
}
},
"multiline-toolbar": "Display the toolbar on multiple lines if it doesn't fit."
}
},
"electron_context_menu": {