Merge branch 'staging' into 'master'

wording

See merge request arsnova/arsnova-lite!347

src/assets/i18n/creator/de.json

@@ -108,7 +108,7 @@
     "no-comments": "Noch keine Fragen",
     "mark-correct": "Frage bejahen",
     "mark-favorite": "Als besonders interessante Frage markieren",
-    "mark-read": "Als gelesen markieren",
+    "mark-read": "In Vollansicht am Beamer besprochen",
     "vote-up": "Hochvoten",
     "vote-down": "Runtervoten"
   },
@@ -119,8 +119,8 @@
     "add-comment": "Frage stellen",
     "correct": "Bejaht",
     "favorite": "Hervorgehoben",
-    "read": "Gelesen",
-    "unread": "Ungelesen",
+    "read": "Besprochen",
+    "unread": "Nicht besprochen",
     "vote-desc": "Absteigende Votes",
     "vote-asc": "Aufsteigende Votes",
     "time": "Zeit"

src/assets/i18n/creator/en.json

@@ -108,7 +108,7 @@
     "no-comments": "No questions yet",
     "mark-correct": "Mark as correct",
     "mark-favorite": "Mark as favorite",
-    "mark-read": "Mark as read",
+    "mark-read": "Discussed by you in full screen mode on the projector",
     "vote-up": "Vote up",
     "vote-down": "Vote down"
   },
@@ -117,10 +117,10 @@
     "filter-comments": "Filter questions",
     "sort-comments": "Sort questions",
     "add-comment": "Ask a question!",
-    "correct": "Correct",
-    "favorite": "Favorite",
-    "read": "Read",
-    "unread": "Unread",
+    "correct": "Marked as correct by you",
+    "favorite": "Your favorites",
+    "read": "Discussed",
+    "unread": "Not discussed",
     "vote-desc": "Descending votes",
     "vote-asc": "Ascending votes",
     "time": "Time"

src/assets/i18n/participant/de.json

@@ -27,7 +27,7 @@
     "no-comments": "Noch keine Fragen",
     "mark-correct": "Dozent/in hat die Frage bejaht.",
     "mark-favorite": "Dozent/in hält die Frage für besonders interessant.",
-    "mark-read": "Dozent/in hat die Frage als gelesen markiert.",
+    "mark-read": "Dozent/in hat die Frage beantwortet.",
     "vote-up": "Hochvoten",
     "vote-down": "Runtervoten"
   },
@@ -38,8 +38,8 @@
     "add-comment": "Stell deine Frage!",
     "correct": "Bejaht",
     "favorite": "Hervorgehoben",
-    "read": "Gelesen",
-    "unread": "Ungelesen",
+    "read": "Beantwortet",
+    "unread": "Nicht beantwortet",
     "vote-desc": "Absteigende Votes",
     "vote-asc": "Aufsteigende Votes",
     "time": "Zeit"

src/assets/i18n/participant/en.json

@@ -25,9 +25,9 @@
     "error-comment": "Please enter a question.",
     "error-both-fields": "Please fill in all fields.",
     "no-comments": "No questions yet",
-    "mark-correct": "Correct",
-    "mark-favorite": "Favorite",
-    "mark-read": "Read",
+    "mark-correct": "Marked as correct by the professor",
+    "mark-favorite": "Professor's favorite",
+    "mark-read": "Already discussed by the professor",
     "vote-up": "Vote up",
     "vote-down": "Vote down"
   },
@@ -36,10 +36,10 @@
     "filter-comments": "Filter questions",
     "sort-comments": "Sort questions",
     "add-comment": "Ask a question!",
-    "correct": "Correct",
-    "favorite": "Favorite",
-    "read": "Read",
-    "unread": "Unread",
+    "correct": "Marked as correct by the professor",
+    "favorite": "Professor's favorites",
+    "read": "Discussed by the professor",
+    "unread": "Not yet discussed",
     "vote-desc": "Descending votes",
     "vote-asc": "Ascending votes",
     "time": "Time"