Merge branch 'staging' into 'master'

wording

See merge request !385

src/assets/i18n/creator/de.json

@@ -116,7 +116,7 @@
     "mark-not-correct": "Frage nicht bejahen",
     "mark-wrong": "Frage als falsch markieren",
     "mark-not-wrong": "Frage nicht als falsch markieren",
-    "mark-favorite": "Als besonders interessante Frage markieren",
+    "mark-favorite": "Als Kandidat für einen Bonus markieren",
     "mark-not-favorite": "Nicht als besonders interessante Frage markieren",
     "mark-read": "In Vollansicht am Beamer besprochen",
     "vote-up": "Hochvoten",
@@ -132,7 +132,7 @@
     "add-comment": "Frage stellen",
     "wrong": "Verneint",
     "correct": "Bejaht",
-    "favorite": "Hervorgehoben",
+    "favorite": "Bonus-Frage",
     "read": "Besprochen",
     "unread": "Nicht besprochen",
     "vote-desc": "Absteigende Votes",

src/assets/i18n/creator/en.json

@@ -116,8 +116,8 @@
     "mark-not-correct": "Mark not as correct",
     "mark-wrong": "Mark as wrong",
     "mark-not-wrong": "Mark not as wrong",
-    "mark-favorite": "Mark as favorite",
-    "mark-not-favorite": "Mark not as favorite",
+    "mark-favorite": "Mark as bonus question",
+    "mark-not-favorite": "Mark not as bonus question",
     "mark-read": "Discussed by you in full screen mode on the projector",
     "vote-up": "Vote up",
     "vote-down": "Vote down",
@@ -132,7 +132,7 @@
     "add-comment": "Ask a question!",
     "wrong": "Marked as wrong by you",
     "correct": "Marked as correct by you",
-    "favorite": "Your favorites",
+    "favorite": "Bonus question",
     "read": "Discussed",
     "unread": "Not discussed",
     "vote-desc": "Descending votes",

src/assets/i18n/participant/de.json

@@ -27,7 +27,7 @@
     "no-comments": "",
     "mark-not-correct": "Dozent/in hat die Frage bejaht.",
     "mark-not-wrong": "Dozent/in hat die Frage verneint",
-    "mark-not-favorite": "Dozent/in hält die Frage für besonders interessant.",
+    "mark-not-favorite": "Bonus-Frage: Dozent/in hält die Frage für besonders interessant.",
     "mark-read": "Dozent/in hat die Frage im Hörsaal besprochen.",
     "vote-up": "Hochvoten",
     "vote-down": "Runtervoten"
@@ -39,7 +39,7 @@
     "add-comment": "Stell deine Frage!",
     "wrong": "Verneint",
     "correct": "Bejaht",
-    "favorite": "Hervorgehoben",
+    "favorite": "Bonus-Frage",
     "read": "Im Hörsaal besprochen",
     "unread": "Nicht im Hörsaal besprochen",
     "vote-desc": "Absteigende Votes",

src/assets/i18n/participant/en.json

@@ -27,7 +27,7 @@
     "no-comments": "No questions yet",
     "mark-not-correct": "Marked as correct by the professor",
     "mark-not-wrong": "Marked as wrong by the professor",
-    "mark-not-favorite": "Professor's favorite",
+    "mark-not-favorite": "Bonus question: Your professor intends to give a bonus for that question.",
     "mark-read": "Already discussed by the professor",
     "vote-up": "Vote up",
     "vote-down": "Vote down"
@@ -39,7 +39,7 @@
     "add-comment": "Ask a question!",
     "wrong": "Marked as wrong by the professor",
     "correct": "Marked as correct by the professor",
-    "favorite": "Professor's favorites",
+    "favorite": "Bonus question",
     "read": "Discussed by the professor",
     "unread": "Not yet discussed",
     "vote-desc": "Descending votes",