Merge branch 'main' into dev

translations/src/main/resources/de.json

@@ -18,6 +18,7 @@
 
   "cancel": "abbrechen",
   "choose_type": "Typ wählen",
+  "click_to_edit": "Anklicken zum Bearbeiten",
   "client_id": "Client-ID",
   "client_secret": "Client-Geheimnis",
   "close_settings": "Einstellungen schließen",
@@ -137,15 +138,16 @@
   "login_services": "Login-Services",
   "logout": "Abmelden",
   "logout_user": "{user} abmelden",
-  "long_click_to_edit": "lang klicken zum Bearbeiten",
 
   "markdown_code": "Markdown-Code",
+  "markdown_supported": "Markdown & Plantuml nutzbar!",
   "MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
   "member": "Mitarbeiter",
   "members": "Mitarbeiter",
   "message": "Nachricht",
   "messages": "Benachrichtigungen",
   "miscellaneous_settings": "sonstige Einstellungen",
+  "mismatch": "ungleich",
   "model": "Modell",
   "models": "Modelle",
   "module": {
@@ -166,7 +168,6 @@
     "user": "Benutzer",
     "wiki": "Wiki"
   },
-  "mismatch": "ungleich",
   "month": "Monat",
   "must_not_be_empty": "darf nicht leer sein",
 
@@ -215,6 +216,7 @@
   "region": "Bundesland",
   "repeat_new_password": "Wiederholung",
   "results": "Ergebnisse",
+  "right_click_to_edit": "Rechts-Klick zum Bearbeiten",
 
   "save": "speichern",
   "saved": "gespeichert",

translations/src/main/resources/en.json

@@ -18,6 +18,7 @@
 
   "cancel": "cancel",
   "choose_type": "choose type",
+  "click_to_edit": "click to edit",
   "client_id": "client ID",
   "client_secret": "client secret",
   "close_settings": "close settings",
@@ -38,7 +39,7 @@
   "contained_tax": "contained tax",
   "content": "content",
   "context": "context",
-  "count_of_occurrences": "{count} occurences",
+  "count_of_occurrences": "{count} occurrences",
   "country": "country",
   "COURT": "local court",
   "CUSTOMER-NUMBER": "customer number",
@@ -118,7 +119,6 @@
   "IMPERSONATE": "impersonate",
   "index_page": "task overview",
   "invoice": "invoice",
-  "item": "item",
   "items": "items",
 
   "join_objects" : "join {objects}",
@@ -137,15 +137,16 @@
   "login_services": "login service",
   "logout": "logout",
   "logout_user": "logout {user}",
-  "long_click_to_edit": "click long to edit",
 
   "markdown_code": "Markdown-Code",
+  "markdown_supported": "Markdown & Plantuml supported!",
   "MANAGE_LOGIN_SERVICES": "manage login services",
   "member": "member",
   "members": "members",
   "message": "message",
   "messages": "messages",
   "miscellaneous_settings": "miscellaneous settings",
+  "mismatch": "mismatch",
   "model": "model",
   "models": "models",
   "module": {
@@ -166,7 +167,6 @@
     "user": "Users",
     "wiki": "wiki"
   },
-  "mismatch": "mismatch",
   "month": "month",
   "must_not_be_empty": "must not be empty",
 
@@ -215,6 +215,7 @@
   "region": "region",
   "repeat_new_password": "repeat new password",
   "results": "results",
+  "right_click_to_edit": "right click to edit",
 
   "save": "save",
   "saved": "saved",