Merge branch 'main' into dev

frontend/src/Components/MarkdownEditor.svelte

@@ -156,7 +156,7 @@
 {:else}
     <Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} />
     {#if !value.display}
-    <button onclick={oncontextmenu}>{t('add content')}</button>
+    <button onclick={oncontextmenu}>{t('add_object',{object:t('content')})}</button>
     {/if}
 {/if}
 </div>

translations/src/main/resources/de.json

@@ -192,6 +192,8 @@
   "items": "Artikel",
 
   "join_objects" : "{objects} zusammenführen",
+
+  "kanban": "Kanban",
   "key": "Suchbegriff",
 
   "language": "Sprache",
@@ -307,6 +309,7 @@
   "project ({id})": "Projekt ({id})",
   "Project '{project}' was edited": "Projekt '{project}' wurde bearbeitet",
   "projects": "Projekte",
+  "Projects": "Projekte",
   "properties": "Eigenschaften",
   "property": "Eigenschaft",
   "purpose": "Zweck",

translations/src/main/resources/en.json

@@ -192,6 +192,8 @@
   "items": "items",
 
   "join_objects" : "join {objects}",
+
+  "kanban": "Kanban",
   "key": "search term",
 
   "language": "language",
@@ -307,6 +309,7 @@
   "project ({id})": "project ({id})",
   "Project '{project}' was edited": "Project '{project}' was edited",
   "projects": "projects",
+  "Projects": "projects",
   "properties": "properties",
   "property": "property",
   "purpose": "purpose",