From c7f35ceec62404bdac0f3bffd5ef0c1c6e3d3095 Mon Sep 17 00:00:00 2001
From: Klaus Quibeldey-Cirkel <klaus.quibeldey-cirkel@mni.thm.de>
Date: Sat, 21 Sep 2019 11:21:16 +0200
Subject: [PATCH] revise wording and set missing i18n string

---
 .../_dialogs/delete-comment/delete-comment.component.ts    | 2 +-
 src/assets/i18n/creator/de.json                            | 4 ++--
 src/assets/i18n/creator/en.json                            | 2 +-
 src/assets/i18n/home/de.json                               | 5 +++--
 src/assets/i18n/home/en.json                               | 7 ++++---
 src/assets/i18n/participant/de.json                        | 2 +-
 src/assets/i18n/participant/en.json                        | 2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.ts b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.ts
index a32d7196e..3bc8b60e8 100644
--- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.ts
+++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.ts
@@ -38,7 +38,7 @@ export class DeleteCommentComponent implements OnInit {
     this.liveAnnouncer.clear();
 
     if (lang === 'de') {
-      this.liveAnnouncer.announce('Willst du diese Frage wirklich löschen?');
+      this.liveAnnouncer.announce('Willst du die Frage wirklich löschen?');
     } else {
       this.liveAnnouncer.announce('Do you really want to delete this question');
     }
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index fb1d5ff2c..8739813b5 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -24,7 +24,7 @@
     "filter-reset": "Zurücksetzen",
     "filter-wrong": "Verneinte Fragen",
     "read": "Fragen, die der Dozent am Beamer besprochen hat",
-    "really-delete": "Willst du diese Frage wirklich löschen?",
+    "really-delete": "Willst du die Frage wirklich löschen?",
     "search": "Suchen",
     "sort-comments": "Fragen sortieren",
     "sort-vote-asc": "Positivste Bewertung zuerst",
@@ -67,7 +67,7 @@
     "error-both-fields": "Bitte fülle alle Felder aus.",
     "error-comment": "Bitte gib eine Frage ein.",
     "error-title": "Bitte gib einen Titel ein.",
-    "exit-description": "Kommentar-Präsentationsmodus verlassen",
+    "exit-description": "Präsentationsmodus verlassen",
     "export": "Exportieren",
     "export-description": "Exportieren",
     "live-announcer": "Du befindest dich jetzt auf der Fragen-Seite. Um Informationen zu Tastenkombinationen zu erhalten drücke jetzt die Enter-Taste oder rufe die Ansage zu einem späteren Zeitpunkt mit der Escape-Taste auf.",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 74bf4affd..30ba0e07e 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -68,7 +68,7 @@
     "error-both-fields": "Please fill in all fields.",
     "error-comment": "Please ask a question.",
     "error-title": "Please enter a title.",
-    "exit-description": "Exit Comment-Presentation Mode",
+    "exit-description": "Exit Presentation Mode",
     "export": "Export",
     "export-description": "Export",
     "live-announcer": "You are now on the questions page. To get information about key combinations press the Enter key or call the announcement later with the Escape key.",
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 41621755a..3cf7d5afb 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -96,6 +96,7 @@
     "title": "»frag.jetzt«"
   },
   "login": {
+    "activation-key": "Aktivierungsschlüssel",
     "cancel": "Zurück",
     "cancel-description": "Zurück",
     "email": "E-Mail Adresse als Benutzername",
@@ -119,8 +120,8 @@
     "password-reset": "Passwort vergessen?",
     "register": "Registrieren",
     "restart-account-activation-button": "Erneut senden",
-    "restart-account-activation-correct": "Ein neuer Schlüssel wurde gesendet!",
-    "restart-account-activation-tooltop": "Sendet einen neuen Aktivierungsschlüssel an die angegebene Adresse",
+    "restart-account-activation-correct": "Der Aktivierungsschlüssel wurde erneut gesendet.",
+    "restart-account-activation-tooltip": "Sendet den Aktivierungsschlüssel erneut an die angegebene Adresse",
     "welcome": "Online fragen & Fragen bewerten"
   },
   "overlay": {
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 3e8533574..b61b6256e 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -98,6 +98,7 @@
     "title": "»frag.jetzt«"
   },
   "login": {
+    "activation-key": "Activation key",
     "cancel": "Cancel",
     "cancel-description": "Cancel",
     "email": "E-mail",
@@ -120,9 +121,9 @@
     "password-required": "Password required",
     "password-reset": "Forgot your password?",
     "register": "Register",
-    "restart-account-activation-button": "Resend",
-    "restart-account-activation-correct": "New mail got send!",
-    "restart-account-activation-tooltop": "Sends a new activation key",
+    "restart-account-activation-button": "Send again",
+    "restart-account-activation-correct": "Activation key sent again",
+    "restart-account-activation-tooltip": "Sends the activation key again",
     "welcome": "Ask online & vote questions"
   },
   "overlay": {
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 0a8fc6a34..7e0a6c18a 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -66,7 +66,7 @@
     "error-both-fields": "Bitte fülle alle Felder aus.",
     "error-comment": "Bitte gib deine Frage ein.",
     "error-title": "Bitte gib einen Titel ein.",
-    "exit-description": "Kommentar-Präsentationsmodus verlassen",
+    "exit-description": "Präsentationsmodus verlassen",
     "live-announcer": "Du befindest dich jetzt auf der Fragen-Seite. Um Informationen zu Tastenkombinationen zu erhalten drücke jetzt die Enter-Taste oder rufe die Ansage zu einem späteren Zeitpunkt mit der Escape-Taste auf.",
     "mark-not-correct": "Dozent hat die Frage bejaht.",
     "mark-not-favorite": "Bonus-Frage: Dozent hält die Frage für besonders interessant.",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 5c2677f70..51c8554d3 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -66,7 +66,7 @@
     "error-both-fields": "Please fill in all fields.",
     "error-comment": "Please enter a question.",
     "error-title": "Please enter a title.",
-    "exit-description": "Exit Comment-Presentation Mode",
+    "exit-description": "Exit Presentation Mode",
     "live-announcer": "You are now on the questions page. To get information about key combinations press the Enter key or call the announcement later with the Escape key.",
     "mark-not-correct": "Marked as correct by the professor",
     "mark-not-favorite": "Bonus question: Your professor intends to give a bonus for that question.",
-- 
GitLab