Merge branch 'staging' into 'master'

wording and spelling

See merge request arsnova/arsnova-lite!252

src/app/components/shared/room-join/room-join.component.html

@@ -6,7 +6,7 @@
              onkeydown="if(this.value.length - (this.value.split(' ').length -1) === 8 && event.keyCode != 8) return false;
                         if(this.value.length === 4 && event.keyCode != 8) this.value = this.value + ' ';"
                         [formControl]="roomFormControl" [errorStateMatcher]="matcher"/>
-      <mat-placeholder class="placeholder">Session-ID</mat-placeholder>
+      <mat-placeholder class="placeholder">Session ID</mat-placeholder>
       <mat-hint align="end">{{ roomId.value.length - (roomId.value.split(' ').length -1) }} / 8</mat-hint>
       <mat-error *ngIf="roomFormControl.hasError('required')">{{ 'home-page.please-enter' | translate}}</mat-error>
       <mat-error *ngIf="roomFormControl.hasError('pattern')">{{ 'home-page.only-numbers' | translate}}</mat-error>

src/app/components/shared/room-list/room-list.component.html

@@ -8,7 +8,7 @@
   <mat-expansion-panel [disabled]="true" id="matPanelHeader">
     <mat-expansion-panel-header>
       <mat-panel-title class="headerTitle">Name</mat-panel-title>
-      <mat-panel-description class="headerTitle">Session-ID</mat-panel-description>
+      <mat-panel-description class="headerTitle">Session ID</mat-panel-description>
     </mat-expansion-panel-header>
   </mat-expansion-panel>
   <mat-expansion-panel *ngFor="let room of rooms" class="matPanel">

src/assets/i18n/creator/de.json

@@ -22,11 +22,11 @@
     "default-content-group": "Standard",
     "description": "Beschreibung der Session",
     "present": "Präsentieren",
-    "session-settings": "Session Einstellungen",
+    "session-settings": "Session-Einstellungen",
     "general": "Allgemein",
     "threshold": "Schwellenwert für sichtbare Kommentare: ",
     "delete-all-comments": "Alle Kommentare löschen",
-    "really-delete-comments": "Wollen sie wirklich alle Kommentare dieser Session löschen?",
+    "really-delete-comments": "Wollen Sie wirklich alle Kommentare dieser Session löschen?",
     "comments-deleted": "Alle Kommentare wurden gelöscht.",
     "export-comments": "Kommentare exportieren"
   },

src/assets/i18n/creator/en.json

@@ -104,6 +104,6 @@
     "search": "Search",
     "filter-comments": "Filter comments",
     "sort-comments": "Sort comments",
-    "add-comment": "Create comment"
+    "add-comment": "Write a comment"
   }
 }

src/assets/i18n/home/de.json

@@ -77,7 +77,7 @@
 	},
 	"session": {
 		"session-name": "Name der Session",
-		"description": "Beschreibung",
+		"description": "Beschreibung der Session",
 		"max-ls": "Max. Zeichen:",
 		"create-session": "Session erstellen"
   },

src/assets/i18n/home/en.json

@@ -2,9 +2,9 @@
 	"header": {
 		"english": "English",
 		"german": "German",
-		"logout": "Logout",
+		"logout": "Log out",
 		"guest": "Guest",
-		"logged-out": "Logout successful",
+		"logged-out": "Logging out successful",
 		"back": "Back",
 		"my-sessions": "My sessions",
 		"visited-sessions": "Visited sessions",

src/assets/i18n/participant/de.json

@@ -12,7 +12,7 @@
     "live-feedback": "Live Feedback",
     "answer-statistics": "Statistiken",
     "default-content-group": "Standard",
-    "description": "Beschreibung"
+    "description": "Beschreibung der Session"
   },
   "comment-page": {
     "enter-title": "Titel",

src/assets/i18n/participant/en.json

@@ -31,7 +31,7 @@
     "search": "Search",
     "filter-comments": "Filter comments",
     "sort-comments": "Sort comments",
-    "add-comment": "Create comment"
+    "add-comment": "Write a comment"
   },
   "answer": {
     "submit": "Submit",