From 283b6cac6185ac69351062c67da9c58fb223d623 Mon Sep 17 00:00:00 2001
From: Klaus Quibeldey-Cirkel <klaus.quibeldey-cirkel@mni.thm.de>
Date: Tue, 17 Sep 2019 11:02:38 +0200
Subject: [PATCH] English wording

---
 src/app/services/util/notification.service.ts |  2 +-
 src/assets/i18n/creator/en.json               |  2 +-
 src/assets/i18n/home/en.json                  | 43 +++++++++----------
 src/assets/i18n/participant/en.json           | 14 +++---
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/app/services/util/notification.service.ts b/src/app/services/util/notification.service.ts
index 64724decb..9bbbe09f3 100644
--- a/src/app/services/util/notification.service.ts
+++ b/src/app/services/util/notification.service.ts
@@ -10,7 +10,7 @@ export class NotificationService {
 
   show(message: string, action?: string, config?: MatSnackBarConfig) {
     const defaultConfig: MatSnackBarConfig = {
-      duration: (action ? 25000 : 4000),
+      duration: (action ? 25000 : 7000),
       panelClass: ['snackbar']
     };
 
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 8e012dbdc..18b91bc97 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -175,7 +175,7 @@
     "reallyContent": "Do you really want to delete content ",
     "reallySession": "Do you really want to delete session ",
     "room-not-found": "Session not found :(",
-    "session-id": "ID",
+    "session-id": "Key",
     "session-id-copied": "Session link was copied to the clipboard.",
     "session-settings": "Session administration",
     "settings-comment-moderation": "Moderate questions",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index eb41b28ca..a84167d70 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -8,10 +8,10 @@
     "title": "Cookies"
   },
   "overlay": {
-    "cancel": "Change settings",
-    "cancel-description": "Open the cookie setting dialog",
-    "message": "You have declined cookie usage for this app, thus you can not use it for the time being.",
-    "title": "Cannot use app"
+    "cancel": "Accept cookies after all?",
+    "cancel-description": "Accept cookies after all?",
+    "message": "You have rejected the use of cookies. Without cookies the app will not work.",
+    "title": "Use not possible"
   },
   "data-protection": {
     "cancel": "Reject",
@@ -28,15 +28,15 @@
   },
   "demo": {
     "cancel": "Close",
-    "cancel-description": "Close the introduction dialog"
+    "cancel-description": "Close the introduction"
   },
   "footer": {
-    "accessibility-data_protection": "Open the privacy statement in a new dialog.",
-    "accessibility-demo": "Show the demo video in a new dialog.",
-    "accessibility-help": "Open the help text in a new dialog.",
-    "accessibility-imprint": "Open the imprint in a new dialog.",
-    "accessibility-language": "Open the language selection menu.",
-    "accessibility-style": "Open the display menu in a new dialog.",
+    "accessibility-data_protection": "Open the privacy statement.",
+    "accessibility-demo": "Open the introduction.",
+    "accessibility-help": "Open help.",
+    "accessibility-imprint": "Open the imprint.",
+    "accessibility-language": "Open the language selector.",
+    "accessibility-style": "Open the display selector.",
     "demo": "Introduction",
     "dsgvo": "Privacy",
     "english": "English",
@@ -56,7 +56,7 @@
     "back": "Back",
     "delete": "Delete",
     "delete-account": "Delete account",
-    "id": "ID",
+    "id": "Key",
     "logged-out": "Logging out successful",
     "login": "Login",
     "logout": "Log out",
@@ -76,20 +76,19 @@
   },
   "home-page": {
     "accessibility-create": "Create a new session",
-    "accessibility-join-button": "Enter the room with the specified session ID.",
-    "accessibility-join-input": "Here you can enter the session ID of the room you want to join.",
+    "accessibility-join-button": "Enter the session with the specified session key.",
+    "accessibility-join-input": "Here you can enter the session key of the session you want to join.",
     "create-session": "New session",
     "created-1": "Session '",
     "created-2": "' successfully created",
-    "exactly-8": "A session ID has exactly 8 digits.",
+    "exactly-8": "A session key has exactly 8 digits.",
     "install": "Install",
-    "join-demo-session": "Join public session",
     "no-empty-name": "Please enter a name.",
-    "no-room-found": "No session found with this ID",
-    "only-numbers": "A session ID only contains digits.",
-    "please-enter": "Your lecturer will tell you the session ID.",
+    "no-room-found": "No session found with this key",
+    "only-numbers": "A session key only contains digits.",
+    "please-enter": "Ask the lecturer for the key.",
     "room-name-input": "Enter the name of the session you want to create here.",
-    "session-id": "Session ID",
+    "session-id": "Session key",
     "update-available": "An update is available."
   },
   "imprint": {
@@ -140,8 +139,8 @@
     "email-required": "E-mail required",
     "forgot-password": "Forgot the password?",
     "input-incorrect": "Please check your data.",
-    "key": "Reset key",
-    "key-required": "Reset key required",
+    "key": "Password reset key",
+    "key-required": "Password reset key required",
     "new-password": "New password",
     "new-password-successful": "The new password has been set.",
     "reset-password": "Reset password",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 82860d1a9..079ea15c7 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -70,14 +70,14 @@
     "vote-up": "Vote up"
   },
   "home-page": {
-    "exactly-8": "A session ID is a combination of exactly 8 digits.",
-    "no-room-found": "No session found with this ID",
-    "only-numbers": "A session ID is a combination of 8 digits.",
-    "please-enter": "Please enter a session ID"
+    "exactly-8": "A session key is a combination of exactly 8 digits.",
+    "no-room-found": "No session found with this key",
+    "only-numbers": "A session key is a combination of 8 digits.",
+    "please-enter": "Please enter a session key"
   },
   "room-page": {
-    "a11y-announcer": "You are now in the session with the ID you entered.",
-    "a11y-question_answer": "Opens the comment page with all questions and offers the possibility to ask questions.",
+    "a11y-announcer": "You are now in the session with the key you entered.",
+    "a11y-question_answer": "Opens the page where you can ask questions and vote up or down other questions.",
     "answer-statistics": "Statistics",
     "comments": "Questions",
     "create-comment": "Ask a question!",
@@ -86,7 +86,7 @@
     "give-feedback": "Give feedback",
     "learn": "Learn",
     "live-feedback": "Live feedback",
-    "session-id": "ID"
+    "session-id": "Key"
   },
   "statistic": {
     "abstentions": "Abstentions",
-- 
GitLab