Merge branch 'staging' into 'master'

wording and spelling

See merge request !251

src/assets/i18n/creator/de.json

@@ -20,7 +20,7 @@
     "update": "Update",
     "changes-successful": "Änderungen erfolgreich.",
     "default-content-group": "Standard",
-    "description": "Beschreibung",
+    "description": "Beschreibung der Session",
     "present": "Präsentieren",
     "session-settings": "Session Einstellungen",
     "general": "Allgemein",
@@ -68,7 +68,7 @@
   },
   "session": {
     "session-name": "Name der Session",
-    "description": "Beschreibung",
+    "description": "Beschreibung der Session",
     "max-ls": "Max. Zeichen:",
     "create-session": "Session erstellen"
   },

src/assets/i18n/creator/en.json

@@ -20,7 +20,7 @@
     "update": "Update",
     "changes-successful": "Successfully updated.",
     "default-content-group": "Default",
-    "description": "Description",
+    "description": "Description of session",
     "present": "Present",
     "session-settings": "Session settings",
     "general": "General",
@@ -68,13 +68,13 @@
   },
   "session": {
     "session-name": "Session name",
-    "description": "Description",
-    "max-ls": "Max. letters / signs:",
+    "description": "Session description",
+    "max-ls": "Max. characters:",
     "create-session": "Create session"
   },
   "statistic": {
     "content": "Content",
-    "answer-statistic": "Answer statistic",
+    "answer-statistic": "Answer statistics",
     "answers": "Answers",
     "percentage": "Percentage",
     "abstentions": "Abstentions",

src/assets/i18n/home/de.json

@@ -4,7 +4,7 @@
 		"german": "Deutsch",
 		"logout": "Abmelden",
 		"guest": "Gast",
-		"logged-out": "Ausloggen erfolgreich.",
+		"logged-out": "Ausloggen erfolgreich",
 		"back": "Zurück",
 		"my-sessions": "Meine Sessions",
 		"visited-sessions": "Besuchte Sessions",

src/assets/i18n/home/en.json

@@ -6,8 +6,8 @@
 		"guest": "Guest",
 		"logged-out": "Logout successful",
 		"back": "Back",
-		"my-sessions": "My Sessions",
-		"visited-sessions": "Visited Sessions",
+		"my-sessions": "My sessions",
+		"visited-sessions": "Visited sessions",
     "change-theme": "Change theme",
     "change-language": "Change language",
     "login": "Login",
@@ -23,15 +23,15 @@
 		"welcome": "Welcome to"
 	},
 	"home-page": {
-		"join-demo-session": "Join demo-session",
+		"join-demo-session": "Join demo session",
 		"session-id": "Session ID",
-		"no-room-found": "No session was found with this ID.",
-		"please-enter": "Please enter a session ID.",
+		"no-room-found": "No session found with this ID",
+		"please-enter": "Please enter a session ID",
 		"exactly-8": "A session ID has exactly 8 digits.",
-		"create-session": "New Session",
+		"create-session": "New session",
 		"no-empty-name": "Please enter a name.",
 		"created-1": "Session '",
-		"created-2": "' successfully created",
+		"created-2": "' Successfully created",
 		"only-numbers": "A session ID only contains digits.",
         "update-available": "A newer version is available.",
         "install": "Install"
@@ -58,11 +58,11 @@
 		"email-required": "E-mail required",
 		"input-incorrect": "Please check your data.",
 		"reset-password": "Reset password",
-		"reset-successful": "Password was reset. Please check your mail."
+		"reset-successful": "Password was reset. Please check your mails."
 	},
 	"register": {
 		"email": "E-mail",
-		"email-verify": "Verify E-mail",
+		"email-verify": "Verify e-mail",
 		"email-invalid": "E-mail is invalid.",
 		"email-required": "E-mail required",
 		"email-unmatch": "E-mails do not match.",
@@ -71,7 +71,7 @@
 		"password-unmatch": "Passwords do not match.",
 		"password-verify": "Verify password",
 		"register": "Register",
-		"register-successful": "Successfully registered. Please check your mail.",
+		"register-successful": "Successfully registered. Please check your mails.",
 		"register-unsuccessful": "Please check your data.",
 		"register-request-error": "Something went wrong with the registration. Maybe you already made the account?"
 	},

src/assets/i18n/participant/de.json

@@ -7,7 +7,7 @@
   "room-page": {
     "comments": "Kommentare",
     "learn": "Lernen",
-    "create-comment": "Kommentar abgeben",
+    "create-comment": "Kommentar schreiben",
     "give-feedback": "Feedback geben",
     "live-feedback": "Live Feedback",
     "answer-statistics": "Statistiken",
@@ -31,7 +31,7 @@
     "search": "Suchen",
     "filter-comments": "Kommentare filtern",
     "sort-comments": "Kommentare sortieren",
-    "add-comment": "Kommentar erstellen"
+    "add-comment": "Kommentar schreiben"
   },
   "answer": {
     "submit": "Absenden",

src/assets/i18n/participant/en.json

 {
   "home-page": {
-    "no-room-found": "No session was found with this ID.",
-    "please-enter": "Please enter a session ID.",
-    "exactly-8": "A session-ID has exactly 8 digits."
+    "no-room-found": "No session found with this ID",
+    "please-enter": "Please enter a session ID",
+    "exactly-8": "A session ID has exactly 8 digits."
   },
   "room-page": {
     "comments": "Comments",
     "learn": "Learn",
-    "create-comment": "Create comment",
+    "create-comment": "Write a comment",
     "give-feedback": "Give feedback",
     "live-feedback": "Live feedback",
     "answer-statistics": "Statistics",
@@ -20,9 +20,9 @@
     "send": "Send",
     "abort": "Cancel",
     "error-title": "Please enter a title.",
-    "error-comment": "Please enter a comment-text.",
+    "error-comment": "Please enter a text.",
     "error-both-fields": "Please fill in all fields.",
-    "no-comments": "No comments have been created yet ...",
+    "no-comments": "No comments have been written yet ...",
     "correct": "Correct",
     "favorite": "Favorite",
     "read": "Read"
@@ -45,7 +45,7 @@
   },
   "statistic": {
     "content": "Content",
-    "answer-statistic": "Answer statistic",
+    "answer-statistic": "Answer statistics",
     "answers": "Answers",
     "percentage": "Percentage",
     "abstentions": "Abstentions",