noproxy which forces ignoring even the system proxy and respects NODE_TLS_REJECT_UNAUTHORIZED.",
+ "config_title": "Sync Server",
+ "server_address": "Server address",
+ "server_address_description": "URL of the Trilium server to sync with.",
+ "timeout": "Connection timeout",
+ "timeout_description": "Time to wait before giving up on a slow connection.",
+ "proxy_label": "Proxy server",
+ "proxy_description": "Leave blank to use system proxy (desktop only). Use \"noproxy\" to bypass all proxies.",
"save": "Save",
"help": "Help",
- "test_title": "Sync Test",
- "test_description": "This will test the connection and handshake to the sync server. If the sync server isn't initialized, this will set it up to sync with the local document.",
+ "test_title": "Test Connection",
+ "test_description": "Test the connection to the sync server. If not initialized, this will set up syncing.",
"test_button": "Test sync",
"handshake_failed": "Sync server handshake failed, error: {{message}}"
},
@@ -1903,6 +1941,7 @@
"editing": {
"editor_type": {
"label": "Formatting toolbar",
+ "toolbar_style": "Toolbar style",
"floating": {
"title": "Floating",
"description": "editing tools appear near the cursor;"
@@ -1911,7 +1950,7 @@
"title": "Fixed",
"description": "editing tools appear in the \"Formatting\" ribbon tab."
},
- "multiline-toolbar": "Display the toolbar on multiple lines if it doesn't fit."
+ "multiline-toolbar": "Display the toolbar on multiple lines if it doesn't fit"
}
},
"electron_context_menu": {
@@ -1978,7 +2017,7 @@
"days": "Days"
},
"share": {
- "title": "Share Settings",
+ "title": "Share",
"redirect_bare_domain": "Redirect bare domain to Share page",
"redirect_bare_domain_description": "Redirect anonymous users to the Share page instead of showing Login",
"show_login_link": "Show Login link in Share theme",
@@ -2042,12 +2081,12 @@
},
"editorfeatures": {
"title": "Features",
- "emoji_completion_enabled": "Enable Emoji auto-completion",
- "emoji_completion_description": "If enabled, emojis can be easily inserted into text by typing `:`, followed by the name of an emoji.",
- "note_completion_enabled": "Enable note auto-completion",
- "note_completion_description": "If enabled, links to notes can be created by typing `@` followed by the title of a note.",
- "slash_commands_enabled": "Enable slash commands",
- "slash_commands_description": "If enabled, editing commands such as inserting line breaks or headings can be toggled by typing `/`."
+ "emoji_completion_enabled": "Emoji auto-completion",
+ "emoji_completion_description": "Emojis can be easily inserted into text by typing `:`, followed by the name of an emoji.",
+ "note_completion_enabled": "Note auto-completion",
+ "note_completion_description": "Links to notes can be created by typing `@` followed by the title of a note.",
+ "slash_commands_enabled": "Slash commands",
+ "slash_commands_description": "Editing commands such as inserting line breaks or headings can be toggled by typing `/`."
},
"table_view": {
"new-row": "New row",
@@ -2166,6 +2205,8 @@
"related_code_blocks": "Color scheme for code blocks in text notes",
"related_code_notes": "Color scheme for code notes",
"ui": "User interface",
+ "ui_layout_style": "Layout style",
+ "ui_layout_orientation": "Launcher bar orientation",
"ui_old_layout": "Old layout",
"ui_new_layout": "New layout"
},
diff --git a/apps/client/src/widgets/react/FormSelect.tsx b/apps/client/src/widgets/react/FormSelect.tsx
index 6c23405434..b8f10c1536 100644
--- a/apps/client/src/widgets/react/FormSelect.tsx
+++ b/apps/client/src/widgets/react/FormSelect.tsx
@@ -24,14 +24,15 @@ interface FormSelectProps- {t("fonts.apply_font_changes")} -
-{description}
} {children} + + ); + + if (noCard) { + return ( +