From fa6a936548303f1b7a5633240caecf70756b3f1e Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Wed, 2 May 2018 22:35:13 +0200
Subject: [PATCH 01/32] add some toolstips in german lang

---
 .../admin/user-admin/user-admin.component.html  |  4 ++--
 .../activation-resend.component.html            |  2 +-
 .../src/app/auth/login/login.component.html     |  2 +-
 .../app/auth/register/register.component.html   |  2 +-
 .../course-container.component.html             |  2 +-
 .../whitelist-show.component.html               |  2 +-
 .../course/course-new/course-new.component.html |  2 +-
 .../src/app/course/course.component.html        |  2 +-
 app/webFrontend/src/assets/i18n/de.json         | 17 +++++++++++++++--
 9 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
index d724e1b1e..38dbff192 100644
--- a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
+++ b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
@@ -20,10 +20,10 @@ <h2>Users</h2>
       </mat-select>
     </td>
     <td>
-      <button mat-icon-button (click)="editUser(i)">
+      <button matTooltip="{{ 'user.editUser' | translate }}" mat-icon-button (click)="editUser(i)">
         <mat-icon>edit</mat-icon>
       </button>
-      <button mat-icon-button (click)="deleteUser(i)">
+      <button matTooltip="{{ 'user.deleteUser' | translate }}" mat-icon-button (click)="deleteUser(i)">
         <mat-icon>delete</mat-icon>
       </button>
     </td>
diff --git a/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html b/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
index be0a0c634..3d295e29c 100644
--- a/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
+++ b/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
@@ -83,7 +83,7 @@
 
       <div *ngIf="formError" class="text-danger" id="resendActivationFormError">{{formError}}</div>
 
-      <button mat-raised-button color="primary" type="submit"
+      <button matTooltip="{{ 'auth.resendActivation.tooltipResendAction' | translate }}" mat-raised-button color="primary" type="submit"
               [disabled]="loading || !resendActivationForm?.valid">{{'common.send'|translate}}
       </button>
       <button mat-raised-button type="button" routerLink="/register" routerLinkActive="active">
diff --git a/app/webFrontend/src/app/auth/login/login.component.html b/app/webFrontend/src/app/auth/login/login.component.html
index 9b216e5bb..2a761e323 100644
--- a/app/webFrontend/src/app/auth/login/login.component.html
+++ b/app/webFrontend/src/app/auth/login/login.component.html
@@ -17,7 +17,7 @@
               [disabled]="loading">
         {{'common.login'|translate}}
       </button>
-      <button mat-raised-button type="button" routerLink="/reset" routerLinkActive="active">
+      <button mat-raised-button matTooltip="{{'auth.tooltipForgotPassword'|translate}}" type="button" routerLink="/reset" routerLinkActive="active">
         {{'auth.forgotPassword'|translate}}
       </button>
     </form>
diff --git a/app/webFrontend/src/app/auth/register/register.component.html b/app/webFrontend/src/app/auth/register/register.component.html
index 7c53853cd..bda516df1 100644
--- a/app/webFrontend/src/app/auth/register/register.component.html
+++ b/app/webFrontend/src/app/auth/register/register.component.html
@@ -90,7 +90,7 @@
 
       <app-password-input [form]="registerForm"></app-password-input>
 
-      <button mat-raised-button color="primary" type="submit"
+      <button matTooltip="{'auth.registration.tooltipRegister'|translate}}" mat-raised-button color="primary" type="submit"
               [disabled]="loading || !registerForm?.valid">{{'common.register'|translate}}
       </button>
       <button *ngIf="role == 'student'" mat-raised-button type="button" routerLink="/activation-resend" routerLinkActive="active">
diff --git a/app/webFrontend/src/app/course/course-container/course-container.component.html b/app/webFrontend/src/app/course/course-container/course-container.component.html
index ac8b84ba8..d995751d9 100644
--- a/app/webFrontend/src/app/course/course-container/course-container.component.html
+++ b/app/webFrontend/src/app/course/course-container/course-container.component.html
@@ -2,7 +2,7 @@
 
   <app-badge [displayNumber]="courses.length"></app-badge>
 
-  <button class="open-toggle" [class.opened]="expand" mat-icon-button>
+  <button class="open-toggle" matTooltip="{{ 'common.tooltipClickToOpen' | translate }}" [class.opened]="expand" mat-icon-button>
     <mat-icon>arrow_drop_down</mat-icon>
   </button></div>
 
diff --git a/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html b/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html
index 403057d69..b1accb27f 100644
--- a/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html
+++ b/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html
@@ -8,7 +8,7 @@
         <!-- <button mat-icon-button disabled>
           <mat-icon>edit</mat-icon>
         </button> -->
-        <button mat-icon-button (click)="remove(user)">
+        <button mat-icon-button matTooltip="{{ user.deleteUser | translate}}" (click)="remove(user)">
           <mat-icon>delete</mat-icon>
         </button>
         <i  *ngIf="isSignedIn(user) && !isInCourse(user)" class="material-icons green" matTooltip="Signed In">done</i>
diff --git a/app/webFrontend/src/app/course/course-new/course-new.component.html b/app/webFrontend/src/app/course/course-new/course-new.component.html
index e231dee89..7e1c3d61b 100644
--- a/app/webFrontend/src/app/course/course-new/course-new.component.html
+++ b/app/webFrontend/src/app/course/course-new/course-new.component.html
@@ -13,7 +13,7 @@ <h1>Create Course</h1>
         <textarea matInput formControlName="description" placeholder="Course Description"></textarea>
       </mat-form-field>
       <br/>
-      <button mat-raised-button color="primary" class="mat-button" type="submit">Add</button>
+      <button mat-raised-button color="primary" matTooltip="{{ course.tooltipAdd | translate }}" class="mat-button" type="submit">Add</button>
     </form>
   </mat-card>
 </div>
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index d56f96874..934df1c69 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -35,7 +35,7 @@
     </span>
 
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
-            color="primary" class="details-button" [routerLink]="['course', course._id]">
+            color="primary" matTooltip="{{ course.ShowCourse | translate }}" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>
     </button>
   </mat-card-actions>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index ca0d1e594..8a95b6fca 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -7,7 +7,9 @@
     "password": "Passwort",
     "send": "Senden",
     "dismiss": "Schließen",
+    "delete": "Löschen",
     "back": "Zurück",
+    "tooltipClickToOpen" : "Auf-/ zuklappen",
     "profile": {
       "firstName": "Vorname",
       "lastName": "Nachname",
@@ -31,16 +33,18 @@
     "welcomeTo": "Willkommen auf"
   },
   "auth": {
+    "tooltipForgotPassword":"Klicken Sie hier, um ein neues Password anzufordern",
     "forgotPassword": "Passwort vergessen",
     "loginSuccess": "Login erfolgreich",
     "loginFailed": "Login fehlgeschlagen",
     "loginFailedError": {
-      "couldNotBeVerified": "Ihre Login-Daten konnten nicht verifiziert werden. Bitte versuchen sie es noch ein mal.",
+      "couldNotBeVerified": "Ihre Login-Daten konnten nicht verifiziert werden. Bitte versuchen Sie es noch ein mal.",
       "notActiveYet": "Ihr Account wurde noch nicht aktiviert.",
       "unknown": "Es ist ein unbekannter Fehler aufgetreten."
     },
     "confirmPassword": "Passwort bestätigen",
     "registration": {
+      "tooltipRegister": "Klicken Sie hier, um Ihre Registrierung abzuschießen",
       "registerAs": "Registrieren als",
       "successful": "Registrierung erfolgreich",
       "mailSent": "Wir haben Ihnen einen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
@@ -51,7 +55,8 @@
     "resendActivation": {
       "back": "Zurück zur Registrierung",
       "successful": "Aktivierung erneut senden erfolgreich",
-      "mailSent": "Wir haben Ihnen einen neuen Aktivierungslink an Ihre E-Mail-Adresse gesendet."
+      "mailSent": "Wir haben Ihnen einen neuen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
+      "tooltipResendAction" : "Klicken Sie hier, um einen neuen Aktivierungslink anzufordern"
     }
   },
   "mainMenu": {
@@ -71,5 +76,13 @@
     "addCourse": "Kurs hinzufügen",
     "createCourse": "Kurs erstellen",
     "importCourse": "Kurs importieren"
+  },
+  "user" : {
+    "editUser" : "Benutzer bearbeiten",
+    "deleteUser" : "Benutzer löschen"
+  },
+  "course" : {
+    "tooltipAdd" : "Kurs hinzufügen",
+    "ShowCourse" : "Kurs anzeigen"
   }
 }

From 7e6b4f4cae943fa4090dc83d8b45bac5af09ea15 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Fri, 4 May 2018 22:51:57 +0200
Subject: [PATCH 02/32] - add tooltips and text in resource file

- set resource-vars in html-files
---
 .../src/app/auth/reset/reset.component.html   |  4 +-
 .../upload-unit-checkbox.component.html       |  2 +-
 .../course-manage-content.component.html      | 14 ++---
 .../lecture-edit/lecture-edit.component.html  | 16 +++---
 .../general-tab/general-tab.component.html    | 25 ++++----
 .../src/app/course/course.component.html      |  2 +-
 app/webFrontend/src/assets/i18n/de.json       | 57 ++++++++++++++++++-
 7 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/app/webFrontend/src/app/auth/reset/reset.component.html b/app/webFrontend/src/app/auth/reset/reset.component.html
index e2b5e1c59..a49d9eead 100644
--- a/app/webFrontend/src/app/auth/reset/reset.component.html
+++ b/app/webFrontend/src/app/auth/reset/reset.component.html
@@ -9,7 +9,7 @@
         <input matInput formControlName="email" placeholder="Mail address">
       </mat-form-field>
 
-      <button mat-raised-button color="primary" class="mat-button" type="submit" [disabled]="loading">Submit</button>
+      <button mat-raised-button color="primary" matTooltip="{{ auth.tooltipResetPass }}" class="mat-button" type="submit" [disabled]="loading">Request password reset</button>
       <br>
     </form>
   </mat-card-content>
@@ -24,7 +24,7 @@
 
       <app-password-input [form]="resetForm"></app-password-input>
 
-      <button mat-raised-button color="primary" type="submit" [disabled]="loading">Reset</button>
+      <button mat-raised-button  matTooltip="{{ auth.tooltipResetPassword | translate }}" color="primary" type="submit" [disabled]="loading">Reset</button>
     </form>
   </mat-card-content>
 </mat-card>
diff --git a/app/webFrontend/src/app/course/course-detail/download-course-dialog/downloadCheckBoxes/upload-unit-checkbox.component.html b/app/webFrontend/src/app/course/course-detail/download-course-dialog/downloadCheckBoxes/upload-unit-checkbox.component.html
index d162f2c79..6905a6df0 100644
--- a/app/webFrontend/src/app/course/course-detail/download-course-dialog/downloadCheckBoxes/upload-unit-checkbox.component.html
+++ b/app/webFrontend/src/app/course/course-detail/download-course-dialog/downloadCheckBoxes/upload-unit-checkbox.component.html
@@ -4,7 +4,7 @@ <h4 mat-line>{{file.name}}</h4>
   <span class="spacer"></span>
   <span class="lightgray"> {{unitDesc}} </span>
   <mat-checkbox *ngIf="!this.showDL" [(ngModel)]="chkbox" (change)="emitEvent()" class="chkbox"></mat-checkbox>
-  <button mat-icon-button color="primary" *ngIf="this.showDL" class="dlButton" (click)="this.downloadFile()" matTooltip="Download this Unit">
+  <button mat-icon-button color="primary" *ngIf="this.showDL" class="dlButton" (click)="this.downloadFile()" matTooltip="{{ common.tooltipDownloadUnit | translate}}">
      <mat-icon>file_download</mat-icon>
   </button>
 </mat-list-item>
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
index 5ffa42078..67be36aca 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
@@ -17,13 +17,13 @@
 
 <app-mat-fab-menu class="fab" [open]="fabOpen" [onClick]="onFabClick"
                   [disabled]="isInMode('lecture', 'create') || isInMode('lecture', 'edit') || isInMode('unit', 'create') || isInMode('unit', 'edit')"
-                  fabTooltip="Add content">
-  <div *ngIf="isLectureOpen()" (click)="onImportUnit()">Import unit</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('task')">Add tasks</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('file')">Add files</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('code-kata')">Add code-kata</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('video')">Add videos</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('free-text')">Add free text</div>
+                  fabTooltip="{{ unit.addContent | translate }}">
+  <div *ngIf="isLectureOpen()" (click)="onImportUnit()">{{ unit.import | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('task')">{{ unit.addTasks | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('file')">{{ unit.addFiles | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('code-kata')">{{ unit.addCodeKata | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('video')">{{ unit.addVideos | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('free-text')">{{ unit.addFreeText | translate }}</div>
   <div (click)="onImportLecture()">Import lecture</div>
   <div (click)="onAddLecture()">Add lecture</div>
 </app-mat-fab-menu>
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
index 8530a2445..13fb007ba 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
@@ -14,19 +14,19 @@ <h2>{{lecture.name}}</h2>
     </button>
 
     <mat-menu #lectureMenu="matMenu">
-      <button mat-menu-item (click)="onEditLecture(lecture)">
+      <button mat-menu-item matTooltip="{{ lecture.tooltipEdit | translate }}" (click)="onEditLecture(lecture)">
         <mat-icon>edit</mat-icon>
         Edit
       </button>
-      <button mat-menu-item (click)="exportLecture(lecture)">
+      <button mat-menu-item matTooltip="{{ lecture.tooltipDownloadLecture | translate }}"  (click)="exportLecture(lecture)">
         <mat-icon>file_download</mat-icon>
         Export
       </button>
-      <button mat-menu-item (click)="duplicateLecture(lecture)">
+      <button mat-menu-item matTooltip="{{ lecture.tooltipDuplicate | translate}}" (click)="duplicateLecture(lecture)">
         <mat-icon>content_copy</mat-icon>
         Duplicate
       </button>
-      <button mat-menu-item (click)="deleteLecture(lecture)">
+      <button mat-menu-item matTooltip="{{ lecture.tooltipDelete | translate }}" (click)="deleteLecture(lecture)">
         <mat-icon>delete</mat-icon>
         Delete
       </button>
@@ -47,20 +47,20 @@ <h2>{{lecture.name}}</h2>
           <span class="unit-type">{{ unit.__t }}</span>
           <span class="unit-date">{{ unit.updatedAt | date:"y-MM-dd" }}</span>
           <span class="unit-actions">
-              <button mat-icon-button matTooltip="Edit" (click)="onEditUnit(unit)">
+              <button mat-icon-button matTooltip="{{ common.edit | translate }}" (click)="onEditUnit(unit)">
                 <mat-icon>edit</mat-icon>
               </button>
               <button class="unit-menu-button" mat-icon-button [matMenuTriggerFor]="unitMenu">
                 <mat-icon>more_vert</mat-icon>
               </button>
               <mat-menu #unitMenu="matMenu">
-                <button mat-icon-button matTooltip="Delete" (click)="deleteUnit(unit)">
+                <button mat-icon-button matTooltip="{{ lecture.tooltip.delete | translate }}" (click)="deleteUnit(unit)">
                   <mat-icon>delete</mat-icon>
                 </button>
-                <button mat-icon-button matTooltip="Duplicate" (click)="duplicateUnit(unit)">
+                <button mat-icon-button matTooltip="{{ lecture.tooltip.duplicate | translate }}" (click)="duplicateUnit(unit)">
                   <mat-icon>content_copy</mat-icon>
                 </button>
-                <button mat-icon-button matTooltip="Export" (click)="onExportUnit(unit)">
+                <button mat-icon-button matTooltip="{{ lecture.tooltip.download | translate }}" (click)="onExportUnit(unit)">
                   <mat-icon>file_download</mat-icon>
               </button>
               </mat-menu>
diff --git a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
index ed345a266..c72829a72 100644
--- a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
+++ b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
@@ -5,52 +5,51 @@
   </mat-form-field>
 
   <mat-form-field class="full-width">
-        <textarea matInput id="description" placeholder="Description" [(ngModel)]="description"
+        <textarea matInput id="description" placeholder="{{ common.description | translate }}" [(ngModel)]="description"
                   [ngModelOptions]="{standalone: true}"></textarea>
   </mat-form-field>
 
   <mat-form-field class="full-width">
-    <mat-select name="courseTypes" placeholder="Please select your course access type" id="courseTypes" [(ngModel)]="enrollType">
+    <mat-select name="courseTypes" placeholder="{{ course.text.selectAccessType | translate }}" id="courseTypes" [(ngModel)]="enrollType">
       <mat-option *ngFor="let enrollType of enrollTypes" [value]="enrollType">{{enrollType}}</mat-option>
     </mat-select><br>
   </mat-form-field>
 
   <p *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_FREE">
-    The course is free and accessible for everyone
+    {{ course.text.isFreeForEveryone | translate }}
   </p>
 
   <mat-form-field class="full-width" *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_ACCESSKEY">
     <input async matInput id="accessKey" placeholder="Access Key" [(ngModel)]="accessKey"
            [ngModelOptions]="{standalone: true}">
-    <mat-hint>Enter an access key for the students</mat-hint>
+    <mat-hint>{{ course.text.enterAccessKeyForStudents | translate }}</mat-hint>
   </mat-form-field>
 
   <div class="csv-upload" *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_WHITELIST">
-    <p>Upload your OBS csv file with your course members for whitelisting students.
-    <br />Old whitelist users are removed by uploading a new file.</p>
+    <p>{{ course.text.uploadWhitelist | translate }}</p>
     <p>
       <!-- TODO: Replace with shared upload form -->
       <input class="upload" type="file" ng2FileSelect [uploader]="uploader"
-             placeholder="Upload files" accept=".csv"/>
+             placeholder="{{ file.placeholder.uploadFiles | translate }}" accept=".csv"/>
       <button mat-raised-button color="primary"
               (click)="uploader.uploadAll()"
               [disabled]="!uploader.getNotUploadedItems().length">
         <mat-icon>file_upload</mat-icon>
-        Upload
+        {{ common.upload | translate }}
       </button>
     </p>
   </div>
 
   <p>
     <mat-slide-toggle (change)="onChangeActive($event)" [checked]="active">
-      <span *ngIf="active">Course can be seen by students</span>
-      <span *ngIf="!active">Course cannot be seen by students</span>
+      <span *ngIf="active">{{ course.text.canSeenByStudents | translate }}</span>
+      <span *ngIf="!active">{{ course.text.canNotSeenByStudents | translate }}</span>
     </mat-slide-toggle>
   </p>
   <p>
     <app-button-save-cancel (cancel)="cancel()"></app-button-save-cancel>
-    <button mat-raised-button (click)="onExport()" type="button">Export</button>
-    <button mat-raised-button (click)="onDuplicate()" type="button">Duplicate</button>
+    <button mat-raised-button (click)="onExport()" type="button">{{ common.export | translate }}</button>
+    <button mat-raised-button (click)="onDuplicate()" type="button">{{ common.duplicate | translate }}</button>
   </p>
 </form>
-<button mat-raised-button color="warn" (click)= "deleteCourse()">Delete Course</button>
+<button mat-raised-button color="warn" (click)= "deleteCourse()">{{ course.delete | translate }}</button>
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index f80ae5c6b..3d50eac80 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -41,7 +41,7 @@
     </button>
     </span>
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
-            color="primary" matTooltip="{{ course.ShowCourse | translate }}" class="details-button" [routerLink]="['course', course._id]">
+            color="primary" matTooltip="{{ course.tooltipResetPassword | translate }}" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>
     </button>
   </mat-card-actions>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 8a95b6fca..cd3c2121f 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -4,11 +4,18 @@
     "login": "Login",
     "register": "Registrieren",
     "email": "E-Mail",
+    "description" : "description",
     "password": "Passwort",
+    "export" : "Export",
+    "duplicate" : "Duplicate",
     "send": "Senden",
     "dismiss": "Schließen",
     "delete": "Löschen",
+    "edit" : "edit",
+    "upload" : "upload",
+    "download" : "download",
     "back": "Zurück",
+    "tooltipDownloadUnit" : "Download this Unit",
     "tooltipClickToOpen" : "Auf-/ zuklappen",
     "profile": {
       "firstName": "Vorname",
@@ -33,7 +40,8 @@
     "welcomeTo": "Willkommen auf"
   },
   "auth": {
-    "tooltipForgotPassword":"Klicken Sie hier, um ein neues Password anzufordern",
+    "tooltipResetPassword" : "Klicken Sie hier, um das Passwort zu resetten",
+    "tooltipForgotPassword":"Klicken Sie hier, um ein neues Passwort anzufordern",
     "forgotPassword": "Passwort vergessen",
     "loginSuccess": "Login erfolgreich",
     "loginFailed": "Login fehlgeschlagen",
@@ -82,7 +90,52 @@
     "deleteUser" : "Benutzer löschen"
   },
   "course" : {
+    "delete" : "Delete course",
     "tooltipAdd" : "Kurs hinzufügen",
-    "ShowCourse" : "Kurs anzeigen"
+    "ShowCourse" : "Kurs anzeigen",
+    "text" : {
+      "canSeenByStudents" : "Course can be seen by students",
+      "canNotSeenByStudents" : "Course cannot be seen by students",
+      "isFreeForEveryone" : "The course is free and accessible for everyone",
+      "enterAccessKeyForStudents" : "Enter an access key for the students",
+      "selectAccessType" : "Please select your course access typ",
+      "uploadWhitelist" : "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file."
+    }
+  } ,
+  "lecture" :
+  {
+    "tooltip" :
+    {
+      "download" : "Download this Unit",
+      "delete" : "Download this Unit",
+      "edit" : "Download this Unit",
+      "duplicate" : "Copy this lecture",
+      "add" : "Download this Unit"
+    }
+  },
+  "file" :
+  {
+    "placeholder" :
+    {
+      "uploadFiles" : "UploadFiles"
+    }
+  },
+  "unit" :
+  {
+    "tooltip" :
+    {
+      "download" : "Download this Unit",
+      "delete" : "Download this Unit",
+      "duplicate" : "Copy this Unit",
+      "edit" : "Download this Unit",
+      "add" : "Download this Unit"
+    },
+    "import":"Import Unit",
+    "addContent" : "Add content",
+    "addTasks" : "Add tasks",
+    "addFiles" : "Add files",
+    "addCodeKata" : "Add code-kata",
+    "addVideos" : "Add Videos",
+    "addFreeText" : "Add free text"
   }
 }

From 650d59b4bf2f60fd6d4ff0774aba83cebdad3dd6 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Fri, 4 May 2018 23:09:31 +0200
Subject: [PATCH 03/32] - more resorce-text

---
 .../user-admin/user-admin.component.html      |  8 +++---
 .../course-edit/course-edit.component.html    |  2 +-
 .../course-new/course-new.component.html      |  4 +--
 .../user-report/user-report.component.html    |  4 +--
 .../user-settings.component.html              |  6 ++---
 app/webFrontend/src/assets/i18n/de.json       | 25 ++++++++++++++++---
 6 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
index 38dbff192..f7648ddd6 100644
--- a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
+++ b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
@@ -2,10 +2,10 @@ <h2>Users</h2>
 <table class="table">
   <thead>
   <tr>
-    <th>Name</th>
-    <th>E-Mail</th>
-    <th>Role</th>
-    <th>Actions</th>
+    <th>{{ common.name | translate }}</th>
+    <th>{{ common.email | translate }}</th>
+    <th>{{ common.role | translate}}</th>
+    <th>{{ common.actions | translate }}</th>
   </tr>
   </thead>
   <tbody>
diff --git a/app/webFrontend/src/app/course/course-edit/course-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-edit.component.html
index efb47a4e5..4395a80bc 100644
--- a/app/webFrontend/src/app/course/course-edit/course-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-edit.component.html
@@ -2,7 +2,7 @@
   <h1>Edit course</h1>
   <a mat-button [routerLink]="['/course', id]" target="_blank" class="md-raised md-primary course-link">
     <mat-icon>open_in_new</mat-icon>
-    Go to course
+    {{ course.text.goToCourse | translate }}
   </a>
 </div>
 
diff --git a/app/webFrontend/src/app/course/course-new/course-new.component.html b/app/webFrontend/src/app/course/course-new/course-new.component.html
index 7e1c3d61b..82fee6ad1 100644
--- a/app/webFrontend/src/app/course/course-new/course-new.component.html
+++ b/app/webFrontend/src/app/course/course-new/course-new.component.html
@@ -3,14 +3,14 @@ <h1>Create Course</h1>
   <mat-card>
     <form class="course-form" (ngSubmit)="createCourse()" [formGroup]="newCourse">
       <mat-form-field class="full-width">
-        <input matInput formControlName="name" placeholder="Course Name">
+        <input matInput formControlName="name" placeholder="{{ course.placeholder.name | translate }}">
         <div *ngIf="nameError">
           <small class="text-danger">{{nameError}}</small>
         </div>
       </mat-form-field>
       <br/>
       <mat-form-field class="full-width">
-        <textarea matInput formControlName="description" placeholder="Course Description"></textarea>
+        <textarea matInput formControlName="description" placeholder="{{ course.placeholder.description | translate}}"></textarea>
       </mat-form-field>
       <br/>
       <button mat-raised-button color="primary" matTooltip="{{ course.tooltipAdd | translate }}" class="mat-button" type="submit">Add</button>
diff --git a/app/webFrontend/src/app/user/user-report/user-report.component.html b/app/webFrontend/src/app/user/user-report/user-report.component.html
index c42fdf38d..2eb8804d8 100644
--- a/app/webFrontend/src/app/user/user-report/user-report.component.html
+++ b/app/webFrontend/src/app/user/user-report/user-report.component.html
@@ -1,5 +1,5 @@
 <div class="user-progress" *ngIf="report?.length > 0">
-  <h2>Your course progress</h2>
+  <h2>{{ course.text.yourCourseProgress | translate }}</h2>
   <mat-card *ngFor="let course of report">
     <mat-card-header>
       <mat-card-title>{{ course.name }}</mat-card-title>
@@ -16,7 +16,7 @@ <h2>Your course progress</h2>
     <mat-card-actions align="start">
       <button mat-button [routerLink]="['/', 'course', course._id]" routerLinkActive="active">
         <mat-icon>arrow_forward</mat-icon>
-        Go to course
+        {{ course.text.goToCourse | translate }}
       </button>
 
     </mat-card-actions>
diff --git a/app/webFrontend/src/app/user/user-settings/user-settings.component.html b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
index 7966109f9..425eb36b0 100644
--- a/app/webFrontend/src/app/user/user-settings/user-settings.component.html
+++ b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
@@ -1,5 +1,5 @@
-<h1>Settings</h1>
-<h2>Notifications</h2>
+<h1>{{ common.settings | translate }}</h1>
+<h2>{{ common.notifications | translate }}</h2>
 <mat-table #table [dataSource]="dataSource">
   <ng-container matColumnDef="Notifications">
     <mat-header-cell class="header" *matHeaderCellDef>
@@ -42,4 +42,4 @@ <h2>Notifications</h2>
   <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
   <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
 </mat-table>
-<button mat-raised-button color="primary" class="mat-button saveButton" (click)="saveNotificationSettings()">Save</button>
+<button mat-raised-button color="primary" class="mat-button saveButton" (click)="saveNotificationSettings()">{{ common.save | translate }}</button>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index cd3c2121f..8657ac4c7 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -1,6 +1,11 @@
 {
   "common": {
     "geli": "geli",
+    "settings" : "Settings",
+    "notifications" : "Notifications",
+    "name" : "Name",
+    "role" : "Role",
+    "actions" : "Actions",
     "login": "Login",
     "register": "Registrieren",
     "email": "E-Mail",
@@ -9,6 +14,7 @@
     "export" : "Export",
     "duplicate" : "Duplicate",
     "send": "Senden",
+    "save" : "Save",
     "dismiss": "Schließen",
     "delete": "Löschen",
     "edit" : "edit",
@@ -67,6 +73,15 @@
       "tooltipResendAction" : "Klicken Sie hier, um einen neuen Aktivierungslink anzufordern"
     }
   },
+  "user" : {
+    "editUser" : "Benutzer bearbeiten",
+    "deleteUser" : "Benutzer löschen",
+    "text" : {
+      "signedIn": "Signed in",
+      "notSignedIn": "Not Signed in"
+    }
+  },
+
   "mainMenu": {
     "admin": "Admin",
     "about": "Über geli",
@@ -85,21 +100,23 @@
     "createCourse": "Kurs erstellen",
     "importCourse": "Kurs importieren"
   },
-  "user" : {
-    "editUser" : "Benutzer bearbeiten",
-    "deleteUser" : "Benutzer löschen"
-  },
   "course" : {
     "delete" : "Delete course",
     "tooltipAdd" : "Kurs hinzufügen",
     "ShowCourse" : "Kurs anzeigen",
     "text" : {
+      "yourCourseProgress" : "Your course progress",
+      "goToCourse" : "Go to Course",
       "canSeenByStudents" : "Course can be seen by students",
       "canNotSeenByStudents" : "Course cannot be seen by students",
       "isFreeForEveryone" : "The course is free and accessible for everyone",
       "enterAccessKeyForStudents" : "Enter an access key for the students",
       "selectAccessType" : "Please select your course access typ",
       "uploadWhitelist" : "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file."
+    },
+    "placeholder" : {
+      "Name" : "Course Name",
+      "Description" : "Course Description"
     }
   } ,
   "lecture" :

From 11c1098c5dc897587001f42bb9b7fafd4ee58b07 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 8 May 2018 13:30:00 +0200
Subject: [PATCH 04/32] - some more variables

- Todo: reset
---
 .../src/app/about/about.component.html        |  2 +-
 .../src/app/admin/admin.component.html        |  8 +-
 .../auth/activation/activation.component.html |  3 +-
 .../dashboard-student.component.html          |  6 +-
 .../code-kata-unit.component.html             | 10 +--
 .../code-kata-unit-form.component.html        |  6 +-
 .../file-unit-form.component.html             | 18 ++---
 .../free-text-unit-editor.dialog.html         |  4 +-
 .../free-text-unit-editor.component.html      |  6 +-
 .../free-text-unit-form.component.html        |  2 +-
 .../task-unit-edit.component.html             | 16 ++--
 .../unit-general-info-form.component.html     | 10 +--
 .../src/app/unit/unit.component.html          |  4 +-
 .../user-details/user-details.component.html  |  6 +-
 .../user-settings.component.html              |  2 +-
 app/webFrontend/src/assets/i18n/de.json       | 73 ++++++++++++++++++-
 16 files changed, 121 insertions(+), 55 deletions(-)

diff --git a/app/webFrontend/src/app/about/about.component.html b/app/webFrontend/src/app/about/about.component.html
index fe8499bab..cb5ed6c6c 100644
--- a/app/webFrontend/src/app/about/about.component.html
+++ b/app/webFrontend/src/app/about/about.component.html
@@ -1,4 +1,4 @@
-<h1>About</h1>
+<h1>{{ common.about | translate }}</h1>
 
 <app-general-info></app-general-info>
 
diff --git a/app/webFrontend/src/app/admin/admin.component.html b/app/webFrontend/src/app/admin/admin.component.html
index 5fb3c60e9..5260c57c9 100644
--- a/app/webFrontend/src/app/admin/admin.component.html
+++ b/app/webFrontend/src/app/admin/admin.component.html
@@ -1,14 +1,14 @@
-<h1>Administration</h1>
+<h1>{{ common.administration | translate }}</h1>
 <mat-toolbar>
   <mat-toolbar-row>
     <button mat-button routerLink="/admin/users">
-      <span>Users</span>
+      <span>{{ common.users | translate }}</span>
     </button>
     <button [routerLink]="['/admin/markdownEdit']" [queryParams]="{type: 'imprint', header: 'Imprint'}" mat-button>
-      <span>Imprint</span>
+      <span>{{ common.imprint | translate }}</span>
     </button>
     <button mat-button [routerLink]="['/admin/markdownEdit']" [queryParams]="{type: 'infoBox', header: 'InfoBox'}">
-      <span>InfoBox</span>
+      <span>{{ common.infobox | translate }}</span>
     </button>
   </mat-toolbar-row>
 </mat-toolbar>
diff --git a/app/webFrontend/src/app/auth/activation/activation.component.html b/app/webFrontend/src/app/auth/activation/activation.component.html
index 0ac205ef7..d94df478d 100644
--- a/app/webFrontend/src/app/auth/activation/activation.component.html
+++ b/app/webFrontend/src/app/auth/activation/activation.component.html
@@ -1,2 +1,3 @@
 <p class="center">{{status}}</p>
-<p class="center" [hidden]="!success">You can now follow <a routerLink="/login">this link</a> and use your account.</p>
+<p class="center" [hidden]="!success">{{ activation.text.pleaseClick | translate }}
+    <a routerLink="/login">{{ common.here | translate}}</a> {{ activation.text.toUseYourAccount | translate}}.</p>
diff --git a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
index 37e7107e3..b185d0291 100644
--- a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
+++ b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
@@ -1,7 +1,7 @@
 <mat-form-field class="pull-right">
-  <mat-select placeholder="Sorted by">
-    <mat-option value="last visited" (click)="sortCourses()">last visited</mat-option>
-    <mat-option value="alphabetically" (click)="sortAlphabetically()">alphabetically</mat-option>    
+  <mat-select placeholder="{{ sort.placeholder.sortedBy | translate }}">
+    <mat-option value="last visited" (click)="sortCourses()">{{ sort.lastVisited | translate }}</mat-option>
+    <mat-option value="alphabetically" (click)="sortAlphabetically()">{{ sort.alphabetically | translate }}</mat-option>
   </mat-select>
 </mat-form-field>
 <app-course-container [title]="'dashboard.myCourses' | translate" [courses]="myCourses" [expand]="true" (onLeave)="leaveCallback()" (onEnroll)="enrollCallback()"></app-course-container>
diff --git a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
index 316db517a..89cc5cb2f 100644
--- a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
+++ b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
@@ -7,8 +7,8 @@
     [theme]="'github'"
     [readOnly]="true">
   </ace-editor>
-  <div *ngIf="!isExampleCode">Your code goes here:</div>
-  <div *ngIf="isExampleCode">This is the provided example solution:</div>
+  <div *ngIf="!isExampleCode">{{ code-kata.text.codeHere | translate }}:</div>
+  <div *ngIf="isExampleCode">{{ code-kata.text.codeExample | translate }}:</div>
   <ace-editor class="user-code-editor"
               #codeEditor
               [(text)]="codeKataUnit.code || progress.code"
@@ -18,7 +18,7 @@
               [durationBeforeCallback]="333"
               (textChanged)="onUserInput()">
   </ace-editor>
-  <div>These tests need to success:</div>
+  <div>{{ code-kata.text.testsNeedToSuccees | translate }}:</div>
   <ace-editor
     #testEditor
     [(text)]="codeKataUnit.test"
@@ -28,8 +28,8 @@
   </ace-editor>
 
   <div *ngIf="!isExampleCode">
-    <button mat-raised-button (click)="validate()">Validate</button>
-    <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">Submit</button>
+    <button mat-raised-button (click)="validate()">{{ common.validate | translate }}</button>
+    <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">{{ common.submit | translate }}</button>
   </div>
   <div *ngIf="logs!==undefined" class="logs-title">
     Logs:
diff --git a/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html
index 6c1262a26..f652129e4 100644
--- a/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html
@@ -5,11 +5,11 @@
 
   <div class="info-text">
     <mat-icon>info</mat-icon>
-    Separate definition, coding and test areas with "{{areaSeperator}}".
+    {{ code-kata.information.info1 | translate }} "{{areaSeperator}}".
   </div>
   <div class="info-text">
     <mat-icon>info</mat-icon>
-    Your students can only edit the code area.
+    {{ code-kata.information.info2 | translate }}
   </div>
 
   <ace-editor class="user-code-editor"
@@ -23,7 +23,7 @@
   <button mat-raised-button (click)="validate()">Validate</button>
   <app-button-save-cancel (save)="addUnit()" (cancel) ="onCancel()"></app-button-save-cancel>
   <div *ngIf="logs!==undefined" class="logs-title">
-    Logs:
+    {{ code-kata.text.logs | translate }}
     <pre>{{logs}}</pre>
   </div>
 </div>
diff --git a/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
index 4923f16e2..2b9b6df25 100644
--- a/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
@@ -1,15 +1,15 @@
 <ng-container [ngSwitch]="fileUnitType">
-  <h3 *ngSwitchCase="'video'">Add Videos</h3>
-  <h3 *ngSwitchDefault>Add Files</h3>
+  <h3 *ngSwitchCase="'video'">{{ unit.addVideos | translate }}</h3>
+  <h3 *ngSwitchDefault>{{ unit.addFiles | translate}}</h3>
 </ng-container>
 
 <app-unit-general-info-form [model]="model"></app-unit-general-info-form>
 <div *ngIf="model?.files?.length > 0" class="file-list-container uploaded-files">
   <div class="file-list">
     <div class="file-list-row file-list-header">
-      <span>Filename</span>
-      <span>Filesize</span>
-      <span>Actions</span>
+      <span>{{ file.text.filename | translate }}</span>
+      <span>{{ file.text.filesize | translate }}</span>
+      <span>{{ file.text.actions | translate }}</span>
     </div>
     <div class="file-list-row" *ngFor="let file of model.files">
       <span class="filename">{{file.name}}</span>
@@ -17,7 +17,7 @@ <h3 *ngSwitchDefault>Add Files</h3>
       <mat-action-row>
         <button mat-raised-button color="warn" (click)="removeFile(file)">
           <mat-icon>delete</mat-icon>
-          Remove
+          {{ common.delete | translate }}
         </button>
       </mat-action-row>
     </div>
@@ -26,17 +26,17 @@ <h3 *ngSwitchDefault>Add Files</h3>
 
 <p>
   <button mat-raised-button (click)="openAddFilesDialog()">
-    Add files
+    {{ file.text.addFile || translate }}
   </button>
 </p>
 <p>
   <button mat-raised-button color="primary"
           (click)="save()" [disabled]="checkSave()">
     <mat-icon>save</mat-icon>
-    Save
+    {{ common.save | translate }}
   </button>
   <button mat-raised-button
           (click)="onCancel()">
-    Cancel
+    {{ common.cancel | translate }}
   </button>
 </p>
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
index 4bdb507cb..650800ea2 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
@@ -1,8 +1,8 @@
 <mat-toolbar matDialogTitle role="heading">
   <mat-toolbar-row>
-    <span>Fullscreen Mode</span>
+    <span>{{ common.fullscreenMode | translate }}</span>
     <span class="toolbar-fill"></span>
-    <button mat-mini-fab color="primary" (click)="onCloseClick()" matTooltip="Quit Fullscreen">
+    <button mat-mini-fab color="primary" (click)="onCloseClick()" matTooltip="{{ common.tooltip.quitFullscreenMode | translate }}">
       <mat-icon>close</mat-icon>
     </button>
   </mat-toolbar-row>
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html
index df49e416f..25bf2e2f5 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html
@@ -2,9 +2,9 @@
   <mat-tab label="Write">
     <p class="info-text">
       <mat-icon>info</mat-icon>
-      Add Markdown to add text to this Course.
-      A Cheatsheet you can find
-      <a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">here</a>.
+      {{ course.text.addMarkdownToCourse | translate }}
+      {{ common.cheatSheetYouFind | translate }}
+      <a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">{{ common.here | translate }}</a>.
     </p>
 
     <ace-editor #editor
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html
index 61d55c162..b7b1304cc 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html
@@ -4,7 +4,7 @@
   <app-free-text-unit-editor [(markdown)]="this.model.markdown"></app-free-text-unit-editor>
 
   <div class="btn-wrapper">
-    <button mat-raised-button color="secondary" (click)="openFullscreen()">Fullscreen</button>
+    <button mat-raised-button color="secondary" (click)="openFullscreen()">{{ unit.text.fullscreen | translate }}</button>
     <app-button-save-cancel (save)="saveUnit()" (cancel)="onCancel()"></app-button-save-cancel>
   </div>
 </div>
diff --git a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
index 62954c2cd..79ef0f5ba 100644
--- a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
@@ -1,10 +1,10 @@
 <div class="task-unit-edit">
-  <strong>Tasks</strong>
+  <strong>{{ unit.text.tasks | translate }}</strong>
 
   <app-unit-general-info-form [model]="model"></app-unit-general-info-form>
 
   <mat-hint>
-    Add questions with any number of possible answers. Mark the correct answer(s) with the checkbox.
+    {{ unit.text.hintAddQuestionAndAnswers | translate}}
   </mat-hint>
 
   <div *ngFor="let task of model.tasks" class="question-answer">
@@ -12,8 +12,8 @@
       <textarea matInput id="name" placeholder="Enter question here *" [(ngModel)]="task.name"></textarea>
     </mat-form-field>
 
-    <button mat-button class="remove" (click)="removeTask(task)">
-      <mat-icon>delete</mat-icon> Remove question
+    <button mat-button class="remove" (click)="removeTask(task)" matTooltip="{{ task.tooltip.deleteQuestion | translate }}">
+      <mat-icon>delete</mat-icon>
     </button>
 
     <div matLine class="answers">
@@ -21,16 +21,16 @@
         <div class="check-answer">
           <mat-checkbox [(ngModel)]="answer.value" name="value_{{idx}}"></mat-checkbox>
           <mat-form-field>
-            <input matInput placeholder="Enter answer here *" [(ngModel)]="answer.text">
+            <input matInput placeholder="{{ unit.placeholder.enterAnswer | translater }} *" [(ngModel)]="answer.text">
           </mat-form-field>
-          <button mat-button class="remove" (click)="removeAnswer(task, idx)" matTooltip="Remove answer">
+          <button mat-bwutton class="remove" (click)="removeAnswer(task, idx)" matTooltip="{{ task.tooltip.deleteAnswer | translate }}">
             <mat-icon>delete</mat-icon>
           </button>
         </div>
       </div>
       <div class="add-answer">
         <button mat-button (click)="addAnswerAtEnd(task)">
-          <mat-icon>add</mat-icon> Add answer
+          <mat-icon>add</mat-icon> {{ unit.text.addAnswer | translate }}
         </button>
       </div>
     </div>
@@ -38,7 +38,7 @@
 
   <p>
     <button mat-raised-button (click)="addTask()">
-      <mat-icon>add</mat-icon> Add question
+      <mat-icon>add</mat-icon> {{ unit.text.addQuestion | translate }}
     </button>
 
     <app-button-save-cancel (save)="saveUnit()" (cancel)="onCancel()"></app-button-save-cancel>
diff --git a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
index 393454116..59bcdf087 100644
--- a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
@@ -1,22 +1,22 @@
 <form [formGroup]="form">
   <mat-form-field>
-    <input matInput required formControlName="name" placeholder="Name">
+    <input matInput required formControlName="name" placeholder="{{ common.name | translate }}">
   </mat-form-field>
 
   <mat-form-field>
-    <textarea matInput formControlName="description" placeholder="Description" rows="4"></textarea>
+    <textarea matInput formControlName="description" placeholder="{{ common.description | translate }}" rows="4"></textarea>
   </mat-form-field>
 
   <mat-form-field *ngIf="model?.progressable">
-    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="Optional deadline">
+    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="{{ unit.placeholder.optionalDeadline | translate }}">
     <mat-datepicker-toggle matSuffix [for]="deadlineDatepicker"></mat-datepicker-toggle>
     <mat-datepicker #deadlineDatepicker (selectedChanged)="updateDateTime($event)"></mat-datepicker>
   </mat-form-field>
 
   <div>
     <mat-slide-toggle formControlName="visible">
-      <span *ngIf="form.value.visible">Unit can be seen by students</span>
-      <span *ngIf="!form.value.visible">Unit cannot be seen by students</span>
+      <span *ngIf="form.value.visible">{{ unit.text.canBeSeenByStudents | translate }}</span>
+      <span *ngIf="!form.value.visible">{{ unit.text.canNotBeSeenByStudents | translate }}s</span>
     </mat-slide-toggle>
   </div>
 </form>
diff --git a/app/webFrontend/src/app/unit/unit.component.html b/app/webFrontend/src/app/unit/unit.component.html
index 95b94c0bc..61914c07b 100644
--- a/app/webFrontend/src/app/unit/unit.component.html
+++ b/app/webFrontend/src/app/unit/unit.component.html
@@ -25,8 +25,8 @@
         <div class="user-detail" *ngIf="unit.unitCreator">{{unit.unitCreator.profile.firstName + ' ' +
           unit.unitCreator.profile.lastName}}
         </div>
-        <span *ngIf="unit.createdAt === unit.updatedAt">Published on: {{getFormattedDate(unit.createdAt)}}</span>
-        <span *ngIf="unit.createdAt !== unit.updatedAt">Changed on: {{getFormattedDate(unit.updatedAt)}}</span>
+        <span *ngIf="unit.createdAt === unit.updatedAt">{{ unit.text.publishedOn | translate }}: {{getFormattedDate(unit.createdAt)}}</span>
+        <span *ngIf="unit.createdAt !== unit.updatedAt">{{ unit.text.changedOn | translate }}: {{getFormattedDate(unit.updatedAt)}}</span>
       </div>
     </mat-card-content>
   </mat-card>
diff --git a/app/webFrontend/src/app/user/user-details/user-details.component.html b/app/webFrontend/src/app/user/user-details/user-details.component.html
index 99da3cb2d..e60ac8f9b 100644
--- a/app/webFrontend/src/app/user/user-details/user-details.component.html
+++ b/app/webFrontend/src/app/user/user-details/user-details.component.html
@@ -1,14 +1,14 @@
 <div class="user-detail-wrapper">
-    <h1>Profile</h1>
+    <h1>{{ common.profile | translate}}</h1>
 
     <app-user-profile *ngIf="user" [user]="user" [userId]="this.userService.user._id"></app-user-profile>
 
     <p *ngIf="user && (userService.isLoggedInUser(user) || userService.isAdmin())">
         <button mat-raised-button color="primary" routerLink="{{ getEditLink() }}">
             <mat-icon>edit</mat-icon>
-            Edit profile
+          {{ common.editProfile | translate }}
         </button>
     </p>
 
     <app-user-report *ngIf="user" [user]="user"></app-user-report>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/webFrontend/src/app/user/user-settings/user-settings.component.html b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
index 425eb36b0..634af16dd 100644
--- a/app/webFrontend/src/app/user/user-settings/user-settings.component.html
+++ b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
@@ -28,7 +28,7 @@ <h2>{{ common.notifications | translate }}</h2>
                     [checked]="emailSelection.hasValue() && isAllSelected(emailSelection)"
                     [indeterminate]="emailSelection.hasValue() && !isAllSelected(emailSelection)">
       </mat-checkbox>
-      <span>Email</span>
+      <span>{{ common.email | translate}}</span>
     </mat-header-cell>
     <mat-cell class="checkBox" *matCellDef="let course">
       <mat-checkbox (click)="$event.stopPropagation()"
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 8657ac4c7..e0590b38f 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -1,19 +1,38 @@
 {
+ "activation" :  {
+   "text" : {
+     "pleaseClick" : "Please click ",
+     "toActivate" : "to activate your account",
+     "toUseYourAccount" : "to use your account"
+   }
+ },
   "common": {
     "geli": "geli",
     "settings" : "Settings",
     "notifications" : "Notifications",
     "name" : "Name",
     "role" : "Role",
+    "about" : "About",
+    "administration" : "Administration",
+    "imprint" : "imprint",
+    "infobox" : "InfoBox",
+    "users" : "users",
+    "here" : "hier",
     "actions" : "Actions",
     "login": "Login",
     "register": "Registrieren",
     "email": "E-Mail",
     "description" : "description",
     "password": "Passwort",
+    "fullscreenMode" : "Fullscreen Mode",
+    "profile" : "Profil",
+    "cheatSheetYouFind" : "A Cheatsheet you can find ",
+    "editProfile" : "Profil bearbeiten",
     "export" : "Export",
     "duplicate" : "Duplicate",
     "send": "Senden",
+    "validate" : "Validate",
+    "submit" : "Submit",
     "save" : "Save",
     "dismiss": "Schließen",
     "delete": "Löschen",
@@ -40,6 +59,9 @@
       "password": "Passwörter müssen aus mindestens 8 Zeichen, inklusive einem Sonderzeichen und einer Ziffer bestehen",
       "passwordsMatch": "Die Passwörter stimmen nicht überein",
       "instituteMail": "Bitte nutzen Sie Ihre Instituts-Email"
+    },
+    "tooltip" : {
+      "quitFullscreenMode" : "Quit Fullscreen"
     }
   },
   "home": {
@@ -105,6 +127,7 @@
     "tooltipAdd" : "Kurs hinzufügen",
     "ShowCourse" : "Kurs anzeigen",
     "text" : {
+      "addMarkdownToCourse" : "Add Markdown to add text to this Course.",
       "yourCourseProgress" : "Your course progress",
       "goToCourse" : "Go to Course",
       "canSeenByStudents" : "Course can be seen by students",
@@ -135,6 +158,12 @@
     "placeholder" :
     {
       "uploadFiles" : "UploadFiles"
+    },
+    "text" : {
+      "addFile" : "Add File",
+      "filename" : "Filename",
+      "filesize" : "Filesize",
+      "actions" : "Actions"
     }
   },
   "unit" :
@@ -142,17 +171,53 @@
     "tooltip" :
     {
       "download" : "Download this Unit",
-      "delete" : "Download this Unit",
+      "delete" : "delete Unit",
       "duplicate" : "Copy this Unit",
-      "edit" : "Download this Unit",
-      "add" : "Download this Unit"
+      "edit" : "edit Unit",
+      "add" : "add Unit",
+      "deleteAnswer" : "Delete answer",
+      "deleteQuestion" : "Delete question"
+    },
+    "text" : {
+      "fullscreen" : "Fullscreen",
+      "tasks" : "Tasks",
+      "publishedOn" : "Published on",
+      "changedOn" : "Changed on",
+      "canBeSeenByStudents" : "Unit can be seen by students",
+      "canNotBeSeenByStudents" : "Unit cannot be seen by students",
+      "addAnswer" : "Add answer",
+      "addQuestion" : "Add question",
+      "hintAddQuestionAndAnswers" : "Add questions with any number of possible answers. Mark the correct answer(s) with the checkbox."
     },
-    "import":"Import Unit",
+    "placeholder" : {
+      "optionalDeadline" : "Optional Deadline",
+      "enterAnswer" : "Enter answer here",
+    },
+    "import" : "Import Unit",
     "addContent" : "Add content",
     "addTasks" : "Add tasks",
     "addFiles" : "Add files",
     "addCodeKata" : "Add code-kata",
     "addVideos" : "Add Videos",
     "addFreeText" : "Add free text"
+  },
+  "code-kata" : {
+    "information" : {
+      "info1" : "Separate definition, coding and test areas with ",
+      "info2" : "Your students can only edit the code area."
+    },
+    "text" : {
+      "logs" : "Logs",
+      "codeHere" : "Your code goes here",
+      "codeExample" : "This is the provided example solution",
+      "testsNeedToSuccees" : "These tests need to success"
+    }
+  },
+  "sort" : {
+    "lastVisited" : "last visited",
+    "alphabetically" : "alphabetically",
+    "placeholder" : {
+      "sortedBy" : "Sorted by"
+    }
   }
 }

From 4879d01a2694209ceabb940895a14dc3226d8d9e Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 8 May 2018 16:00:03 +0200
Subject: [PATCH 05/32] more and more resource vars

---
 .../src/app/auth/reset/reset.component.html   |  8 +++---
 .../course-edit/course-edit.component.html    |  2 +-
 .../course-user-list.component.html           |  4 +--
 .../lecture-form/lecture-form.component.html  |  6 ++---
 .../notification/notification.component.html  |  4 +--
 app/webFrontend/src/assets/i18n/de.json       | 27 ++++++++++++++-----
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/webFrontend/src/app/auth/reset/reset.component.html b/app/webFrontend/src/app/auth/reset/reset.component.html
index a49d9eead..0b0e24858 100644
--- a/app/webFrontend/src/app/auth/reset/reset.component.html
+++ b/app/webFrontend/src/app/auth/reset/reset.component.html
@@ -1,15 +1,15 @@
 <mat-card *ngIf="hasToken === false" class="reset-card">
   <mat-card-header>
-    <mat-card-title><h1>Request password reset</h1></mat-card-title>
+    <mat-card-title><h1>{{ auth.resetPassword.requestReset | translate }}</h1></mat-card-title>
   </mat-card-header>
 
   <mat-card-content>
     <form name="form" (ngSubmit)="requestReset()" [formGroup]="resetForm">
       <mat-form-field>
-        <input matInput formControlName="email" placeholder="Mail address">
+        <input matInput formControlName="email" placeholder="{{ common.email | translate }}">
       </mat-form-field>
 
-      <button mat-raised-button color="primary" matTooltip="{{ auth.tooltipResetPass }}" class="mat-button" type="submit" [disabled]="loading">Request password reset</button>
+      <button mat-raised-button color="primary" matTooltip="{{ auth.tooltipResetPass | translate }}" class="mat-button" type="submit" [disabled]="loading">{{ auth.resetPassword.requestReset | translate }}</button>
       <br>
     </form>
   </mat-card-content>
@@ -24,7 +24,7 @@
 
       <app-password-input [form]="resetForm"></app-password-input>
 
-      <button mat-raised-button  matTooltip="{{ auth.tooltipResetPassword | translate }}" color="primary" type="submit" [disabled]="loading">Reset</button>
+      <button mat-raised-button  matTooltip="{{ auth.tooltipResetPassword | translate }}" color="primary" type="submit" [disabled]="loading">{{ auth.resetPassword.reset | translate }}</button>
     </form>
   </mat-card-content>
 </mat-card>
diff --git a/app/webFrontend/src/app/course/course-edit/course-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-edit.component.html
index 4395a80bc..548fdc0a9 100644
--- a/app/webFrontend/src/app/course/course-edit/course-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-edit.component.html
@@ -1,5 +1,5 @@
 <div class="course-header">
-  <h1>Edit course</h1>
+  <h1>{{ course.text.editCourse | translate }}</h1>
   <a mat-button [routerLink]="['/course', id]" target="_blank" class="md-raised md-primary course-link">
     <mat-icon>open_in_new</mat-icon>
     {{ course.text.goToCourse | translate }}
diff --git a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
index 296a4bbbb..7f245896b 100644
--- a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
@@ -23,7 +23,7 @@
   <mat-expansion-panel class="panel" [expanded]="true" #expPanel2>
     <mat-expansion-panel-header>
       <mat-panel-title class="title">
-        In course
+        {{ course.text.inCourse | translate }}
       </mat-panel-title>
       <mat-panel-description>
         <p class="line">{{role}}s: {{dragableUsersInCourse.length}} of
@@ -42,7 +42,7 @@
   <mat-expansion-panel class="panel" [expanded]="false" #expPanel1>
     <mat-expansion-panel-header>
       <mat-panel-title class="title">
-        Not in course
+        {{ course.text.notInCourse | translate }}
       </mat-panel-title>
       <mat-panel-description>
         <p class="line">{{role}}s: {{dragableUsers.length}} of {{usersTotal}}</p>
diff --git a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
index 817827962..551527bff 100644
--- a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
+++ b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
@@ -1,14 +1,14 @@
 <form [formGroup]="lectureForm" (ngSubmit)="formSubmit()">
   <mat-form-field>
-    <input matInput formControlName="name" placeholder="Name">
+    <input matInput formControlName="name" placeholder="{{ common.name | translator }}">
   </mat-form-field>
 
   <mat-form-field>
-    <textarea matInput formControlName="description" placeholder="Description"></textarea>
+    <textarea matInput formControlName="description" placeholder="{{ common.description | translator }}"></textarea>
   </mat-form-field>
 
   <p>
     <button mat-raised-button [disabled]="!lectureForm.valid" color="primary" type="submit">{{ actionLabel }}</button>
-    <button mat-raised-button (click)="onCancel()">Cancel</button>
+    <button mat-raised-button (click)="onCancel()">{{ common.cancel | translate }}</button>
   </p>
 </form>
diff --git a/app/webFrontend/src/app/notification/notification.component.html b/app/webFrontend/src/app/notification/notification.component.html
index 2cac79457..04e0ba69b 100644
--- a/app/webFrontend/src/app/notification/notification.component.html
+++ b/app/webFrontend/src/app/notification/notification.component.html
@@ -4,8 +4,8 @@
 </button>
 <mat-menu #notificationMenu="matMenu">
   <span class="headline">Notifications</span>
-  <span *ngIf="!isNullOrUndefined(notifications) && notifications.length > 0" class="clearButton" (click)="clearAll()">Clear all</span>
-  <span *ngIf="isNullOrUndefined(notifications) || notifications.length <= 0" class="noNotification">You don't have notifications.</span>
+  <span *ngIf="!isNullOrUndefined(notifications) && notifications.length > 0" class="clearButton" (click)="clearAll()">{{ notifications.text.clearAll | translate }}</span>
+  <span *ngIf="isNullOrUndefined(notifications) || notifications.length <= 0" class="noNotification">{{ notifications.text.noNotifications | translate }}</span>
   <mat-nav-list>
     <div *ngFor="let notification of notifications">
       <mat-divider></mat-divider>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index e0590b38f..50f5dfd16 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -40,8 +40,6 @@
     "upload" : "upload",
     "download" : "download",
     "back": "Zurück",
-    "tooltipDownloadUnit" : "Download this Unit",
-    "tooltipClickToOpen" : "Auf-/ zuklappen",
     "profile": {
       "firstName": "Vorname",
       "lastName": "Nachname",
@@ -61,15 +59,19 @@
       "instituteMail": "Bitte nutzen Sie Ihre Instituts-Email"
     },
     "tooltip" : {
-      "quitFullscreenMode" : "Quit Fullscreen"
+      "quitFullscreenMode" : "Quit Fullscreen",
+      "downloadUnit": "Download this Unit",
+      "clickToOpen": "Auf-/ zuklappen"
     }
   },
   "home": {
     "welcomeTo": "Willkommen auf"
   },
   "auth": {
-    "tooltipResetPassword" : "Klicken Sie hier, um das Passwort zu resetten",
-    "tooltipForgotPassword":"Klicken Sie hier, um ein neues Passwort anzufordern",
+    "tooltip" : {
+      "ResetPassword": "Klicken Sie hier, um das Passwort zu resetten",
+      "ForgotPassword": "Klicken Sie hier, um ein neues Passwort anzufordern"
+    },
     "forgotPassword": "Passwort vergessen",
     "loginSuccess": "Login erfolgreich",
     "loginFailed": "Login fehlgeschlagen",
@@ -93,6 +95,10 @@
       "successful": "Aktivierung erneut senden erfolgreich",
       "mailSent": "Wir haben Ihnen einen neuen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
       "tooltipResendAction" : "Klicken Sie hier, um einen neuen Aktivierungslink anzufordern"
+    },
+    "resetPassword" : {
+      "reset" : "Reset",
+      "requestReset" : "Request password reset"
     }
   },
   "user" : {
@@ -127,6 +133,9 @@
     "tooltipAdd" : "Kurs hinzufügen",
     "ShowCourse" : "Kurs anzeigen",
     "text" : {
+      "inCourse" : "In Course",
+      "notInCourse" : "Not in Course",
+      "editCourse" : "Edit Course",
       "addMarkdownToCourse" : "Add Markdown to add text to this Course.",
       "yourCourseProgress" : "Your course progress",
       "goToCourse" : "Go to Course",
@@ -191,7 +200,7 @@
     },
     "placeholder" : {
       "optionalDeadline" : "Optional Deadline",
-      "enterAnswer" : "Enter answer here",
+      "enterAnswer" : "Enter answer here"
     },
     "import" : "Import Unit",
     "addContent" : "Add content",
@@ -219,5 +228,11 @@
     "placeholder" : {
       "sortedBy" : "Sorted by"
     }
+  },
+  "notifications" : {
+    "text" : {
+      "clearAll" : "Clear all",
+      "noNotifications" : "You haven't any notifications"
+    }
   }
 }

From 83eefb188c347ba4c96b03f1cc0d512d5ce74f5e Mon Sep 17 00:00:00 2001
From: wurmc <clarawurm95@gmail.com>
Date: Mon, 14 May 2018 20:23:21 +0200
Subject: [PATCH 06/32] bugfix: de.json and en.json sortet variables
 alphabetically. translated all variables to German. Corrected grammar

---
 app/webFrontend/src/assets/i18n/de.json | 383 ++++++++++++------------
 app/webFrontend/src/assets/i18n/en.json | 244 ++++++++++++---
 2 files changed, 388 insertions(+), 239 deletions(-)

diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 50f5dfd16..b77a59fcf 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -1,238 +1,231 @@
 {
- "activation" :  {
-   "text" : {
-     "pleaseClick" : "Please click ",
-     "toActivate" : "to activate your account",
-     "toUseYourAccount" : "to use your account"
-   }
- },
+  "activation": {
+    "text": {
+      "pleaseClick": "Bitte klicken",
+      "toActivate": ", um den Account zu aktivieren.",
+      "toUseYourAccount": ", um den Account zu nutzen."
+    }
+  },
+  "auth": {
+    "confirmPassword": "Passwort bestätigen",
+    "forgotPassword": "Passwort vergessen",
+    "loginFailed": "Login fehlgeschlagen",
+    "loginFailedError": {
+      "couldNotBeVerified": "Ihre Logindaten konnten nicht verifiziert werden. Bitte versuchen Sie es noch ein mal.",
+      "notActiveYet": "Ihr Account wurde noch nicht aktiviert.",
+      "unknown": "Es ist ein unbekannter Fehler aufgetreten."
+    },
+    "loginSuccess": "Login erfolgreich",
+    "registration": {
+      "back": "Zurück zur Startseite",
+      "mailSent": "Wir haben Ihnen einen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
+      "registerAs": "Registrieren als",
+      "resendActivationButton": "Aktivierung erneut senden",
+      "successful": "Registrierung erfolgreich",
+      "teacherRegistrationButton": "Kein Student?",
+      "tooltipRegister": "Klicken Sie hier, um Ihre Registrierung abzuschließen."
+    },
+    "resendActivation": {
+      "back": "Zurück zur Registrierung",
+      "mailSent": "Wir haben Ihnen einen neuen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
+      "successful": "Aktivierung erneut senden erfolgreich.",
+      "tooltipResendAction": "Klicken Sie hier, um einen neuen Aktivierungslink anzufordern."
+    },
+    "resetPassword": {
+      "requestReset": "Passwort zurücksetzen",
+      "reset": "Zurücksetzen"
+    },
+    "tooltip": {
+      "ForgotPassword": "Klicken Sie hier, um ein neues Passwort anzufordern.",
+      "ResetPassword": "Klicken Sie hier, um das Passwort zurückzusetzen."
+    }
+  },
+  "code-kata": {
+    "information": {
+      "info1": "Separate definition, coding and test areas with",
+      "info2": "Ihre Studenten können ausschließlich den Codebereich editieren."
+    },
+    "text": {
+      "codeExample": "Das ist die bereitgestellte Beispiellösung.",
+      "codeHere": "Ihr Code kommt hierhin",
+      "logs": "Logs",
+      "testsNeedToSuccees": "Diese Tests müssen erfolgreich sein."
+    }
+  },
   "common": {
+    "about": "Über",
+    "actions": "Aktionen",
+    "administration": "Administration",
+    "back": "Zurück",
+    "cheatSheetYouFind": "Einen Spickzettel finden Sie hier.",
+    "delete": "Löschen",
+    "description": "Beschreibung",
+    "dismiss": "Schließen",
+    "download": "Download",
+    "duplicate": "Duplizieren",
+    "edit": "bearbeiten",
+    "editProfile": "Profil bearbeiten",
+    "email": "E-Mail",
+    "export": "Export",
+    "fullscreenMode": "Vollbildmodus",
     "geli": "geli",
-    "settings" : "Settings",
-    "notifications" : "Notifications",
-    "name" : "Name",
-    "role" : "Role",
-    "about" : "About",
-    "administration" : "Administration",
-    "imprint" : "imprint",
-    "infobox" : "InfoBox",
-    "users" : "users",
-    "here" : "hier",
-    "actions" : "Actions",
+    "here": "hier",
+    "imprint": "imprint",
+    "infobox": "Infobox",
     "login": "Login",
-    "register": "Registrieren",
-    "email": "E-Mail",
-    "description" : "description",
+    "name": "Name",
+    "notifications": "Benachrichtigungen",
     "password": "Passwort",
-    "fullscreenMode" : "Fullscreen Mode",
-    "profile" : "Profil",
-    "cheatSheetYouFind" : "A Cheatsheet you can find ",
-    "editProfile" : "Profil bearbeiten",
-    "export" : "Export",
-    "duplicate" : "Duplicate",
-    "send": "Senden",
-    "validate" : "Validate",
-    "submit" : "Submit",
-    "save" : "Save",
-    "dismiss": "Schließen",
-    "delete": "Löschen",
-    "edit" : "edit",
-    "upload" : "upload",
-    "download" : "download",
-    "back": "Zurück",
+    "profile": "Profil",
     "profile": {
       "firstName": "Vorname",
       "lastName": "Nachname",
       "uid": "Matrikelnummer"
     },
+    "register": "Registrieren",
+    "role": "Rolle",
     "roles": {
       "student": "Student",
       "teacher": "Lehrer"
     },
+    "save": "Speichern",
+    "send": "Senden",
+    "settings": "Einstellungen",
+    "submit": "Absenden",
+    "tooltip": {
+      "quitFullscreenMode": "Vollbildmodus beenden",
+      "downloadUnit": "Diese Einheit downloaden",
+      "clickToOpen": "Auf-/ zuklappen"
+    },
+    "upload": "hochladen",
+    "users": "Benutzer",
+    "validate": "Prüfen",
     "validation": {
-      "required": "Eingabe notwendig",
-      "minLength": "Mindestens {{min}} Zeichen benötigt",
+      "instituteMail": "Bitte nutzen Sie Ihre Instituts-E-Mail.",
+      "invalid": "Keine gültige Eingabe.",
       "maxLength": "Maximal {{max}} Zeichen erlaubt",
-      "invalid": "Keine gültige Eingabe",
+      "minLength": "Mindestens {{min}} Zeichen benötigt",
       "password": "Passwörter müssen aus mindestens 8 Zeichen, inklusive einem Sonderzeichen und einer Ziffer bestehen",
-      "passwordsMatch": "Die Passwörter stimmen nicht überein",
-      "instituteMail": "Bitte nutzen Sie Ihre Instituts-Email"
-    },
-    "tooltip" : {
-      "quitFullscreenMode" : "Quit Fullscreen",
-      "downloadUnit": "Download this Unit",
-      "clickToOpen": "Auf-/ zuklappen"
+      "passwordsMatch": "Die Passwörter stimmen nicht überein.",
+      "required": "Eingabe notwendig"
     }
   },
-  "home": {
-    "welcomeTo": "Willkommen auf"
-  },
-  "auth": {
-    "tooltip" : {
-      "ResetPassword": "Klicken Sie hier, um das Passwort zu resetten",
-      "ForgotPassword": "Klicken Sie hier, um ein neues Passwort anzufordern"
+  "course": {
+    "delete": "Kurs löschen",
+    "placeholder": {
+      "Description": "Kursbeschreibung",
+      "Name": "Kursname"
     },
-    "forgotPassword": "Passwort vergessen",
-    "loginSuccess": "Login erfolgreich",
-    "loginFailed": "Login fehlgeschlagen",
-    "loginFailedError": {
-      "couldNotBeVerified": "Ihre Login-Daten konnten nicht verifiziert werden. Bitte versuchen Sie es noch ein mal.",
-      "notActiveYet": "Ihr Account wurde noch nicht aktiviert.",
-      "unknown": "Es ist ein unbekannter Fehler aufgetreten."
+    "ShowCourse": "Kurs anzeigen",
+    "text": {
+      "addMarkdownToCourse": "Markdown hinzufügen, um Text zu diesem Kurs hinzuzufügen.",
+      "canNotSeenByStudents": "Kurs ist für Studenten nicht sichtbar.",
+      "canSeenByStudents": "Kurs ist für Studenten sichtbar.",
+      "editCourse": "Kurs bearbeiten",
+      "enterAccessKeyForStudents": "Geben Sie einen Einschreibeschlüssel für die Studenten ein.",
+      "goToCourse": "Zum Kurs",
+      "inCourse": "Im Kurs",
+      "isFreeForEveryone": "Der Kurs ist offen und für jeden zugänglich.",
+      "notInCourse": "Nicht im Kurs",
+      "selectAccessType": "Bitte wählen Sie Ihren Kurstyp aus.",
+      "uploadWhitelist": "Laden Sie Ihre OBS-csv-Datei mit Ihren Kursteilnehmern hoch, um sie auf die Freigabeliste zu setzen.<br />Alte Freigabelisten-Benutzer werden durch Hochladen einer neuen Datei entfernt.",
+      "yourCourseProgress": "Ihr Kursfortschritt"
     },
-    "confirmPassword": "Passwort bestätigen",
-    "registration": {
-      "tooltipRegister": "Klicken Sie hier, um Ihre Registrierung abzuschießen",
-      "registerAs": "Registrieren als",
-      "successful": "Registrierung erfolgreich",
-      "mailSent": "Wir haben Ihnen einen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
-      "back": "Zurück zur Startseite",
-      "teacherRegistrationButton": "Kein Student?",
-      "resendActivationButton": "Aktivierung erneut senden"
-    },
-    "resendActivation": {
-      "back": "Zurück zur Registrierung",
-      "successful": "Aktivierung erneut senden erfolgreich",
-      "mailSent": "Wir haben Ihnen einen neuen Aktivierungslink an Ihre E-Mail-Adresse gesendet.",
-      "tooltipResendAction" : "Klicken Sie hier, um einen neuen Aktivierungslink anzufordern"
+    "tooltipAdd": "Kurs hinzufügen"
+  },
+  "dashboard": {
+    "addCourse": "Kurs hinzufügen",
+    "availableCourses": "Verfügbare Kurse",
+    "courses": "Kurse",
+    "createCourse": "Kurs erstellen",
+    "createdCourses": "Meine erstellten Kurse",
+    "importCourse": "Kurs importieren",
+    "inactiveCourses": "Inaktive Kurse",
+    "myCourses": "Meine Kurse",
+    "teacherCourses": "Meine Lehrveranstaltungen"
+  },
+  "file": {
+    "placeholder": {
+      "uploadFiles": "UploadFiles"
     },
-    "resetPassword" : {
-      "reset" : "Reset",
-      "requestReset" : "Request password reset"
+    "text": {
+      "actions": "Aktionen",
+      "addFile": "Datei hinzufügen",
+      "filename": "Dateiname",
+      "filesize": "Dateigröße"
     }
   },
-  "user" : {
-    "editUser" : "Benutzer bearbeiten",
-    "deleteUser" : "Benutzer löschen",
-    "text" : {
-      "signedIn": "Signed in",
-      "notSignedIn": "Not Signed in"
+  "home": {
+    "welcomeTo": "Willkommen auf"
+  },
+  "lecture": {
+    "tooltip": {
+      "add": "Einheit hinzufügen",
+      "delete": "Einheit löschen",
+      "download": "Einheit downloaden",
+      "duplicate": "Kapitel kopieren",
+      "edit": "Einheit bearbeiten"
     }
   },
-
   "mainMenu": {
-    "admin": "Admin",
     "about": "Über geli",
+    "admin": "Admin",
     "imprint": "Impressum",
     "logout": "Logout",
     "userSettings": "Einstellungen"
   },
-  "dashboard": {
-    "courses": "Kurse",
-    "myCourses": "Meine Kurse",
-    "availableCourses": "Verfügbare Kurse",
-    "inactiveCourses": "Inaktive Kurse",
-    "teacherCourses": "Meine Lehrveranstaltungen",
-    "createdCourses": "Meine erstellten Kurse",
-    "addCourse": "Kurs hinzufügen",
-    "createCourse": "Kurs erstellen",
-    "importCourse": "Kurs importieren"
-  },
-  "course" : {
-    "delete" : "Delete course",
-    "tooltipAdd" : "Kurs hinzufügen",
-    "ShowCourse" : "Kurs anzeigen",
-    "text" : {
-      "inCourse" : "In Course",
-      "notInCourse" : "Not in Course",
-      "editCourse" : "Edit Course",
-      "addMarkdownToCourse" : "Add Markdown to add text to this Course.",
-      "yourCourseProgress" : "Your course progress",
-      "goToCourse" : "Go to Course",
-      "canSeenByStudents" : "Course can be seen by students",
-      "canNotSeenByStudents" : "Course cannot be seen by students",
-      "isFreeForEveryone" : "The course is free and accessible for everyone",
-      "enterAccessKeyForStudents" : "Enter an access key for the students",
-      "selectAccessType" : "Please select your course access typ",
-      "uploadWhitelist" : "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file."
-    },
-    "placeholder" : {
-      "Name" : "Course Name",
-      "Description" : "Course Description"
-    }
-  } ,
-  "lecture" :
-  {
-    "tooltip" :
-    {
-      "download" : "Download this Unit",
-      "delete" : "Download this Unit",
-      "edit" : "Download this Unit",
-      "duplicate" : "Copy this lecture",
-      "add" : "Download this Unit"
+  "notifications": {
+    "text": {
+      "clearAll": "Alle löschen",
+      "noNotifications": "Sie haben keine Benachrichtigungen."
     }
   },
-  "file" :
-  {
-    "placeholder" :
-    {
-      "uploadFiles" : "UploadFiles"
-    },
-    "text" : {
-      "addFile" : "Add File",
-      "filename" : "Filename",
-      "filesize" : "Filesize",
-      "actions" : "Actions"
+  "sort": {
+    "alphabetically": "alphabetisch",
+    "lastVisited": "zuletzt besucht",
+    "placeholder": {
+      "sortedBy": "Sortieren nach"
     }
   },
-  "unit" :
-  {
-    "tooltip" :
-    {
-      "download" : "Download this Unit",
-      "delete" : "delete Unit",
-      "duplicate" : "Copy this Unit",
-      "edit" : "edit Unit",
-      "add" : "add Unit",
-      "deleteAnswer" : "Delete answer",
-      "deleteQuestion" : "Delete question"
-    },
-    "text" : {
-      "fullscreen" : "Fullscreen",
-      "tasks" : "Tasks",
-      "publishedOn" : "Published on",
-      "changedOn" : "Changed on",
-      "canBeSeenByStudents" : "Unit can be seen by students",
-      "canNotBeSeenByStudents" : "Unit cannot be seen by students",
-      "addAnswer" : "Add answer",
-      "addQuestion" : "Add question",
-      "hintAddQuestionAndAnswers" : "Add questions with any number of possible answers. Mark the correct answer(s) with the checkbox."
-    },
-    "placeholder" : {
-      "optionalDeadline" : "Optional Deadline",
-      "enterAnswer" : "Enter answer here"
+  "unit": {
+    "addCodeKata": "Code-Kata hinzufügen",
+    "addContent": "Inhalt hinzufügen",
+    "addFiles": "Dateien hinzufügen",
+    "addFreeText": "Freitext hinzufügen",
+    "addTasks": "Aufgaben hinzufügen",
+    "addVideos": "Videos hinzufügen",
+    "import": "Einheit importieren",
+    "placeholder": {
+      "enterAnswer": "Antwort hier eintragen",
+      "optionalDeadline": "Optionale Frist"
     },
-    "import" : "Import Unit",
-    "addContent" : "Add content",
-    "addTasks" : "Add tasks",
-    "addFiles" : "Add files",
-    "addCodeKata" : "Add code-kata",
-    "addVideos" : "Add Videos",
-    "addFreeText" : "Add free text"
-  },
-  "code-kata" : {
-    "information" : {
-      "info1" : "Separate definition, coding and test areas with ",
-      "info2" : "Your students can only edit the code area."
+    "text": {
+      "addAnswer": "Antwort hinzufügen",
+      "addQuestion": "Frage hinzufügen",
+      "canBeSeenByStudents": "Eihnheit ist für Studenten sichtbar.",
+      "canNotBeSeenByStudents": "Einheit ist für Studenten nicht sichtbar.",
+      "changedOn": "Geändert am",
+      "fullscreen": "Vollbild",
+      "hintAddQuestionAndAnswers": "Fragen mit beliebiger Anzahl an möglichen Antowrten hinzufügen. Richtige Antwort(en) mit Hilfe der checkbox markieren.",
+      "publishedOn": "Veröffentlicht am",
+      "tasks": "Aufgaben"
     },
-    "text" : {
-      "logs" : "Logs",
-      "codeHere" : "Your code goes here",
-      "codeExample" : "This is the provided example solution",
-      "testsNeedToSuccees" : "These tests need to success"
-    }
-  },
-  "sort" : {
-    "lastVisited" : "last visited",
-    "alphabetically" : "alphabetically",
-    "placeholder" : {
-      "sortedBy" : "Sorted by"
+    "tooltip": {
+      "add": "Einheit hinzufügen",
+      "delete": "Einheit löschen",
+      "deleteAnswer": "Antwort löschen",
+      "deleteQuestion": "Frage löschen",
+      "download": "Diese Einheit downloaden",
+      "duplicate": "Diese Einheit kopieren",
+      "edit": "Einheit bearbeiten"
     }
   },
-  "notifications" : {
-    "text" : {
-      "clearAll" : "Clear all",
-      "noNotifications" : "You haven't any notifications"
+  "user": {
+    "deleteUser": "Benutzer löschen",
+    "editUser": "Benutzer bearbeiten",
+    "text": {
+      "notSignedIn": "Nicht eingetragen",
+      "signedIn": "Eingetragen"
     }
   }
 }
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 87dbd30e1..85178426d 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -1,75 +1,231 @@
 {
+  "activation": {
+    "text": {
+      "pleaseClick": "Please click ",
+      "toActivate": "to activate your account",
+      "toUseYourAccount": "to use your account"
+    }
+  },
+  "auth": {
+    "confirmPassword": "Confirm password",
+    "forgotPassword": "Forgot password",
+    "loginFailed": "Login failed",
+    "loginFailedError": {
+      "couldNotBeVerified": "Your login details could not be verified. Please try again.",
+      "notActiveYet": "Your account has not been activated yet.",
+      "unknown": "An unknown error occured."
+    },
+    "loginSuccess": "Login successful",
+    "registration": {
+      "back": "Back to frontpage",
+      "mailSent": "We have sent you an activation link to your specified email address.",
+      "registerAs": "Register as",
+      "resendActivationButton": "Resend activation",
+      "successful": "Registration was successful",
+      "teacherRegistrationButton": "Not a student?",
+      "tooltipRegister": "Click here to complete your registration."
+    },
+    "resendActivation": {
+      "back": "Back to registration",
+      "mailSent": "We have sent you a new activation link to your specified email address.",
+      "successful": "Resend activation was successful.",
+      "tooltipResendAction": "Click here to request new activation link."
+    },
+    "resetPassword": {
+      "requestReset": "Request password reset",
+      "reset": "Reset"
+    },
+    "tooltip": {
+      "ForgotPassword": "Click here to request a new password.",
+      "ResetPassword": "Click here to reset password."
+    }
+  },
+  "code-kata": {
+    "information": {
+      "info1": "Separate definition, coding and test areas with",
+      "info2": "Your students can only edit the code area."
+    },
+    "text": {
+      "codeExample": "This is the provided example solution.",
+      "codeHere": "Your code goes here.",
+      "logs": "Logs",
+      "testsNeedToSuccees": "These tests need to succeed."
+    }
+  },
   "common": {
+    "about": "About",
+    "actions": "Actions",
+    "administration": "Administration",
+    "back": "Back",
+    "cheatSheetYouFind": "A cheat sheet you can find ",
+    "delete": "Delete",
+    "description": "Description",
+    "dismiss": "Dismiss",
+    "download": "Download",
+    "duplicate": "Duplicate",
+    "edit": "Ddit",
+    "editProfile": "Edit profile",
+    "email": "Email",
+    "export": "Export",
+    "fullscreenMode": "Fullscreen Mode",
     "geli": "geli",
+    "here": "here",
+    "imprint": "imprint",
+    "infobox": "InfoBox",
     "login": "Login",
-    "register": "Register",
-    "email": "Email",
+    "name": "Name",
+    "notifications": "Notifications",
     "password": "Password",
-    "send": "Send",
-    "dismiss": "Dismiss",
-    "back": "Back",
+    "profile": "Profile",
     "profile": {
       "firstName": "First name",
       "lastName": "Last name",
       "uid": "Matriculation number"
     },
+    "register": "Register",
+    "role": "Role",
     "roles": {
       "student": "Student",
       "teacher": "Teacher"
     },
+    "save": "Save",
+    "send": "Send",
+    "settings": "Settings",
+    "submit": "Submit",
+    "tooltip": {
+      "quitFullscreenMode": "Quit Fullscreen",
+      "downloadUnit": "Download this Unit",
+      "clickToOpen": "open up/close"
+    },
+    "upload": "upload",
+    "users": "users",
+    "validate": "Validate",
     "validation": {
-      "required": "Input required",
-      "minLength": "At least {{min}} characters required",
-      "maxLength": "At least {{max}} characters required",
+      "instituteMail": "Please register with your institute email.",
       "invalid": "Input is invalid",
-      "password": "Password must have at least 8 characters which contain one special character or digit",
-      "passwordsMatch": "Passwords do not match",
-      "instituteMail": "Please register with your institute email"
+      "maxLength": "At least {{max}} characters required",
+      "minLength": "At least {{min}} characters required",
+      "password": "Password must have at least 8 characters which contain one special character and one digit.",
+      "passwordsMatch": "Passwords do not match.",
+      "required": "Input required"
+    }
+  },
+  "course": {
+    "delete": "Delete course",
+    "placeholder": {
+      "Description": "Course description",
+      "Name": "Course name"
+    },
+    "ShowCourse": "Show course",
+    "text": {
+      "addMarkdownToCourse": "Add markdown to add text to this course.",
+      "canNotSeenByStudents": "Course cannot be seen by students.",
+      "canSeenByStudents": "Course can be seen by students.",
+      "editCourse": "Edit course",
+      "enterAccessKeyForStudents": "Enter an access key for the students.",
+      "goToCourse": "Go to course",
+      "inCourse": "In Course",
+      "isFreeForEveryone": "The course is free and accessible for everyone.",
+      "notInCourse": "Not in course",
+      "selectAccessType": "Please select your course access type.",
+      "uploadWhitelist": "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file.",
+      "yourCourseProgress": "Your course progress"
+    },
+    "tooltipAdd": "Add course"
+  },
+  "dashboard": {
+    "addCourse": "Add course",
+    "availableCourses": "Available courses",
+    "courses": "Courses",
+    "createCourse": "Create course",
+    "createdCourses": "My created courses",
+    "importCourse": "Import course",
+    "inactiveCourses": "Inactive courses",
+    "myCourses": "My courses",
+    "teacherCourses": "My teacher courses"
+  },
+  "file": {
+    "placeholder": {
+      "uploadFiles": "UploadFiles"
+    },
+    "text": {
+      "actions": "Actions",
+      "addFile": "Add file",
+      "filename": "File name",
+      "filesize": "File size"
     }
   },
   "home": {
     "welcomeTo": "Welcome to"
   },
-  "auth": {
-    "forgotPassword": "Forgot password",
-    "loginSuccess": "Login successful",
-    "loginFailed": "Login failed",
-    "loginFailedError": {
-      "couldNotBeVerified": "Your login details could not be verified. Please try again.",
-      "notActiveYet": "Your account has not been activated yet.",
-      "unknown": "An unknown error occured."
-    },
-    "confirmPassword": "Confirm password",
-    "registration": {
-      "registerAs": "Register as",
-      "successful": "Registration was successful",
-      "mailSent": "We have sent you an activation link to your specified email address.",
-      "back": "Back to frontpage",
-      "teacherRegistrationButton": "Not a student?",
-      "resendActivationButton": "Resend activation"
-    },
-    "resendActivation": {
-      "back": "Back to registration",
-      "successful": "Resend activation was successful",
-      "mailSent": "We have sent you a new activation link to your specified email address."
+  "lecture": {
+    "tooltip": {
+      "add": "Add new unit",
+      "delete": "Delete unit",
+      "download": "Download this unit",
+      "duplicate": "Copy this lecture",
+      "edit": "Edit this unit"
     }
   },
   "mainMenu": {
-    "admin": "Admin",
     "about": "About",
+    "admin": "Admin",
     "imprint": "Imprint",
     "logout": "Logout",
     "userSettings": "Settings"
   },
-  "dashboard": {
-    "courses": "Courses",
-    "myCourses": "My courses",
-    "availableCourses": "Available courses",
-    "inactiveCourses": "Inactive courses",
-    "teacherCourses": "My teacher courses",
-    "createdCourses": "My created courses",
-    "addCourse": "Add course",
-    "createCourse": "Create course",
-    "importCourse": "Import course"
+  "notifications": {
+    "text": {
+      "clearAll": "Clear all",
+      "noNotifications": "You have no notifications"
+    }
+  },
+  "sort": {
+    "alphabetically": "alphabetically",
+    "lastVisited": "last visited",
+    "placeholder": {
+      "sortedBy": "Sorted by"
+    }
+  },
+  "unit": {
+    "addCodeKata": "Add code-kata",
+    "addContent": "Add content",
+    "addFiles": "Add files",
+    "addFreeText": "Add free text",
+    "addTasks": "Add tasks",
+    "addVideos": "Add videos",
+    "import": "Import unit",
+    "placeholder": {
+      "enterAnswer": "Enter answer here",
+      "optionalDeadline": "Optional deadline"
+    },
+    "text": {
+      "addAnswer": "Add answer",
+      "addQuestion": "Add question",
+      "canBeSeenByStudents": "Unit can be seen by students.",
+      "canNotBeSeenByStudents": "Unit cannot be seen by students.",
+      "changedOn": "Changed on",
+      "fullscreen": "Fullscreen",
+      "hintAddQuestionAndAnswers": "Add questions with any number of possible answers. Mark the correct answer(s) with the checkbox.",
+      "publishedOn": "Published on",
+      "tasks": "Tasks"
+    },
+    "tooltip": {
+      "add": "add unit",
+      "delete": "delete unit",
+      "deleteAnswer": "Delete answer",
+      "deleteQuestion": "Delete question",
+      "download": "Download this unit",
+      "duplicate": "Copy this unit",
+      "edit": "Edit unit"
+    }
+  },
+  "user": {
+    "deleteUser": "Delete user",
+    "editUser": "Edit user",
+    "text": {
+      "notSignedIn": "Not Signed in",
+      "signedIn": "Signed in"
+    }
   }
 }

From e6d5f7de718ca4231ddf4b865c3da053fe52ea51 Mon Sep 17 00:00:00 2001
From: wurmc <clarawurm95@gmail.com>
Date: Mon, 14 May 2018 20:24:59 +0200
Subject: [PATCH 07/32] bugfix: de.json and en.json sortet variables
 alphabetically. translated all variables to German. Corrected grammar.
 warning corrected

---
 app/webFrontend/src/assets/i18n/de.json | 2 +-
 app/webFrontend/src/assets/i18n/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index b77a59fcf..9e80d1b92 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -77,7 +77,7 @@
     "notifications": "Benachrichtigungen",
     "password": "Passwort",
     "profile": "Profil",
-    "profile": {
+    "profileDetails": {
       "firstName": "Vorname",
       "lastName": "Nachname",
       "uid": "Matrikelnummer"
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 85178426d..327184305 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -77,7 +77,7 @@
     "notifications": "Notifications",
     "password": "Password",
     "profile": "Profile",
-    "profile": {
+    "profileDetails": {
       "firstName": "First name",
       "lastName": "Last name",
       "uid": "Matriculation number"

From 29117393298676f38bf4fb94d7ef62c8fcc27479 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 15 May 2018 13:49:41 +0200
Subject: [PATCH 08/32] some rework

---
 .../admin/user-admin/user-admin.component.html   |  4 ++--
 .../activation-resend.component.html             |  2 +-
 .../src/app/auth/login/login.component.html      |  2 +-
 .../app/auth/register/register.component.html    |  2 +-
 .../src/app/auth/reset/reset.component.html      |  6 +++---
 .../course-container.component.html              |  2 +-
 .../course-manage-content.component.html         |  2 +-
 .../lecture-edit/lecture-edit.component.html     | 16 ++++++++--------
 .../general-tab/general-tab.component.html       |  6 +++---
 .../whitelist-show/whitelist-show.component.html |  2 +-
 .../course/course-new/course-new.component.html  |  6 +++---
 .../src/app/course/course.component.html         |  2 +-
 .../lecture-form/lecture-form.component.html     |  4 ++--
 .../dashboard-student.component.html             |  6 +++---
 .../dashboard-student.component.ts               |  1 +
 .../dashboard-teacher.component.html             |  8 ++++----
 .../free-text-unit-editor.dialog.html            |  2 +-
 .../task-unit-edit/task-unit-edit.component.html |  6 +++---
 .../unit-general-info-form.component.html        |  6 +++---
 19 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
index f7648ddd6..1e33c2e90 100644
--- a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
+++ b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
@@ -20,10 +20,10 @@ <h2>Users</h2>
       </mat-select>
     </td>
     <td>
-      <button matTooltip="{{ 'user.editUser' | translate }}" mat-icon-button (click)="editUser(i)">
+      <button [matTooltip]="'user.editUser' | translate" mat-icon-button (click)="editUser(i)">
         <mat-icon>edit</mat-icon>
       </button>
-      <button matTooltip="{{ 'user.deleteUser' | translate }}" mat-icon-button (click)="deleteUser(i)">
+      <button [matTooltip]="'user.deleteUser' | translate" mat-icon-button (click)="deleteUser(i)">
         <mat-icon>delete</mat-icon>
       </button>
     </td>
diff --git a/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html b/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
index 3b895ab87..31f615435 100644
--- a/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
+++ b/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
@@ -69,7 +69,7 @@
 
       <div *ngIf="formError" class="text-danger" id="resendActivationFormError">{{formError}}</div>
 
-      <button matTooltip="{{ 'auth.resendActivation.tooltipResendAction' | translate }}" mat-raised-button color="primary" type="submit"
+      <button [matTooltip]="'auth.resendActivation.tooltipResendAction' | translate" mat-raised-button color="primary" type="submit"
               [disabled]="loading || !resendActivationForm?.valid">{{'common.send'|translate}}
       </button>
     </form>
diff --git a/app/webFrontend/src/app/auth/login/login.component.html b/app/webFrontend/src/app/auth/login/login.component.html
index 2a761e323..7ecf5b33f 100644
--- a/app/webFrontend/src/app/auth/login/login.component.html
+++ b/app/webFrontend/src/app/auth/login/login.component.html
@@ -17,7 +17,7 @@
               [disabled]="loading">
         {{'common.login'|translate}}
       </button>
-      <button mat-raised-button matTooltip="{{'auth.tooltipForgotPassword'|translate}}" type="button" routerLink="/reset" routerLinkActive="active">
+      <button mat-raised-button [matTooltip]="'auth.tooltip.ForgotPassword' | translate" type="button" routerLink="/reset" routerLinkActive="active">
         {{'auth.forgotPassword'|translate}}
       </button>
     </form>
diff --git a/app/webFrontend/src/app/auth/register/register.component.html b/app/webFrontend/src/app/auth/register/register.component.html
index 2091b6d4c..cec2c3369 100644
--- a/app/webFrontend/src/app/auth/register/register.component.html
+++ b/app/webFrontend/src/app/auth/register/register.component.html
@@ -90,7 +90,7 @@
 
       <app-password-input [form]="registerForm"></app-password-input>
 
-      <button matTooltip="{'auth.registration.tooltipRegister'|translate}}" mat-raised-button color="primary" type="submit"
+      <button [matTooltip]="'auth.registration.tooltipRegister' | translate" mat-raised-button color="primary" type="submit"
               [disabled]="loading || !registerForm?.valid">{{'common.register'|translate}}
       </button>
     </form>
diff --git a/app/webFrontend/src/app/auth/reset/reset.component.html b/app/webFrontend/src/app/auth/reset/reset.component.html
index 0b0e24858..4066c77a9 100644
--- a/app/webFrontend/src/app/auth/reset/reset.component.html
+++ b/app/webFrontend/src/app/auth/reset/reset.component.html
@@ -6,10 +6,10 @@
   <mat-card-content>
     <form name="form" (ngSubmit)="requestReset()" [formGroup]="resetForm">
       <mat-form-field>
-        <input matInput formControlName="email" placeholder="{{ common.email | translate }}">
+        <input matInput formControlName="email" [placeholder]="'common.email' | translate">
       </mat-form-field>
 
-      <button mat-raised-button color="primary" matTooltip="{{ auth.tooltipResetPass | translate }}" class="mat-button" type="submit" [disabled]="loading">{{ auth.resetPassword.requestReset | translate }}</button>
+      <button mat-raised-button color="primary" [matTooltip]="'auth.tooltipResetPass' | translate" class="mat-button" type="submit" [disabled]="loading">{{ auth.resetPassword.requestReset | translate }}</button>
       <br>
     </form>
   </mat-card-content>
@@ -24,7 +24,7 @@
 
       <app-password-input [form]="resetForm"></app-password-input>
 
-      <button mat-raised-button  matTooltip="{{ auth.tooltipResetPassword | translate }}" color="primary" type="submit" [disabled]="loading">{{ auth.resetPassword.reset | translate }}</button>
+      <button mat-raised-button [matTooltip]="'auth.tooltip.resetPassword' | translate" color="primary" type="submit" [disabled]="loading">{{ auth.resetPassword.reset | translate }}</button>
     </form>
   </mat-card-content>
 </mat-card>
diff --git a/app/webFrontend/src/app/course/course-container/course-container.component.html b/app/webFrontend/src/app/course/course-container/course-container.component.html
index a9f239c77..6fda57787 100644
--- a/app/webFrontend/src/app/course/course-container/course-container.component.html
+++ b/app/webFrontend/src/app/course/course-container/course-container.component.html
@@ -2,7 +2,7 @@
 
   <app-badge [displayNumber]="courses.length"></app-badge>
 
-  <button class="open-toggle" matTooltip="{{ 'common.tooltipClickToOpen' | translate }}" [class.opened]="expand" mat-icon-button>
+  <button class="open-toggle" [matTooltip]="'common.tooltip.clickToOpen' | translate" [class.opened]="expand" mat-icon-button>
     <mat-icon class="arrow">
       arrow_drop_down
     </mat-icon>
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
index 67be36aca..6a2f9a67e 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
@@ -17,7 +17,7 @@
 
 <app-mat-fab-menu class="fab" [open]="fabOpen" [onClick]="onFabClick"
                   [disabled]="isInMode('lecture', 'create') || isInMode('lecture', 'edit') || isInMode('unit', 'create') || isInMode('unit', 'edit')"
-                  fabTooltip="{{ unit.addContent | translate }}">
+                  [fabTooltip]="'unit.addContent' | translate">
   <div *ngIf="isLectureOpen()" (click)="onImportUnit()">{{ unit.import | translate }}</div>
   <div *ngIf="isLectureOpen()" (click)="onAddUnit('task')">{{ unit.addTasks | translate }}</div>
   <div *ngIf="isLectureOpen()" (click)="onAddUnit('file')">{{ unit.addFiles | translate }}</div>
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
index 13fb007ba..7d98247fc 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
@@ -14,19 +14,19 @@ <h2>{{lecture.name}}</h2>
     </button>
 
     <mat-menu #lectureMenu="matMenu">
-      <button mat-menu-item matTooltip="{{ lecture.tooltipEdit | translate }}" (click)="onEditLecture(lecture)">
+      <button mat-menu-item [matTooltip]="'lecture.tooltipEdit' | translate" (click)="onEditLecture(lecture)">
         <mat-icon>edit</mat-icon>
         Edit
       </button>
-      <button mat-menu-item matTooltip="{{ lecture.tooltipDownloadLecture | translate }}"  (click)="exportLecture(lecture)">
+      <button mat-menu-item [matTooltip]="'lecture.tooltipDownloadLecture' | translate"  (click)="exportLecture(lecture)">
         <mat-icon>file_download</mat-icon>
         Export
       </button>
-      <button mat-menu-item matTooltip="{{ lecture.tooltipDuplicate | translate}}" (click)="duplicateLecture(lecture)">
+      <button mat-menu-item [matTooltip]="'lecture.tooltipDuplicate' | translate" (click)="duplicateLecture(lecture)">
         <mat-icon>content_copy</mat-icon>
         Duplicate
       </button>
-      <button mat-menu-item matTooltip="{{ lecture.tooltipDelete | translate }}" (click)="deleteLecture(lecture)">
+      <button mat-menu-item [matTooltip]="'lecture.tooltipDelete' | translate" (click)="deleteLecture(lecture)">
         <mat-icon>delete</mat-icon>
         Delete
       </button>
@@ -47,20 +47,20 @@ <h2>{{lecture.name}}</h2>
           <span class="unit-type">{{ unit.__t }}</span>
           <span class="unit-date">{{ unit.updatedAt | date:"y-MM-dd" }}</span>
           <span class="unit-actions">
-              <button mat-icon-button matTooltip="{{ common.edit | translate }}" (click)="onEditUnit(unit)">
+              <button mat-icon-button [matTooltip]="'common.edit | translate }}" (click)="onEditUnit(unit)">
                 <mat-icon>edit</mat-icon>
               </button>
               <button class="unit-menu-button" mat-icon-button [matMenuTriggerFor]="unitMenu">
                 <mat-icon>more_vert</mat-icon>
               </button>
               <mat-menu #unitMenu="matMenu">
-                <button mat-icon-button matTooltip="{{ lecture.tooltip.delete | translate }}" (click)="deleteUnit(unit)">
+                <button mat-icon-button [matTooltip]="'lecture.tooltip.delete' | translate" (click)="deleteUnit(unit)">
                   <mat-icon>delete</mat-icon>
                 </button>
-                <button mat-icon-button matTooltip="{{ lecture.tooltip.duplicate | translate }}" (click)="duplicateUnit(unit)">
+                <button mat-icon-button [matTooltip]="'lecture.tooltip.duplicate' | translate" (click)="duplicateUnit(unit)">
                   <mat-icon>content_copy</mat-icon>
                 </button>
-                <button mat-icon-button matTooltip="{{ lecture.tooltip.download | translate }}" (click)="onExportUnit(unit)">
+                <button mat-icon-button [matTooltip]="'lecture.tooltip.download' | translate" (click)="onExportUnit(unit)">
                   <mat-icon>file_download</mat-icon>
               </button>
               </mat-menu>
diff --git a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
index c72829a72..9614d6416 100644
--- a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
+++ b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
@@ -5,12 +5,12 @@
   </mat-form-field>
 
   <mat-form-field class="full-width">
-        <textarea matInput id="description" placeholder="{{ common.description | translate }}" [(ngModel)]="description"
+        <textarea matInput id="description" [placeholder]="'common.description' | translate" [(ngModel)]="description"
                   [ngModelOptions]="{standalone: true}"></textarea>
   </mat-form-field>
 
   <mat-form-field class="full-width">
-    <mat-select name="courseTypes" placeholder="{{ course.text.selectAccessType | translate }}" id="courseTypes" [(ngModel)]="enrollType">
+    <mat-select name="courseTypes" placeholder="'course.text.selectAccessType' | translate" id="courseTypes" [(ngModel)]="enrollType">
       <mat-option *ngFor="let enrollType of enrollTypes" [value]="enrollType">{{enrollType}}</mat-option>
     </mat-select><br>
   </mat-form-field>
@@ -30,7 +30,7 @@
     <p>
       <!-- TODO: Replace with shared upload form -->
       <input class="upload" type="file" ng2FileSelect [uploader]="uploader"
-             placeholder="{{ file.placeholder.uploadFiles | translate }}" accept=".csv"/>
+             [placeholder]="'file.placeholder.uploadFiles' | translate" accept=".csv"/>
       <button mat-raised-button color="primary"
               (click)="uploader.uploadAll()"
               [disabled]="!uploader.getNotUploadedItems().length">
diff --git a/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html b/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html
index b1accb27f..3936dda45 100644
--- a/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html
+++ b/app/webFrontend/src/app/course/course-edit/members/whitelist-show/whitelist-show.component.html
@@ -8,7 +8,7 @@
         <!-- <button mat-icon-button disabled>
           <mat-icon>edit</mat-icon>
         </button> -->
-        <button mat-icon-button matTooltip="{{ user.deleteUser | translate}}" (click)="remove(user)">
+        <button mat-icon-button [matTooltip]="'user.deleteUser' | translate" (click)="remove(user)">
           <mat-icon>delete</mat-icon>
         </button>
         <i  *ngIf="isSignedIn(user) && !isInCourse(user)" class="material-icons green" matTooltip="Signed In">done</i>
diff --git a/app/webFrontend/src/app/course/course-new/course-new.component.html b/app/webFrontend/src/app/course/course-new/course-new.component.html
index 82fee6ad1..02cc7196e 100644
--- a/app/webFrontend/src/app/course/course-new/course-new.component.html
+++ b/app/webFrontend/src/app/course/course-new/course-new.component.html
@@ -3,17 +3,17 @@ <h1>Create Course</h1>
   <mat-card>
     <form class="course-form" (ngSubmit)="createCourse()" [formGroup]="newCourse">
       <mat-form-field class="full-width">
-        <input matInput formControlName="name" placeholder="{{ course.placeholder.name | translate }}">
+        <input matInput formControlName="name" [placeholder]="'course.placeholder.name' | translate">
         <div *ngIf="nameError">
           <small class="text-danger">{{nameError}}</small>
         </div>
       </mat-form-field>
       <br/>
       <mat-form-field class="full-width">
-        <textarea matInput formControlName="description" placeholder="{{ course.placeholder.description | translate}}"></textarea>
+        <textarea matInput formControlName="description" [placeholder]="'course.placeholder.description' | translate"></textarea>
       </mat-form-field>
       <br/>
-      <button mat-raised-button color="primary" matTooltip="{{ course.tooltipAdd | translate }}" class="mat-button" type="submit">Add</button>
+      <button mat-raised-button color="primary" [matTooltip]="'course.tooltipAdd' | translate" class="mat-button" type="submit">Add</button>
     </form>
   </mat-card>
 </div>
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index 3d50eac80..77c9229aa 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -41,7 +41,7 @@
     </button>
     </span>
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
-            color="primary" matTooltip="{{ course.tooltipResetPassword | translate }}" class="details-button" [routerLink]="['course', course._id]">
+            color="primary" [matTooltip]="'course.tooltip.resetPassword' | translate" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>
     </button>
   </mat-card-actions>
diff --git a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
index 551527bff..acae76034 100644
--- a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
+++ b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
@@ -1,10 +1,10 @@
 <form [formGroup]="lectureForm" (ngSubmit)="formSubmit()">
   <mat-form-field>
-    <input matInput formControlName="name" placeholder="{{ common.name | translator }}">
+    <input matInput formControlName="name" [placeholder]="'common.name' | translate">
   </mat-form-field>
 
   <mat-form-field>
-    <textarea matInput formControlName="description" placeholder="{{ common.description | translator }}"></textarea>
+    <textarea matInput formControlName="description" [placeholder]="'common.description' | translate"></textarea>
   </mat-form-field>
 
   <p>
diff --git a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
index b185d0291..405d59941 100644
--- a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
+++ b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
@@ -1,7 +1,7 @@
 <mat-form-field class="pull-right">
-  <mat-select placeholder="{{ sort.placeholder.sortedBy | translate }}">
-    <mat-option value="last visited" (click)="sortCourses()">{{ sort.lastVisited | translate }}</mat-option>
-    <mat-option value="alphabetically" (click)="sortAlphabetically()">{{ sort.alphabetically | translate }}</mat-option>
+  <mat-select [placeholder]="'sort.placeholder.sorstedBy | translate '">
+    <mat-option value="last visited" (click)="sortCourses()">{{ 'sort.lastVisited' | translate }}</mat-option>
+    <mat-option value="alphabetically" (click)="sortAlphabetically()">{{ 'sort.alphabetically' | translate }}</mat-option>
   </mat-select>
 </mat-form-field>
 <app-course-container [title]="'dashboard.myCourses' | translate" [courses]="myCourses" [expand]="true" (onLeave)="leaveCallback()" (onEnroll)="enrollCallback()"></app-course-container>
diff --git a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.ts b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.ts
index 3c2a15bb9..83794cf5a 100644
--- a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.ts
+++ b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.ts
@@ -3,6 +3,7 @@ import {ICourseDashboard} from '../../../../../../../shared/models/ICourseDashbo
 import {UserService} from '../../../shared/services/user.service';
 import {DashboardBaseComponent} from '../dashboard-base-component';
 import {SortUtil} from '../../../shared/utils/SortUtil';
+import {TranslateService} from '@ngx-translate/core';
 
 
 @Component({
diff --git a/app/webFrontend/src/app/start/dashboard/dashboard-teacher/dashboard-teacher.component.html b/app/webFrontend/src/app/start/dashboard/dashboard-teacher/dashboard-teacher.component.html
index 1e850e0ad..c9faeb391 100644
--- a/app/webFrontend/src/app/start/dashboard/dashboard-teacher/dashboard-teacher.component.html
+++ b/app/webFrontend/src/app/start/dashboard/dashboard-teacher/dashboard-teacher.component.html
@@ -1,13 +1,13 @@
-<app-course-container [title]="'dashboard.createdCourses'|translate" [courses]="myCourses" [expand]="true"
+<app-course-container [title]="'dashboard.createdCourses' | translate" [courses]="myCourses" [expand]="true"
                       (onEnroll)="enrollCallback()"></app-course-container>
-<app-course-container [title]="'dashboard.teacherCourses'|translate" [courses]="furtherCourses" [expand]="true"
+<app-course-container [title]="'dashboard.teacherCourses' | translate" [courses]="furtherCourses" [expand]="true"
                       (onEnroll)="enrollCallback()"
                       *ngIf="furtherCourses.length"></app-course-container>
-<app-course-container [title]="'dashboard.inactiveCourses'|translate" [courses]="inactiveCourses"
+<app-course-container [title]="'dashboard.inactiveCourses' | translate" [courses]="inactiveCourses"
                       [expand]="true"
                       (onEnroll)="enrollCallback()"
                       *ngIf="inactiveCourses.length"></app-course-container>
-<app-course-container [title]="'dashboard.availableCourses'|translate" [courses]="availableCourses"
+<app-course-container [title]="'dashboard.availableCourses' | translate" [courses]="availableCourses"
                       [expand]="false"
                       (onEnroll)="enrollCallback()"></app-course-container>
 
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
index 650800ea2..f44c7ab96 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
@@ -2,7 +2,7 @@
   <mat-toolbar-row>
     <span>{{ common.fullscreenMode | translate }}</span>
     <span class="toolbar-fill"></span>
-    <button mat-mini-fab color="primary" (click)="onCloseClick()" matTooltip="{{ common.tooltip.quitFullscreenMode | translate }}">
+    <button mat-mini-fab color="primary" (click)="onCloseClick()" [matTooltip]="'common.tooltip.quitFullscreenMode' | translate">
       <mat-icon>close</mat-icon>
     </button>
   </mat-toolbar-row>
diff --git a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
index 79ef0f5ba..01116b986 100644
--- a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
@@ -12,7 +12,7 @@
       <textarea matInput id="name" placeholder="Enter question here *" [(ngModel)]="task.name"></textarea>
     </mat-form-field>
 
-    <button mat-button class="remove" (click)="removeTask(task)" matTooltip="{{ task.tooltip.deleteQuestion | translate }}">
+    <button mat-button class="remove" (click)="removeTask(task)" [matTooltip]="'task.tooltip.deleteQuestion' | translate">
       <mat-icon>delete</mat-icon>
     </button>
 
@@ -21,9 +21,9 @@
         <div class="check-answer">
           <mat-checkbox [(ngModel)]="answer.value" name="value_{{idx}}"></mat-checkbox>
           <mat-form-field>
-            <input matInput placeholder="{{ unit.placeholder.enterAnswer | translater }} *" [(ngModel)]="answer.text">
+            <input matInput [placeholder]="'unit.placeholder.enterAnswer' | translate" [(ngModel)]="answer.text">
           </mat-form-field>
-          <button mat-bwutton class="remove" (click)="removeAnswer(task, idx)" matTooltip="{{ task.tooltip.deleteAnswer | translate }}">
+          <button mat-button class="remove" (click)="removeAnswer(task, idx)" [matTooltip]="'task.tooltip.deleteAnswer' | translate">
             <mat-icon>delete</mat-icon>
           </button>
         </div>
diff --git a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
index 59bcdf087..07a51afa1 100644
--- a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
@@ -1,14 +1,14 @@
 <form [formGroup]="form">
   <mat-form-field>
-    <input matInput required formControlName="name" placeholder="{{ common.name | translate }}">
+    <input matInput required formControlName="name" [placeholder]="'common.name'| translate ">
   </mat-form-field>
 
   <mat-form-field>
-    <textarea matInput formControlName="description" placeholder="{{ common.description | translate }}" rows="4"></textarea>
+    <textarea matInput formControlName="description" placeholder="'common.description' | translate" rows="4"></textarea>
   </mat-form-field>
 
   <mat-form-field *ngIf="model?.progressable">
-    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="{{ unit.placeholder.optionalDeadline | translate }}">
+    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="'unit.placeholder.optionalDeadline' | translate">
     <mat-datepicker-toggle matSuffix [for]="deadlineDatepicker"></mat-datepicker-toggle>
     <mat-datepicker #deadlineDatepicker (selectedChanged)="updateDateTime($event)"></mat-datepicker>
   </mat-form-field>

From f4ee97930dc15bc6bcda6e5b85f3bea32a01a3f6 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 15 May 2018 14:46:45 +0200
Subject: [PATCH 09/32] - course add tooltip

---
 app/webFrontend/src/app/course/course.component.html | 4 ++--
 app/webFrontend/src/assets/i18n/de.json              | 6 +++++-
 app/webFrontend/src/assets/i18n/en.json              | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index 77c9229aa..60d9bd14b 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -25,10 +25,10 @@
     <span class="course-student-actions" *ngIf="this.userService.isStudent()">
       <div style="float:left">
         <i class="material-icons" style="margin-top: 8px;"
-           matTooltip="Key Required"
+           [matTooltip]="'course.tooltip.keyRequired' | translate"
            *ngIf="course.enrollType === 'accesskey'">lock</i>
         <i class="material-icons" style="margin-top: 8px;"
-           matTooltip="No Key Required"
+           [matTooltip]="'course.tooltip.noKeyRequired' | translate"
            *ngIf="course.enrollType !== 'accesskey'">lock_open</i>
       </div>
       <button mat-icon-button *ngIf="!course.userIsCourseMember"
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 9e80d1b92..96f4ece2e 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -131,7 +131,11 @@
       "uploadWhitelist": "Laden Sie Ihre OBS-csv-Datei mit Ihren Kursteilnehmern hoch, um sie auf die Freigabeliste zu setzen.<br />Alte Freigabelisten-Benutzer werden durch Hochladen einer neuen Datei entfernt.",
       "yourCourseProgress": "Ihr Kursfortschritt"
     },
-    "tooltipAdd": "Kurs hinzufügen"
+    "tooltip" : {
+      "add": "Kurs hinzufügen",
+      "keyRequired" : "Zugangscode benötigt",
+      "noKeyRequired" : "Frei zugänglich"
+    }
   },
   "dashboard": {
     "addCourse": "Kurs hinzufügen",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 327184305..98c6e894e 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -131,7 +131,11 @@
       "uploadWhitelist": "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file.",
       "yourCourseProgress": "Your course progress"
     },
-    "tooltipAdd": "Add course"
+    "tooltip" : {
+      "add": "Add Course",
+      "keyRequired" : "Access key required",
+      "noKeyRequired" : "Free access"
+    }
   },
   "dashboard": {
     "addCourse": "Add course",

From 50452e439c90c96f3d598765c1c9c7ee46aff561 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 15 May 2018 16:31:10 +0200
Subject: [PATCH 10/32] - add resource vars to html

- wait for clara
---
 .../course-detail.component.html              |  2 +-
 .../course-user-list-overview.component.html  |  8 ++++----
 .../general-tab/general-tab.component.html    |  6 +++---
 .../whitelist-edit.component.html             | 14 ++++++-------
 .../src/app/course/course.component.html      |  4 ++--
 .../src/app/report/report.component.html      |  6 +++---
 .../upload-dialog.component.html              | 20 ++++++++++---------
 .../upload-form/upload-form.component.html    | 16 +++++++--------
 .../dashboard-student.component.html          |  2 +-
 .../unit/task-unit/task-unit.component.html   |  8 ++++----
 .../task-unit-edit.component.html             |  2 +-
 .../unit-general-info-form.component.html     |  4 ++--
 .../user/user-edit/user-edit.component.html   | 16 +++++++++------
 .../user-profile/user-profile.component.html  |  4 ++--
 .../user-settings.component.html              |  2 +-
 15 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-detail/course-detail.component.html b/app/webFrontend/src/app/course/course-detail/course-detail.component.html
index 1e4d3cddf..e665366f9 100644
--- a/app/webFrontend/src/app/course/course-detail/course-detail.component.html
+++ b/app/webFrontend/src/app/course/course-detail/course-detail.component.html
@@ -1,6 +1,6 @@
 <div class="course-header">
   <button mat-icon-button color="primary" (click)="openDownloadDialog()" class="download-button">
-    <mat-icon aria-label="Download Units" mat-tooltip="Download Units">get_app</mat-icon>
+    <mat-icon [aria-label]="'unit.tooltip.downloadUnits' | translate" [mat-tooltip]="'unit.tooltip.downloadUnits' | translate">get_app</mat-icon>
   </button>
   <h1>{{course?.name}}</h1>
 
diff --git a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
index 6ad388b77..34b70b317 100644
--- a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
@@ -6,12 +6,12 @@
       <mat-icon>select_all</mat-icon>
     </button>
     <button [disabled]="selectedMembers.length <= 1"
-            class="text-fit" mat-raised-button matTooltip="Send Mail to selected members"
+            class="text-fit" mat-raised-button [matTooltip]="'mail.tooltip.sendToMembers' | translate"
             (click)="openWriteMailDialog()">
       <mat-icon>email</mat-icon>
     </button>
     <button [disabled]="selectedMembers.length <= 1"
-            class="text-fit" mat-raised-button color="warn" matTooltip="Remove selected members"
+            class="text-fit" mat-raised-button color="warn" [matTooltip]="'user.tooltip.deleteUsers' | translate"
             (click)="removeSelectedUsers()">
       <mat-icon>delete</mat-icon>
     </button>
@@ -35,9 +35,9 @@
 
       <div class="card-btn-wrapper" *ngIf="isInSelectedMembers(user)">
         <button mat-raised-button (click)="openUserProfileDialog(user)" >DETAILS</button>
-        <button mat-raised-button (click)="openWriteMailDialog()" *ngIf="selectedMembers.length <= 1">SEND MAIL</button>
+        <button mat-raised-button (click)="openWriteMailDialog()" *ngIf="selectedMembers.length <= 1">{{ mail.send | translate}}</button>
         <button mat-raised-button color="warn" (click)="removeSelectedUsers()" *ngIf="selectedMembers.length <= 1">
-          REMOVE
+          {{ common.delete | translate }}
         </button>
       </div>
     </mat-card>
diff --git a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
index 9614d6416..98ac9cb18 100644
--- a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
+++ b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
@@ -1,6 +1,6 @@
 <form class="course-form" (ngSubmit)="createCourse()">
   <mat-form-field>
-    <input async matInput id="name" placeholder="Name" [(ngModel)]="course"
+    <input async matInput id="name" [placeholder]="'common.name' | translate" [(ngModel)]="course"
            [ngModelOptions]="{standalone: true}">
   </mat-form-field>
 
@@ -10,7 +10,7 @@
   </mat-form-field>
 
   <mat-form-field class="full-width">
-    <mat-select name="courseTypes" placeholder="'course.text.selectAccessType' | translate" id="courseTypes" [(ngModel)]="enrollType">
+    <mat-select name="courseTypes" [placeholder]="'course.text.selectAccessType' | translate" id="courseTypes" [(ngModel)]="enrollType">
       <mat-option *ngFor="let enrollType of enrollTypes" [value]="enrollType">{{enrollType}}</mat-option>
     </mat-select><br>
   </mat-form-field>
@@ -20,7 +20,7 @@
   </p>
 
   <mat-form-field class="full-width" *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_ACCESSKEY">
-    <input async matInput id="accessKey" placeholder="Access Key" [(ngModel)]="accessKey"
+    <input async matInput id="accessKey" [placeholder]="'course.placeholder.accessKey' | translate" [(ngModel)]="accessKey"
            [ngModelOptions]="{standalone: true}">
     <mat-hint>{{ course.text.enterAccessKeyForStudents | translate }}</mat-hint>
   </mat-form-field>
diff --git a/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html b/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html
index 085935cbf..949e97ac1 100644
--- a/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html
@@ -1,35 +1,35 @@
 <mat-expansion-panel *ngIf="course.enrollType === 'whitelist'" class="whitelist" [expanded]="false" #expPanel>
   <mat-expansion-panel-header>
   <mat-panel-title class="title">
-    Whitelist
+    {{ course.text.whitelist | translate }}
   </mat-panel-title>
   <mat-panel-description>
-    amount: {{course.whitelist.length}}
+    {{ common.amount | translate }}: {{course.whitelist.length}}
   </mat-panel-description>
   </mat-expansion-panel-header>
-  <p>All users on this list is allowed to join in course. Students are automatically synchronised with this list.</p>
+  <p>{{ course.text.infoWhitelist | translate }}</p>
   <app-whitelist-show [show]="expPanel.expanded"
                       [course]="course"
     (onDragendRemoveWhitelist) ="removeWhitelistUserFromCourse($event)">
   </app-whitelist-show>
 
   <mat-form-field class="full-width">
-    <input async matInput id="firstName" placeholder="First name" [(ngModel)]="whitelistUser.firstName"
+    <input async matInput id="firstName" [placeholder]="'common.profileDetails.firstname' | translate" [(ngModel)]="whitelistUser.firstName"
            [ngModelOptions]="{standalone: true}" required="">
   </mat-form-field>
 
   <mat-form-field class="full-width">
-    <input async matInput id="lastName" placeholder="Last name" [(ngModel)]="whitelistUser.lastName"
+    <input async matInput id="lastName" [placeholder]="'common.profileDetails.lastname' | translate" [(ngModel)]="whitelistUser.lastName"
            [ngModelOptions]="{standalone: true}" required="">
   </mat-form-field>
 
   <mat-form-field class="full-width">
-    <input async matInput id="uid" placeholder="User identification number" [(ngModel)]="whitelistUser.uid"
+    <input async matInput id="uid" [placeholder]="'common.profileDetails.uid' | translate" [(ngModel)]="whitelistUser.uid"
            [ngModelOptions]="{standalone: true}" required="">
   </mat-form-field>
 
   <button class="mat-mini-fab" mat-fab (click)="createNewWhitelistUser()"
-          matTooltip="Add whitelist user">
+          [matTooltip]="'course.tooltip.addUserToWhitelist' | translate">
     <mat-icon>add</mat-icon>
   </button>
 </mat-expansion-panel>
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index 60d9bd14b..9768a5576 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -32,11 +32,11 @@
            *ngIf="course.enrollType !== 'accesskey'">lock_open</i>
       </div>
       <button mat-icon-button *ngIf="!course.userIsCourseMember"
-              (click)="enroll()" matTooltip="Enroll">
+              (click)="enroll()" [matTooltip]="'course.tooltip.enroll' | translate">
       <mat-icon>add_circle_outline</mat-icon>
     </button>
     <button mat-icon-button *ngIf="course.userIsCourseMember"
-            (click)="leave()" matTooltip="Leave">
+            (click)="leave()" [matTooltip]="'course.tooltip.leave' | translate">
       <mat-icon>remove_circle_outline</mat-icon>
     </button>
     </span>
diff --git a/app/webFrontend/src/app/report/report.component.html b/app/webFrontend/src/app/report/report.component.html
index ddd824a42..62bd59a4a 100644
--- a/app/webFrontend/src/app/report/report.component.html
+++ b/app/webFrontend/src/app/report/report.component.html
@@ -1,8 +1,8 @@
-<h2>Report for {{courseName}}</h2>
+<h2>{{course.text.reportFor | translate}} {{courseName}}</h2>
 <mat-toolbar>
   <mat-toolbar-row>
-    <button mat-button routerLink="." routerLinkActive="active">Overview</button>
-    <button mat-button routerLink="user/all" routerLinkActive="active">User results</button>
+    <button mat-button routerLink="." routerLinkActive="active">{{ course.text.overview | translate }}</button>
+    <button mat-button routerLink="user/all" routerLinkActive="active">{{ course.text.userResults | translate }}</button>
   </mat-toolbar-row>
 </mat-toolbar>
 <div class="report-container">
diff --git a/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html b/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html
index 62e84df8d..d94ccd7d6 100644
--- a/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html
@@ -1,44 +1,46 @@
 <mat-tab-group *ngIf="!showProgressBar" (selectChange)="changedTab($event)">
-  <mat-tab label="Upload image">
+  <mat-tab [label]="'common.profileDetails.uploadPicture' | translate">
     <div class="tab-content">
       <label ng2FileDrop
              [ngClass]="{'nv-file-over': true}"
              [uploader]="uploader"
              class="file-dropzone"
               (onFileDrop)="startUpload()">
-        <span>Drop files here or click here to add files</span>
+        <span>{{ file.text.infoDropAddFiles | translate }}</span>
         <input type="file"
                ng2FileSelect
                [uploader]="uploader"
                (onFileSelected)="startUpload()"
-               placeholder="Upload files"
+               [placeholder]="'file.placeholder.uploadFiles' | translate"
                accept="image/*"
                hidden
         />
       </label>
     </div>
   </mat-tab>
-  <mat-tab id="webcam-tab" label="Take webcam picture">
+  <mat-tab id="webcam-tab" [label]="'file.text.takePicture' | translate">
     <div class="tab-content">
       <div class="camera">
-        <video #webcam>No video stream is available.</video>
+        <video #webcam>{{ file.text.noVideo | translate }}</video>
       </div>
       <p>
-        <button mat-raised-button (click)="takePicture()">Take picture</button>
+        <button mat-raised-button (click)="takePicture()">{{ file.text.takePicture | translate }}</button>
       </p>
       <div class="preview">
         <h3 *ngIf="pictureTaken">Preview image</h3>
         <img #preview>
       </div>
       <button mat-raised-button color="primary" disabled="{{!pictureTaken}}" (click)="addImage()">
-        Upload picture
+        {{ common.profileDetails.uploadPicture | translate }}
       </button>
-      <button mat-raised-button (click)="cancel()">Cancel</button>
+      <button mat-raised-button (click)="cancel()">{{ common.cancel | translate }}</button>
     </div>
   </mat-tab>
 </mat-tab-group>
 <div *ngIf="showProgressBar">
   <h2>Uploading...</h2>
   <mat-progress-bar mode="determinate" [value]="uploader.progress"></mat-progress-bar>
-  <button mat-raised-button class="btn-cancel-upload" color="warn" (click)="cancel()">Cancel</button>
+  <button mat-raised-button class="btn-cancel-upload" color="warn" (click)="cancel()">
+    {{ common.cancel | translate }}
+  </button>
 </div>
diff --git a/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html b/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
index 0dacd26dc..ab65c5a82 100644
--- a/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
@@ -3,11 +3,11 @@
      (fileOver)="onFileOverDropzone($event)"
      [uploader]="fileUploader"
      class="file-dropzone">
-  <span>Drop files here or click here to add files</span>
+  <span>{{ file.text.infoDropAddFiles | translate }}</span>
   <input type="file"
          ng2FileSelect
          [uploader]="fileUploader"
-         placeholder="Upload files"
+         [placeholder]="'file.placeholder.uploadFiles' | translate"
          [multiple]="maxFileNumber !== 1"
          hidden
   />
@@ -21,10 +21,10 @@
   </div>
   <div class="file-list">
     <div class="file-list-row file-list-header">
-      <span>Filename</span>
-      <span>Filesize</span>
-      <span class="progress-col">Progress</span>
-      <span>Actions</span>
+      <span>{{ file.text.filename | translate }}</span>
+      <span>{{ file.text.filesize | translate }}</span>
+      <span class="progress-col">{{ file.text.progress | translate }}</span>
+      <span>{{ common.actions | translate }}</span>
     </div>
     <div class="file-list-row" *ngFor="let item of fileUploader.queue">
       <span class="filename">{{item.file.name}}</span>
@@ -34,10 +34,10 @@
       </span>
       <mat-action-row>
         <button *ngIf="item.isUploading" mat-button (click)="item.cancel()">
-          <mat-icon>block</mat-icon>Cancel upload
+          <mat-icon>block</mat-icon>{{ common.cancel | translate }}
         </button>
         <button *ngIf="!item.isUploading && !item.isSuccess" mat-raised-button color="warn" (click)="item.remove()">
-          <mat-icon>delete</mat-icon>Remove from queue
+          <mat-icon>delete</mat-icon>{{ file.text.removeFromQueue | translate }}
         </button>
       </mat-action-row>
     </div>
diff --git a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
index 405d59941..0db5b5f91 100644
--- a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
+++ b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
@@ -5,4 +5,4 @@
   </mat-select>
 </mat-form-field>
 <app-course-container [title]="'dashboard.myCourses' | translate" [courses]="myCourses" [expand]="true" (onLeave)="leaveCallback()" (onEnroll)="enrollCallback()"></app-course-container>
-<app-course-container [title]="'Available Courses'" [courses]="availableCourses" [expand]="false" (onEnroll)="enrollCallback()"></app-course-container>
+<app-course-container [title]="'dashboard.availableCourses' | translate" [courses]="availableCourses" [expand]="false" (onEnroll)="enrollCallback()"></app-course-container>
diff --git a/app/webFrontend/src/app/unit/task-unit/task-unit.component.html b/app/webFrontend/src/app/unit/task-unit/task-unit.component.html
index e709c295a..e186173ea 100644
--- a/app/webFrontend/src/app/unit/task-unit/task-unit.component.html
+++ b/app/webFrontend/src/app/unit/task-unit/task-unit.component.html
@@ -1,6 +1,6 @@
 <div class="tasks">
   <div class="task" *ngFor="let task of taskUnit.tasks">
-    <p><strong>Question:</strong> {{task.name}}</p>
+    <p><strong>{{common.question | translate}}:</strong> {{task.name}}</p>
     <ul class="answers">
       <li *ngFor="let answer of task.answers"
           [class.correct]="validationMode && answer.value"
@@ -15,9 +15,9 @@
 </div>
 
 <p>
-  <button mat-raised-button color="primary" [disabled]="validationMode" (click)="validate()">Submit answers</button>
-  <button mat-raised-button (click)="reset()">Reset</button>
+  <button mat-raised-button color="primary" [disabled]="validationMode" (click)="validate()">{{ unit.text.submitAnswers | translate }}</button>
+  <button mat-raised-button (click)="reset()">{{ common.reset | translate }}</button>
   <span *ngIf="progress && progress.done" class="progress-done">
-    <mat-icon>check</mat-icon>You have completed this task.
+    <mat-icon>check</mat-icon>{{ unit.text.taskCompleted | translate }}
   </span>
 </p>
diff --git a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
index 01116b986..229e340b3 100644
--- a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
@@ -9,7 +9,7 @@
 
   <div *ngFor="let task of model.tasks" class="question-answer">
     <mat-form-field matLine class="question">
-      <textarea matInput id="name" placeholder="Enter question here *" [(ngModel)]="task.name"></textarea>
+      <textarea matInput id="name" [placeholder]="'unit.placeholder.enterQuestion' | translate" [(ngModel)]="task.name"></textarea>
     </mat-form-field>
 
     <button mat-button class="remove" (click)="removeTask(task)" [matTooltip]="'task.tooltip.deleteQuestion' | translate">
diff --git a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
index 07a51afa1..87539ba46 100644
--- a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
@@ -4,11 +4,11 @@
   </mat-form-field>
 
   <mat-form-field>
-    <textarea matInput formControlName="description" placeholder="'common.description' | translate" rows="4"></textarea>
+    <textarea matInput formControlName="description" [placeholder]="'common.description' | translate" rows="4"></textarea>
   </mat-form-field>
 
   <mat-form-field *ngIf="model?.progressable">
-    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="'unit.placeholder.optionalDeadline' | translate">
+    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" [placeholder]="'unit.placeholder.optionalDeadline' | translate">
     <mat-datepicker-toggle matSuffix [for]="deadlineDatepicker"></mat-datepicker-toggle>
     <mat-datepicker #deadlineDatepicker (selectedChanged)="updateDateTime($event)"></mat-datepicker>
   </mat-form-field>
diff --git a/app/webFrontend/src/app/user/user-edit/user-edit.component.html b/app/webFrontend/src/app/user/user-edit/user-edit.component.html
index 33ba98ec8..ebb20cda8 100644
--- a/app/webFrontend/src/app/user/user-edit/user-edit.component.html
+++ b/app/webFrontend/src/app/user/user-edit/user-edit.component.html
@@ -43,7 +43,7 @@ <h1>Edit profile</h1>
     </mat-form-field>
 
     <mat-form-field class="full-width">
-      <mat-select placeholder="Theme" formControlName="theme">
+      <mat-select [placeholder]="'common.theme' | translate" formControlName="theme">
         <mat-option *ngFor="let theme of themes" value="{{theme}}">{{theme}}</mat-option>
       </mat-select>
     </mat-form-field>
@@ -52,20 +52,24 @@ <h1>Edit profile</h1>
   <mat-form-field class="full-width">
     <input matInput formControlName="email" [placeholder]="'common.email'|translate"/>
   </mat-form-field>
-  <button mat-raised-button color="primary" class="mat-button" type="submit" [disabled]="!userForm?.valid">Save</button>
+  <button mat-raised-button color="primary" class="mat-button" type="submit" [disabled]="!userForm?.valid">
+    {{ common.save | translate }}
+  </button>
   <button mat-raised-button class="mat-button" routerLink="/profile" routerLinkActive="active">
-    Cancel
+    {{ common.cancel | translate }}
   </button>
 </form>
 <p *ngIf="!showPwFields()">
-  <button mat-raised-button class="mat-button" (click)="resetPassword()">Generate new Password</button>
+  <button mat-raised-button class="mat-button" (click)="resetPassword()">
+    {{ auth.generatePassword | translate }}
+  </button>
 </p>
 <div class="button-wrapper">
   <button mat-raised-button class="mat-button" (click)="openAddPictureDialog()">
-    Upload new picture
+    {{ profileDetails.uploadPicture | translate }}
   </button>
   <button mat-raised-button class="mat-button" (click)="openChangePasswordDialog()">
-    Change Password
+    {{ auth.changePassword | translate }}
   </button>
 </div>
 </div>
diff --git a/app/webFrontend/src/app/user/user-profile/user-profile.component.html b/app/webFrontend/src/app/user/user-profile/user-profile.component.html
index 7f2b3b35c..f208bad5b 100644
--- a/app/webFrontend/src/app/user/user-profile/user-profile.component.html
+++ b/app/webFrontend/src/app/user/user-profile/user-profile.component.html
@@ -7,9 +7,9 @@ <h3 class="name-section">
     <span class="name" *ngIf="isCurrentProfile()">{{user.profile.firstName}} {{user.profile.lastName}}</span>
   </h3>
   <div class="user-data">
-    <span><strong>E-Mail: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></span>
+    <span><strong>{{ common.email | translate }}: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></span>
     <span *ngIf="canSeeUid()">
-      <strong>Matrikelnummer: </strong>{{user.uid}}
+      <strong>{{ common.profileDetails.uid | translate}}: </strong>{{user.uid}}
     </span>
   </div>
 </div>
diff --git a/app/webFrontend/src/app/user/user-settings/user-settings.component.html b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
index 634af16dd..f3f5ed3a2 100644
--- a/app/webFrontend/src/app/user/user-settings/user-settings.component.html
+++ b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
@@ -7,7 +7,7 @@ <h2>{{ common.notifications | translate }}</h2>
                     [checked]="notificationSelection.hasValue() && isAllSelected(notificationSelection)"
                     [indeterminate]="notificationSelection.hasValue() && !isAllSelected(notificationSelection)">
       </mat-checkbox>
-      <span>Notification</span>
+      <span>{{ common.notifications | translate }}</span>
     </mat-header-cell>
     <mat-cell class="checkBox" *matCellDef="let course">
       <mat-checkbox (click)="$event.stopPropagation()"

From 00edd4ce0535aff9abf9e7e53644ac1364219dc2 Mon Sep 17 00:00:00 2001
From: wurmc <clarawurm95@gmail.com>
Date: Tue, 15 May 2018 16:32:49 +0200
Subject: [PATCH 11/32] bugfix: de.json and en.json extended

---
 app/webFrontend/src/assets/i18n/de.json | 47 ++++++++++++++++++++++---
 app/webFrontend/src/assets/i18n/en.json | 47 ++++++++++++++++++++++---
 2 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 96f4ece2e..56ec28204 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -7,8 +7,10 @@
     }
   },
   "auth": {
+    "changePassword": "Passwort ändern",
     "confirmPassword": "Passwort bestätigen",
     "forgotPassword": "Passwort vergessen",
+    "generatePassword": "Neues Passwort generieren",
     "loginFailed": "Login fehlgeschlagen",
     "loginFailedError": {
       "couldNotBeVerified": "Ihre Logindaten konnten nicht verifiziert werden. Bitte versuchen Sie es noch ein mal.",
@@ -56,7 +58,9 @@
     "about": "Über",
     "actions": "Aktionen",
     "administration": "Administration",
+    "amount": "Menge",
     "back": "Zurück",
+    "cancel": "Abbrechen",
     "cheatSheetYouFind": "Einen Spickzettel finden Sie hier.",
     "delete": "Löschen",
     "description": "Beschreibung",
@@ -80,9 +84,12 @@
     "profileDetails": {
       "firstName": "Vorname",
       "lastName": "Nachname",
-      "uid": "Matrikelnummer"
+      "uid": "Matrikelnummer",
+      "uploadPicture": "Bild hochladen"
     },
+    "question": "Frage",
     "register": "Registrieren",
+    "reset": "Zurücksetzen",
     "role": "Rolle",
     "roles": {
       "student": "Student",
@@ -92,6 +99,7 @@
     "send": "Senden",
     "settings": "Einstellungen",
     "submit": "Absenden",
+    "theme": "Thema",
     "tooltip": {
       "quitFullscreenMode": "Vollbildmodus beenden",
       "downloadUnit": "Diese Einheit downloaden",
@@ -113,8 +121,11 @@
   "course": {
     "delete": "Kurs löschen",
     "placeholder": {
+      "accessKey": "Einschreibeschlüssel",
       "Description": "Kursbeschreibung",
-      "Name": "Kursname"
+      "Name": "Kursname",
+      "searchAdd": "Suchen und hinzufügen:",
+      "searchAddBy": "nach Name, ID und E-Mail"
     },
     "ShowCourse": "Kurs anzeigen",
     "text": {
@@ -125,15 +136,23 @@
       "enterAccessKeyForStudents": "Geben Sie einen Einschreibeschlüssel für die Studenten ein.",
       "goToCourse": "Zum Kurs",
       "inCourse": "Im Kurs",
+      "infoWhitelist": "Allen Benutzern dieser Liste, ist es erlaubt, dem Kurs beizutreten.",
       "isFreeForEveryone": "Der Kurs ist offen und für jeden zugänglich.",
       "notInCourse": "Nicht im Kurs",
+      "overview": "Übersicht",
+      "reportFor": "Ergebnis für",
       "selectAccessType": "Bitte wählen Sie Ihren Kurstyp aus.",
       "uploadWhitelist": "Laden Sie Ihre OBS-csv-Datei mit Ihren Kursteilnehmern hoch, um sie auf die Freigabeliste zu setzen.<br />Alte Freigabelisten-Benutzer werden durch Hochladen einer neuen Datei entfernt.",
-      "yourCourseProgress": "Ihr Kursfortschritt"
+      "userResults": "Benutzerergebnisse",
+      "yourCourseProgress": "Ihr Kursfortschritt",
+      "whitelist": "Freigabeliste"
     },
     "tooltip" : {
       "add": "Kurs hinzufügen",
+      "addUserToWhitelist": "Benutzer zu Freigabeliste hinzufügen",
+      "enroll": "Einschreiben",
       "keyRequired" : "Zugangscode benötigt",
+      "leave": "Verlassen",
       "noKeyRequired" : "Frei zugänglich"
     }
   },
@@ -156,7 +175,12 @@
       "actions": "Aktionen",
       "addFile": "Datei hinzufügen",
       "filename": "Dateiname",
-      "filesize": "Dateigröße"
+      "filesize": "Dateigröße",
+      "infoDropAddFiles": "Dateien hier hinziehen oder hier klicken, um Dateien auszuwählen.",
+      "noVideo": "Kein Video verfügbar.",
+      "progress": "Fortschritt",
+      "RemoveFromQueue": "Datei aus der Schlange löschen.",
+      "takePicture": "Bild aufnehmen"
     }
   },
   "home": {
@@ -171,6 +195,12 @@
       "edit": "Einheit bearbeiten"
     }
   },
+  "mail":{
+    "send": "Sende Mail",
+    "tooltip":{
+      "sendToMembers": "Mail an ausgewählte Mitglieder senden."
+    }
+  },
   "mainMenu": {
     "about": "Über geli",
     "admin": "Admin",
@@ -200,7 +230,8 @@
     "addVideos": "Videos hinzufügen",
     "import": "Einheit importieren",
     "placeholder": {
-      "enterAnswer": "Antwort hier eintragen",
+      "enterAnswer": "Antwort hier eintragen*",
+      "enterQuestion": "Frage hier eintragen*",
       "optionalDeadline": "Optionale Frist"
     },
     "text": {
@@ -212,6 +243,8 @@
       "fullscreen": "Vollbild",
       "hintAddQuestionAndAnswers": "Fragen mit beliebiger Anzahl an möglichen Antowrten hinzufügen. Richtige Antwort(en) mit Hilfe der checkbox markieren.",
       "publishedOn": "Veröffentlicht am",
+      "submitAnswers": "Antworten absenden",
+      "taskCompleted": "Aufgabe abgeschlossen",
       "tasks": "Aufgaben"
     },
     "tooltip": {
@@ -220,6 +253,7 @@
       "deleteAnswer": "Antwort löschen",
       "deleteQuestion": "Frage löschen",
       "download": "Diese Einheit downloaden",
+      "downloadUnits": "Einheiten downloaden",
       "duplicate": "Diese Einheit kopieren",
       "edit": "Einheit bearbeiten"
     }
@@ -230,6 +264,9 @@
     "text": {
       "notSignedIn": "Nicht eingetragen",
       "signedIn": "Eingetragen"
+    },
+    "tooltip":{
+      "deleteUSers": "Ausgewählte Mitglieder entfernen."
     }
   }
 }
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 98c6e894e..02255c8d5 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -7,8 +7,10 @@
     }
   },
   "auth": {
+    "changePassword": "Change password",
     "confirmPassword": "Confirm password",
     "forgotPassword": "Forgot password",
+    "generatePassword": "Generate new password",
     "loginFailed": "Login failed",
     "loginFailedError": {
       "couldNotBeVerified": "Your login details could not be verified. Please try again.",
@@ -56,7 +58,9 @@
     "about": "About",
     "actions": "Actions",
     "administration": "Administration",
+    "amount": "Amount",
     "back": "Back",
+    "cancel": "Cancel",
     "cheatSheetYouFind": "A cheat sheet you can find ",
     "delete": "Delete",
     "description": "Description",
@@ -80,9 +84,12 @@
     "profileDetails": {
       "firstName": "First name",
       "lastName": "Last name",
-      "uid": "Matriculation number"
+      "uid": "Matriculation number",
+      "uploadPicture": "Upload picture"
     },
+    "question": "Question",
     "register": "Register",
+    "reset": "Reset",
     "role": "Role",
     "roles": {
       "student": "Student",
@@ -92,6 +99,7 @@
     "send": "Send",
     "settings": "Settings",
     "submit": "Submit",
+    "theme": "Theme",
     "tooltip": {
       "quitFullscreenMode": "Quit Fullscreen",
       "downloadUnit": "Download this Unit",
@@ -113,8 +121,11 @@
   "course": {
     "delete": "Delete course",
     "placeholder": {
+      "accessKey": "Access key",
       "Description": "Course description",
-      "Name": "Course name"
+      "Name": "Course name",
+      "searchAdd": "Search and add",
+      "searchAddBy": "by name, id and email"
     },
     "ShowCourse": "Show course",
     "text": {
@@ -125,15 +136,23 @@
       "enterAccessKeyForStudents": "Enter an access key for the students.",
       "goToCourse": "Go to course",
       "inCourse": "In Course",
+      "infoWhitelist": "All users on this list are allowed to join this course.",
       "isFreeForEveryone": "The course is free and accessible for everyone.",
       "notInCourse": "Not in course",
+      "overview": "Overview",
+      "reportFor": "Report for",
       "selectAccessType": "Please select your course access type.",
       "uploadWhitelist": "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file.",
-      "yourCourseProgress": "Your course progress"
+      "userResults": "User results",
+      "yourCourseProgress": "Your course progress",
+      "whitelist": "Whitelist"
     },
     "tooltip" : {
       "add": "Add Course",
+      "addUserToWhitelist": "Add user to whitelist",
+      "enroll": "Enroll",
       "keyRequired" : "Access key required",
+      "leave": "Leave",
       "noKeyRequired" : "Free access"
     }
   },
@@ -156,7 +175,12 @@
       "actions": "Actions",
       "addFile": "Add file",
       "filename": "File name",
-      "filesize": "File size"
+      "filesize": "File size",
+      "infoDropAddFiles": "Drop files here or click here to select files.",
+      "noVideo": "No video available.",
+      "progress": "Progress",
+      "RemoveFromQueue": "Remove file from queue.",
+      "takePicture": "Take picture"
     }
   },
   "home": {
@@ -171,6 +195,12 @@
       "edit": "Edit this unit"
     }
   },
+  "mail":{
+    "send": "Send mail",
+    "tooltip":{
+      "sendToMembers": "Send mail to selected members."
+    }
+  },
   "mainMenu": {
     "about": "About",
     "admin": "Admin",
@@ -200,7 +230,8 @@
     "addVideos": "Add videos",
     "import": "Import unit",
     "placeholder": {
-      "enterAnswer": "Enter answer here",
+      "enterAnswer": "Enter answer here*",
+      "enterQuestion": "Enter question here*",
       "optionalDeadline": "Optional deadline"
     },
     "text": {
@@ -212,6 +243,8 @@
       "fullscreen": "Fullscreen",
       "hintAddQuestionAndAnswers": "Add questions with any number of possible answers. Mark the correct answer(s) with the checkbox.",
       "publishedOn": "Published on",
+      "submitAnswers": "Submit answers",
+      "taskCompleted": "Task completed",
       "tasks": "Tasks"
     },
     "tooltip": {
@@ -220,6 +253,7 @@
       "deleteAnswer": "Delete answer",
       "deleteQuestion": "Delete question",
       "download": "Download this unit",
+      "downloadUnits": "Download units",
       "duplicate": "Copy this unit",
       "edit": "Edit unit"
     }
@@ -230,6 +264,9 @@
     "text": {
       "notSignedIn": "Not Signed in",
       "signedIn": "Signed in"
+    },
+    "tooltip":{
+      "deleteUSers": "Delete selected Members."
     }
   }
 }

From 2525d6779de0f8240a5b1f990244c52697856da6 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 12:45:14 +0200
Subject: [PATCH 12/32] - rework translation

---
 .../auth/activation/activation.component.html  |  4 ++--
 .../src/app/auth/reset/reset.component.html    |  6 +++---
 .../course-detail/course-detail.component.html |  2 +-
 .../course-edit/course-edit.component.html     |  4 ++--
 .../course-manage-content.component.html       | 12 ++++++------
 .../lecture-edit/lecture-edit.component.html   |  2 +-
 .../course-user-list-overview.component.html   |  4 ++--
 .../course-user-list.component.html            |  4 ++--
 .../general-tab/general-tab.component.html     | 18 +++++++++---------
 .../whitelist-edit.component.html              |  6 +++---
 .../src/app/report/report.component.html       |  6 +++---
 .../upload-dialog/upload-dialog.component.ts   |  5 ++++-
 .../src/app/shared/modules/dialog.module.ts    |  9 ++++++++-
 .../unit/task-unit/task-unit.component.html    |  8 ++++----
 .../code-kata-unit-form.component.html         |  6 +++---
 .../file-unit-form.component.html              | 18 +++++++++---------
 .../task-unit-edit.component.html              |  8 ++++----
 .../src/app/unit/unit.component.html           |  4 ++--
 18 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/app/webFrontend/src/app/auth/activation/activation.component.html b/app/webFrontend/src/app/auth/activation/activation.component.html
index d94df478d..9af97f53d 100644
--- a/app/webFrontend/src/app/auth/activation/activation.component.html
+++ b/app/webFrontend/src/app/auth/activation/activation.component.html
@@ -1,3 +1,3 @@
 <p class="center">{{status}}</p>
-<p class="center" [hidden]="!success">{{ activation.text.pleaseClick | translate }}
-    <a routerLink="/login">{{ common.here | translate}}</a> {{ activation.text.toUseYourAccount | translate}}.</p>
+<p class="center" [hidden]="!success">{{ 'activation.text.pleaseClick' | translate }}
+    <a routerLink="/login">{{ 'common.here' | translate}}</a> {{ 'activation.text.toUseYourAccount' | translate}}.</p>
diff --git a/app/webFrontend/src/app/auth/reset/reset.component.html b/app/webFrontend/src/app/auth/reset/reset.component.html
index 4066c77a9..1cb6dd4d1 100644
--- a/app/webFrontend/src/app/auth/reset/reset.component.html
+++ b/app/webFrontend/src/app/auth/reset/reset.component.html
@@ -1,6 +1,6 @@
 <mat-card *ngIf="hasToken === false" class="reset-card">
   <mat-card-header>
-    <mat-card-title><h1>{{ auth.resetPassword.requestReset | translate }}</h1></mat-card-title>
+    <mat-card-title><h1>{{ 'auth.resetPassword.requestReset' | translate }}</h1></mat-card-title>
   </mat-card-header>
 
   <mat-card-content>
@@ -9,7 +9,7 @@
         <input matInput formControlName="email" [placeholder]="'common.email' | translate">
       </mat-form-field>
 
-      <button mat-raised-button color="primary" [matTooltip]="'auth.tooltipResetPass' | translate" class="mat-button" type="submit" [disabled]="loading">{{ auth.resetPassword.requestReset | translate }}</button>
+      <button mat-raised-button color="primary" [matTooltip]="'auth.tooltipResetPass' | translate" class="mat-button" type="submit" [disabled]="loading">{{ 'auth.resetPassword.requestReset' | translate }}</button>
       <br>
     </form>
   </mat-card-content>
@@ -24,7 +24,7 @@
 
       <app-password-input [form]="resetForm"></app-password-input>
 
-      <button mat-raised-button [matTooltip]="'auth.tooltip.resetPassword' | translate" color="primary" type="submit" [disabled]="loading">{{ auth.resetPassword.reset | translate }}</button>
+      <button mat-raised-button [matTooltip]="'auth.tooltip.resetPassword' | translate" color="primary" type="submit" [disabled]="loading">{{ 'auth.resetPassword.reset' | translate }}</button>
     </form>
   </mat-card-content>
 </mat-card>
diff --git a/app/webFrontend/src/app/course/course-detail/course-detail.component.html b/app/webFrontend/src/app/course/course-detail/course-detail.component.html
index e665366f9..6f2457e9d 100644
--- a/app/webFrontend/src/app/course/course-detail/course-detail.component.html
+++ b/app/webFrontend/src/app/course/course-detail/course-detail.component.html
@@ -1,6 +1,6 @@
 <div class="course-header">
   <button mat-icon-button color="primary" (click)="openDownloadDialog()" class="download-button">
-    <mat-icon [aria-label]="'unit.tooltip.downloadUnits' | translate" [mat-tooltip]="'unit.tooltip.downloadUnits' | translate">get_app</mat-icon>
+    <mat-icon>get_app</mat-icon>
   </button>
   <h1>{{course?.name}}</h1>
 
diff --git a/app/webFrontend/src/app/course/course-edit/course-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-edit.component.html
index 548fdc0a9..df80a99bf 100644
--- a/app/webFrontend/src/app/course/course-edit/course-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-edit.component.html
@@ -1,8 +1,8 @@
 <div class="course-header">
-  <h1>{{ course.text.editCourse | translate }}</h1>
+  <h1>{{ 'course.text.editCourse' | translate }}</h1>
   <a mat-button [routerLink]="['/course', id]" target="_blank" class="md-raised md-primary course-link">
     <mat-icon>open_in_new</mat-icon>
-    {{ course.text.goToCourse | translate }}
+    {{ 'course.text.goToCourse' | translate }}
   </a>
 </div>
 
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
index 6a2f9a67e..4f4726784 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
@@ -18,12 +18,12 @@
 <app-mat-fab-menu class="fab" [open]="fabOpen" [onClick]="onFabClick"
                   [disabled]="isInMode('lecture', 'create') || isInMode('lecture', 'edit') || isInMode('unit', 'create') || isInMode('unit', 'edit')"
                   [fabTooltip]="'unit.addContent' | translate">
-  <div *ngIf="isLectureOpen()" (click)="onImportUnit()">{{ unit.import | translate }}</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('task')">{{ unit.addTasks | translate }}</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('file')">{{ unit.addFiles | translate }}</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('code-kata')">{{ unit.addCodeKata | translate }}</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('video')">{{ unit.addVideos | translate }}</div>
-  <div *ngIf="isLectureOpen()" (click)="onAddUnit('free-text')">{{ unit.addFreeText | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onImportUnit()">{{ 'unit.import' | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('task')">{{ 'unit.addTasks' | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('file')">{{ 'unit.addFiles' | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('code-kata')">{{ 'unit.addCodeKata' | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('video')">{{ 'unit.addVideos' | translate }}</div>
+  <div *ngIf="isLectureOpen()" (click)="onAddUnit('free-text')">{{ 'unit.addFreeText' | translate }}</div>
   <div (click)="onImportLecture()">Import lecture</div>
   <div (click)="onAddLecture()">Add lecture</div>
 </app-mat-fab-menu>
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
index 7d98247fc..2ce062add 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
@@ -47,7 +47,7 @@ <h2>{{lecture.name}}</h2>
           <span class="unit-type">{{ unit.__t }}</span>
           <span class="unit-date">{{ unit.updatedAt | date:"y-MM-dd" }}</span>
           <span class="unit-actions">
-              <button mat-icon-button [matTooltip]="'common.edit | translate }}" (click)="onEditUnit(unit)">
+              <button mat-icon-button [matTooltip]="'common.edit' | translate" (click)="onEditUnit(unit)">
                 <mat-icon>edit</mat-icon>
               </button>
               <button class="unit-menu-button" mat-icon-button [matMenuTriggerFor]="unitMenu">
diff --git a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
index 34b70b317..007bd7c03 100644
--- a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
@@ -35,9 +35,9 @@
 
       <div class="card-btn-wrapper" *ngIf="isInSelectedMembers(user)">
         <button mat-raised-button (click)="openUserProfileDialog(user)" >DETAILS</button>
-        <button mat-raised-button (click)="openWriteMailDialog()" *ngIf="selectedMembers.length <= 1">{{ mail.send | translate}}</button>
+        <button mat-raised-button (click)="openWriteMailDialog()" *ngIf="selectedMembers.length <= 1">{{ 'mail.send' | translate}}</button>
         <button mat-raised-button color="warn" (click)="removeSelectedUsers()" *ngIf="selectedMembers.length <= 1">
-          {{ common.delete | translate }}
+          {{ 'common.delete' | translate }}
         </button>
       </div>
     </mat-card>
diff --git a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
index 7f245896b..5a7ec6c8e 100644
--- a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
@@ -23,7 +23,7 @@
   <mat-expansion-panel class="panel" [expanded]="true" #expPanel2>
     <mat-expansion-panel-header>
       <mat-panel-title class="title">
-        {{ course.text.inCourse | translate }}
+        {{ 'course.text.inCourse' | translate }}
       </mat-panel-title>
       <mat-panel-description>
         <p class="line">{{role}}s: {{dragableUsersInCourse.length}} of
@@ -42,7 +42,7 @@
   <mat-expansion-panel class="panel" [expanded]="false" #expPanel1>
     <mat-expansion-panel-header>
       <mat-panel-title class="title">
-        {{ course.text.notInCourse | translate }}
+        {{ 'course.text.notInCourse' | translate }}
       </mat-panel-title>
       <mat-panel-description>
         <p class="line">{{role}}s: {{dragableUsers.length}} of {{usersTotal}}</p>
diff --git a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
index 98ac9cb18..1e032be7a 100644
--- a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
+++ b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
@@ -16,17 +16,17 @@
   </mat-form-field>
 
   <p *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_FREE">
-    {{ course.text.isFreeForEveryone | translate }}
+    {{ 'course.text.isFreeForEveryone' | translate }}
   </p>
 
   <mat-form-field class="full-width" *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_ACCESSKEY">
     <input async matInput id="accessKey" [placeholder]="'course.placeholder.accessKey' | translate" [(ngModel)]="accessKey"
            [ngModelOptions]="{standalone: true}">
-    <mat-hint>{{ course.text.enterAccessKeyForStudents | translate }}</mat-hint>
+    <mat-hint>{{ 'course.text.enterAccessKeyForStudents' | translate }}</mat-hint>
   </mat-form-field>
 
   <div class="csv-upload" *ngIf="enrollType === enrollTypeConstants.ENROLL_TYPE_WHITELIST">
-    <p>{{ course.text.uploadWhitelist | translate }}</p>
+    <p>{{ 'course.text.uploadWhitelist' | translate }}</p>
     <p>
       <!-- TODO: Replace with shared upload form -->
       <input class="upload" type="file" ng2FileSelect [uploader]="uploader"
@@ -35,21 +35,21 @@
               (click)="uploader.uploadAll()"
               [disabled]="!uploader.getNotUploadedItems().length">
         <mat-icon>file_upload</mat-icon>
-        {{ common.upload | translate }}
+        {{ 'common.upload' | translate }}
       </button>
     </p>
   </div>
 
   <p>
     <mat-slide-toggle (change)="onChangeActive($event)" [checked]="active">
-      <span *ngIf="active">{{ course.text.canSeenByStudents | translate }}</span>
-      <span *ngIf="!active">{{ course.text.canNotSeenByStudents | translate }}</span>
+      <span *ngIf="active">{{ 'course.text.canSeenByStudents' | translate }}</span>
+      <span *ngIf="!active">{{ 'course.text.canNotSeenByStudents' | translate }}</span>
     </mat-slide-toggle>
   </p>
   <p>
     <app-button-save-cancel (cancel)="cancel()"></app-button-save-cancel>
-    <button mat-raised-button (click)="onExport()" type="button">{{ common.export | translate }}</button>
-    <button mat-raised-button (click)="onDuplicate()" type="button">{{ common.duplicate | translate }}</button>
+    <button mat-raised-button (click)="onExport()" type="button">{{ 'common.export' | translate }}</button>
+    <button mat-raised-button (click)="onDuplicate()" type="button">{{ 'common.duplicate' | translate }}</button>
   </p>
 </form>
-<button mat-raised-button color="warn" (click)= "deleteCourse()">{{ course.delete | translate }}</button>
+<button mat-raised-button color="warn" (click)= "deleteCourse()">{{ 'course.delete' | translate }}</button>
diff --git a/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html b/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html
index 949e97ac1..ae1b5ff32 100644
--- a/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/members/whitelist-edit/whitelist-edit.component.html
@@ -1,13 +1,13 @@
 <mat-expansion-panel *ngIf="course.enrollType === 'whitelist'" class="whitelist" [expanded]="false" #expPanel>
   <mat-expansion-panel-header>
   <mat-panel-title class="title">
-    {{ course.text.whitelist | translate }}
+    {{ 'course.text.whitelist' | translate }}
   </mat-panel-title>
   <mat-panel-description>
-    {{ common.amount | translate }}: {{course.whitelist.length}}
+    {{ 'common.amount' | translate }}: {{course.whitelist.length}}
   </mat-panel-description>
   </mat-expansion-panel-header>
-  <p>{{ course.text.infoWhitelist | translate }}</p>
+  <p>{{ 'course.text.infoWhitelist' | translate }}</p>
   <app-whitelist-show [show]="expPanel.expanded"
                       [course]="course"
     (onDragendRemoveWhitelist) ="removeWhitelistUserFromCourse($event)">
diff --git a/app/webFrontend/src/app/report/report.component.html b/app/webFrontend/src/app/report/report.component.html
index 62bd59a4a..8d4686453 100644
--- a/app/webFrontend/src/app/report/report.component.html
+++ b/app/webFrontend/src/app/report/report.component.html
@@ -1,8 +1,8 @@
-<h2>{{course.text.reportFor | translate}} {{courseName}}</h2>
+<h2>{{'course.text.reportFor' | translate}} {{courseName}}</h2>
 <mat-toolbar>
   <mat-toolbar-row>
-    <button mat-button routerLink="." routerLinkActive="active">{{ course.text.overview | translate }}</button>
-    <button mat-button routerLink="user/all" routerLinkActive="active">{{ course.text.userResults | translate }}</button>
+    <button mat-button routerLink="." routerLinkActive="active">{{ 'course.text.overview' | translate }}</button>
+    <button mat-button routerLink="user/all" routerLinkActive="active">{{ 'course.text.userResults' | translate }}</button>
   </mat-toolbar-row>
 </mat-toolbar>
 <div class="report-container">
diff --git a/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.ts b/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.ts
index 93c2e5312..5d46d2c3e 100644
--- a/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.ts
+++ b/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.ts
@@ -3,6 +3,8 @@ import {FileItem, FileUploader} from 'ng2-file-upload';
 import {IUser} from '../../../../../../../shared/models/IUser';
 import {MatDialogRef, MatSnackBar} from '@angular/material';
 import {SnackBarService} from '../../services/snack-bar.service';
+import {TranslateService} from '@ngx-translate/core';
+
 
 @Component({
   selector: 'app-upload-dialog',
@@ -23,7 +25,8 @@ export class UploadDialog implements OnInit {
 
   constructor(
     public dialogRef: MatDialogRef<UploadDialog>,
-    private snackBar: SnackBarService) {}
+    private snackBar: SnackBarService,
+    private translate: TranslateService) {}
 
   ngOnInit() {
     this.uploader = new FileUploader({
diff --git a/app/webFrontend/src/app/shared/modules/dialog.module.ts b/app/webFrontend/src/app/shared/modules/dialog.module.ts
index 784bbfb22..d8cd25199 100644
--- a/app/webFrontend/src/app/shared/modules/dialog.module.ts
+++ b/app/webFrontend/src/app/shared/modules/dialog.module.ts
@@ -14,25 +14,32 @@ import {InfoDialog} from '../components/info-dialog/info-dialog.component';
 import {FocusDirective} from '../directives/focus.directive';
 import {ChangePasswordDialogComponent} from '../components/change-password-dialog/change-password-dialog.component';
 import {RenameDialogComponent} from '../components/rename-dialog/rename-dialog.component';
+import {TranslateModule} from '@ngx-translate/core';
+import {HttpClientModule} from '@angular/common/http';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     ReactiveFormsModule,
-    FileUploadModule,
     MaterialImportModule,
+    HttpClientModule,
+    ReactiveFormsModule,
+    FileUploadModule,
+    TranslateModule,
     AceEditorModule,
   ],
   exports: [
     InfoDialog,
     ConfirmDialog,
+    TranslateModule,
     AccessKeyDialog,
     UploadDialog,
     FilepickerDialog,
     WriteMailDialog,
     RenameDialogComponent,
     FocusDirective,
+    MaterialImportModule
   ],
   declarations: [
     InfoDialog,
diff --git a/app/webFrontend/src/app/unit/task-unit/task-unit.component.html b/app/webFrontend/src/app/unit/task-unit/task-unit.component.html
index e186173ea..21047ff4b 100644
--- a/app/webFrontend/src/app/unit/task-unit/task-unit.component.html
+++ b/app/webFrontend/src/app/unit/task-unit/task-unit.component.html
@@ -1,6 +1,6 @@
 <div class="tasks">
   <div class="task" *ngFor="let task of taskUnit.tasks">
-    <p><strong>{{common.question | translate}}:</strong> {{task.name}}</p>
+    <p><strong>{{'common.question' | translate}}:</strong> {{task.name}}</p>
     <ul class="answers">
       <li *ngFor="let answer of task.answers"
           [class.correct]="validationMode && answer.value"
@@ -15,9 +15,9 @@
 </div>
 
 <p>
-  <button mat-raised-button color="primary" [disabled]="validationMode" (click)="validate()">{{ unit.text.submitAnswers | translate }}</button>
-  <button mat-raised-button (click)="reset()">{{ common.reset | translate }}</button>
+  <button mat-raised-button color="primary" [disabled]="validationMode" (click)="validate()">{{ 'unit.text.submitAnswers' | translate }}</button>
+  <button mat-raised-button (click)="reset()">{{ 'common.reset' | translate }}</button>
   <span *ngIf="progress && progress.done" class="progress-done">
-    <mat-icon>check</mat-icon>{{ unit.text.taskCompleted | translate }}
+    <mat-icon>check</mat-icon>{{ 'unit.text.taskCompleted' | translate }}
   </span>
 </p>
diff --git a/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html
index f652129e4..d59a9c34b 100644
--- a/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/code-kata-unit-form/code-kata-unit-form.component.html
@@ -5,11 +5,11 @@
 
   <div class="info-text">
     <mat-icon>info</mat-icon>
-    {{ code-kata.information.info1 | translate }} "{{areaSeperator}}".
+    {{ 'code-kata.information.info1' | translate }} "{{areaSeperator}}".
   </div>
   <div class="info-text">
     <mat-icon>info</mat-icon>
-    {{ code-kata.information.info2 | translate }}
+    {{ 'code-kata.information.info2' | translate }}
   </div>
 
   <ace-editor class="user-code-editor"
@@ -23,7 +23,7 @@
   <button mat-raised-button (click)="validate()">Validate</button>
   <app-button-save-cancel (save)="addUnit()" (cancel) ="onCancel()"></app-button-save-cancel>
   <div *ngIf="logs!==undefined" class="logs-title">
-    {{ code-kata.text.logs | translate }}
+    {{ 'code-kata.text.logs' | translate }}
     <pre>{{logs}}</pre>
   </div>
 </div>
diff --git a/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
index 2b9b6df25..04c25b061 100644
--- a/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
@@ -1,15 +1,15 @@
 <ng-container [ngSwitch]="fileUnitType">
-  <h3 *ngSwitchCase="'video'">{{ unit.addVideos | translate }}</h3>
-  <h3 *ngSwitchDefault>{{ unit.addFiles | translate}}</h3>
+  <h3 *ngSwitchCase="'video'">{{ 'unit.addVideos' | translate }}</h3>
+  <h3 *ngSwitchDefault>{{ 'unit.addFiles' | translate}}</h3>
 </ng-container>
 
 <app-unit-general-info-form [model]="model"></app-unit-general-info-form>
 <div *ngIf="model?.files?.length > 0" class="file-list-container uploaded-files">
   <div class="file-list">
     <div class="file-list-row file-list-header">
-      <span>{{ file.text.filename | translate }}</span>
-      <span>{{ file.text.filesize | translate }}</span>
-      <span>{{ file.text.actions | translate }}</span>
+      <span>{{ 'file.text.filename' | translate }}</span>
+      <span>{{ 'file.text.filesize' | translate }}</span>
+      <span>{{ 'file.text.actions' | translate }}</span>
     </div>
     <div class="file-list-row" *ngFor="let file of model.files">
       <span class="filename">{{file.name}}</span>
@@ -17,7 +17,7 @@ <h3 *ngSwitchDefault>{{ unit.addFiles | translate}}</h3>
       <mat-action-row>
         <button mat-raised-button color="warn" (click)="removeFile(file)">
           <mat-icon>delete</mat-icon>
-          {{ common.delete | translate }}
+          {{ 'common.delete' | translate }}
         </button>
       </mat-action-row>
     </div>
@@ -26,17 +26,17 @@ <h3 *ngSwitchDefault>{{ unit.addFiles | translate}}</h3>
 
 <p>
   <button mat-raised-button (click)="openAddFilesDialog()">
-    {{ file.text.addFile || translate }}
+    {{ 'file.text.addFile' | translate }}
   </button>
 </p>
 <p>
   <button mat-raised-button color="primary"
           (click)="save()" [disabled]="checkSave()">
     <mat-icon>save</mat-icon>
-    {{ common.save | translate }}
+    {{ 'common.save' | translate }}
   </button>
   <button mat-raised-button
           (click)="onCancel()">
-    {{ common.cancel | translate }}
+    {{ 'common.cancel' | translate }}
   </button>
 </p>
diff --git a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
index 229e340b3..c17f445eb 100644
--- a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
@@ -1,10 +1,10 @@
 <div class="task-unit-edit">
-  <strong>{{ unit.text.tasks | translate }}</strong>
+  <strong>{{ 'unit.text.tasks' | translate }}</strong>
 
   <app-unit-general-info-form [model]="model"></app-unit-general-info-form>
 
   <mat-hint>
-    {{ unit.text.hintAddQuestionAndAnswers | translate}}
+    {{ 'unit.text.hintAddQuestionAndAnswers' | translate}}
   </mat-hint>
 
   <div *ngFor="let task of model.tasks" class="question-answer">
@@ -30,7 +30,7 @@
       </div>
       <div class="add-answer">
         <button mat-button (click)="addAnswerAtEnd(task)">
-          <mat-icon>add</mat-icon> {{ unit.text.addAnswer | translate }}
+          <mat-icon>add</mat-icon> {{ 'unit.text.addAnswer' | translate }}
         </button>
       </div>
     </div>
@@ -38,7 +38,7 @@
 
   <p>
     <button mat-raised-button (click)="addTask()">
-      <mat-icon>add</mat-icon> {{ unit.text.addQuestion | translate }}
+      <mat-icon>add</mat-icon> {{ 'unit.text.addQuestion' | translate }}
     </button>
 
     <app-button-save-cancel (save)="saveUnit()" (cancel)="onCancel()"></app-button-save-cancel>
diff --git a/app/webFrontend/src/app/unit/unit.component.html b/app/webFrontend/src/app/unit/unit.component.html
index 61914c07b..54326ea46 100644
--- a/app/webFrontend/src/app/unit/unit.component.html
+++ b/app/webFrontend/src/app/unit/unit.component.html
@@ -25,8 +25,8 @@
         <div class="user-detail" *ngIf="unit.unitCreator">{{unit.unitCreator.profile.firstName + ' ' +
           unit.unitCreator.profile.lastName}}
         </div>
-        <span *ngIf="unit.createdAt === unit.updatedAt">{{ unit.text.publishedOn | translate }}: {{getFormattedDate(unit.createdAt)}}</span>
-        <span *ngIf="unit.createdAt !== unit.updatedAt">{{ unit.text.changedOn | translate }}: {{getFormattedDate(unit.updatedAt)}}</span>
+        <span *ngIf="unit.createdAt === unit.updatedAt">{{ 'unit.text.publishedOn' | translate }}: {{getFormattedDate(unit.createdAt)}}</span>
+        <span *ngIf="unit.createdAt !== unit.updatedAt">{{ 'unit.text.changedOn' | translate }}: {{getFormattedDate(unit.updatedAt)}}</span>
       </div>
     </mat-card-content>
   </mat-card>

From bed3af90ed9c9a49f0702913fd849691eaa08634 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 15:15:19 +0200
Subject: [PATCH 13/32] bugfixes

---
 .../activation-resend.component.html               |  4 ++--
 .../src/app/auth/register/register.component.html  |  6 +++---
 .../lecture-form/lecture-form.component.html       |  2 +-
 .../app/notification/notification.component.html   |  4 ++--
 .../upload-dialog/upload-dialog.component.html     | 12 ++++++------
 .../upload-form/upload-form.component.html         | 12 ++++++------
 .../src/app/shared/modules/dialog.module.ts        |  1 -
 .../dashboard-student.component.html               |  2 +-
 .../free-text-unit-editor.component.html           |  6 +++---
 .../user/user-details/user-details.component.html  |  4 ++--
 .../app/user/user-edit/user-edit.component.html    | 14 +++++++-------
 .../user/user-profile/user-profile.component.html  |  4 ++--
 .../user/user-report/user-report.component.html    |  4 ++--
 13 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html b/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
index 31f615435..d285a3973 100644
--- a/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
+++ b/app/webFrontend/src/app/auth/activation-resend/activation-resend.component.html
@@ -20,7 +20,7 @@
       <div class="form-group" formGroupName="profile">
         <mat-form-field>
           <input matInput formControlName="lastName"
-                 [placeholder]="'common.profile.lastName'|translate"/>
+                 [placeholder]="'common.profileDetails.lastName'|translate"/>
           <div *ngIf="resendActivationForm.get('profile').get('lastName').touched">
             <small *ngIf="resendActivationForm.get('profile').get('lastName').hasError('required')"
                    class="text-danger">
@@ -36,7 +36,7 @@
 
       <div>
         <mat-form-field>
-          <input matInput formControlName="uid" [placeholder]="'common.profile.uid'|translate"/>
+          <input matInput formControlName="uid" [placeholder]="'common.profileDetails.uid' | translate"/>
           <div *ngIf="resendActivationForm.controls.uid.touched">
             <small *ngIf="resendActivationForm.controls.uid.hasError('required')" class="text-danger">
               {{'common.validation.required'|translate}}
diff --git a/app/webFrontend/src/app/auth/register/register.component.html b/app/webFrontend/src/app/auth/register/register.component.html
index cec2c3369..c9f5c3537 100644
--- a/app/webFrontend/src/app/auth/register/register.component.html
+++ b/app/webFrontend/src/app/auth/register/register.component.html
@@ -21,7 +21,7 @@
       <div class="form-group" formGroupName="profile">
         <mat-form-field>
           <input matInput formControlName="firstName"
-                 [placeholder]="'common.profile.firstName'|translate" maxlength="64"/>
+                 [placeholder]="'common.profileDetails.firstName'|translate" maxlength="64"/>
           <div *ngIf="registerForm.get('profile').get('firstName').touched">
             <small *ngIf="registerForm.get('profile').get('firstName').hasError('required')"
                    class="text-danger">
@@ -39,7 +39,7 @@
         </mat-form-field>
         <mat-form-field>
           <input matInput formControlName="lastName"
-                 [placeholder]="'common.profile.lastName'|translate" maxlength="64"/>
+                 [placeholder]="'common.profileDetails.lastName'|translate" maxlength="64"/>
           <div *ngIf="registerForm.get('profile').get('lastName').touched">
             <small *ngIf="registerForm.get('profile').get('lastName').hasError('required')"
                    class="text-danger">
@@ -78,7 +78,7 @@
 
       <div *ngIf="role == 'student'">
         <mat-form-field>
-          <input matInput formControlName="uid" [placeholder]="'common.profile.uid'|translate"/>
+          <input matInput formControlName="uid" [placeholder]="'common.profileDetails.uid'|translate"/>
           <div *ngIf="registerForm.controls.uid.touched">
             <small *ngIf="uidError" class="text-danger">{{uidError}}</small>
             <small *ngIf="registerForm.controls.uid.hasError('validateMatriculationNumber')" class="text-danger">
diff --git a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
index acae76034..95f8a456c 100644
--- a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
+++ b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
@@ -9,6 +9,6 @@
 
   <p>
     <button mat-raised-button [disabled]="!lectureForm.valid" color="primary" type="submit">{{ actionLabel }}</button>
-    <button mat-raised-button (click)="onCancel()">{{ common.cancel | translate }}</button>
+    <button mat-raised-button (click)="onCancel()">{{ 'common.cancel' | translate }}</button>
   </p>
 </form>
diff --git a/app/webFrontend/src/app/notification/notification.component.html b/app/webFrontend/src/app/notification/notification.component.html
index 04e0ba69b..2560349d9 100644
--- a/app/webFrontend/src/app/notification/notification.component.html
+++ b/app/webFrontend/src/app/notification/notification.component.html
@@ -4,8 +4,8 @@
 </button>
 <mat-menu #notificationMenu="matMenu">
   <span class="headline">Notifications</span>
-  <span *ngIf="!isNullOrUndefined(notifications) && notifications.length > 0" class="clearButton" (click)="clearAll()">{{ notifications.text.clearAll | translate }}</span>
-  <span *ngIf="isNullOrUndefined(notifications) || notifications.length <= 0" class="noNotification">{{ notifications.text.noNotifications | translate }}</span>
+  <span *ngIf="!isNullOrUndefined(notifications) && notifications.length > 0" class="clearButton" (click)="clearAll()">{{ 'notifications.text.clearAll' | translate }}</span>
+  <span *ngIf="isNullOrUndefined(notifications) || notifications.length <= 0" class="noNotification">{{ 'notifications.text.noNotifications' | translate }}</span>
   <mat-nav-list>
     <div *ngFor="let notification of notifications">
       <mat-divider></mat-divider>
diff --git a/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html b/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html
index d94ccd7d6..8442e0ca4 100644
--- a/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-dialog/upload-dialog.component.html
@@ -6,7 +6,7 @@
              [uploader]="uploader"
              class="file-dropzone"
               (onFileDrop)="startUpload()">
-        <span>{{ file.text.infoDropAddFiles | translate }}</span>
+        <span>{{ 'file.text.infoDropAddFiles' | translate }}</span>
         <input type="file"
                ng2FileSelect
                [uploader]="uploader"
@@ -21,19 +21,19 @@
   <mat-tab id="webcam-tab" [label]="'file.text.takePicture' | translate">
     <div class="tab-content">
       <div class="camera">
-        <video #webcam>{{ file.text.noVideo | translate }}</video>
+        <video #webcam>{{ 'file.text.noVideo' | translate }}</video>
       </div>
       <p>
-        <button mat-raised-button (click)="takePicture()">{{ file.text.takePicture | translate }}</button>
+        <button mat-raised-button (click)="takePicture()">{{ 'file.text.takePicture' | translate }}</button>
       </p>
       <div class="preview">
         <h3 *ngIf="pictureTaken">Preview image</h3>
         <img #preview>
       </div>
       <button mat-raised-button color="primary" disabled="{{!pictureTaken}}" (click)="addImage()">
-        {{ common.profileDetails.uploadPicture | translate }}
+        {{ 'common.profileDetails.uploadPicture' | translate }}
       </button>
-      <button mat-raised-button (click)="cancel()">{{ common.cancel | translate }}</button>
+      <button mat-raised-button (click)="cancel()">{{ 'common.cancel' | translate }}</button>
     </div>
   </mat-tab>
 </mat-tab-group>
@@ -41,6 +41,6 @@ <h3 *ngIf="pictureTaken">Preview image</h3>
   <h2>Uploading...</h2>
   <mat-progress-bar mode="determinate" [value]="uploader.progress"></mat-progress-bar>
   <button mat-raised-button class="btn-cancel-upload" color="warn" (click)="cancel()">
-    {{ common.cancel | translate }}
+    {{ 'common.cancel' | translate }}
   </button>
 </div>
diff --git a/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html b/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
index ab65c5a82..ceb5ceb5d 100644
--- a/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
@@ -21,10 +21,10 @@
   </div>
   <div class="file-list">
     <div class="file-list-row file-list-header">
-      <span>{{ file.text.filename | translate }}</span>
-      <span>{{ file.text.filesize | translate }}</span>
-      <span class="progress-col">{{ file.text.progress | translate }}</span>
-      <span>{{ common.actions | translate }}</span>
+      <span>{{ 'file.text.filename' | translate }}</span>
+      <span>{{ 'file.text.filesize' | translate }}</span>
+      <span class="progress-col">{{ 'file.text.progress' | translate }}</span>
+      <span>{{ 'common.actions' | translate }}</span>
     </div>
     <div class="file-list-row" *ngFor="let item of fileUploader.queue">
       <span class="filename">{{item.file.name}}</span>
@@ -34,10 +34,10 @@
       </span>
       <mat-action-row>
         <button *ngIf="item.isUploading" mat-button (click)="item.cancel()">
-          <mat-icon>block</mat-icon>{{ common.cancel | translate }}
+          <mat-icon>block</mat-icon>{{ 'common.cancel' | translate }}
         </button>
         <button *ngIf="!item.isUploading && !item.isSuccess" mat-raised-button color="warn" (click)="item.remove()">
-          <mat-icon>delete</mat-icon>{{ file.text.removeFromQueue | translate }}
+          <mat-icon>delete</mat-icon>{{ 'file.text.removeFromQueue' | translate }}
         </button>
       </mat-action-row>
     </div>
diff --git a/app/webFrontend/src/app/shared/modules/dialog.module.ts b/app/webFrontend/src/app/shared/modules/dialog.module.ts
index d8cd25199..5250b6b7d 100644
--- a/app/webFrontend/src/app/shared/modules/dialog.module.ts
+++ b/app/webFrontend/src/app/shared/modules/dialog.module.ts
@@ -24,7 +24,6 @@ import {HttpClientModule} from '@angular/common/http';
     ReactiveFormsModule,
     MaterialImportModule,
     HttpClientModule,
-    ReactiveFormsModule,
     FileUploadModule,
     TranslateModule,
     AceEditorModule,
diff --git a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
index 0db5b5f91..5fca2b5f3 100644
--- a/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
+++ b/app/webFrontend/src/app/start/dashboard/dashboard-student/dashboard-student.component.html
@@ -1,5 +1,5 @@
 <mat-form-field class="pull-right">
-  <mat-select [placeholder]="'sort.placeholder.sorstedBy | translate '">
+  <mat-select [placeholder]="'sort.placeholder.sortedBy' | translate ">
     <mat-option value="last visited" (click)="sortCourses()">{{ 'sort.lastVisited' | translate }}</mat-option>
     <mat-option value="alphabetically" (click)="sortAlphabetically()">{{ 'sort.alphabetically' | translate }}</mat-option>
   </mat-select>
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html
index 25bf2e2f5..70ab0911c 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor.component.html
@@ -2,9 +2,9 @@
   <mat-tab label="Write">
     <p class="info-text">
       <mat-icon>info</mat-icon>
-      {{ course.text.addMarkdownToCourse | translate }}
-      {{ common.cheatSheetYouFind | translate }}
-      <a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">{{ common.here | translate }}</a>.
+      {{ 'course.text.addMarkdownToCourse' | translate }}
+      {{ 'common.cheatSheetYouFind' | translate }}
+      <a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">{{ 'common.here' | translate }}</a>.
     </p>
 
     <ace-editor #editor
diff --git a/app/webFrontend/src/app/user/user-details/user-details.component.html b/app/webFrontend/src/app/user/user-details/user-details.component.html
index e60ac8f9b..aca36da13 100644
--- a/app/webFrontend/src/app/user/user-details/user-details.component.html
+++ b/app/webFrontend/src/app/user/user-details/user-details.component.html
@@ -1,12 +1,12 @@
 <div class="user-detail-wrapper">
-    <h1>{{ common.profile | translate}}</h1>
+    <h1>{{ 'common.profile' | translate}}</h1>
 
     <app-user-profile *ngIf="user" [user]="user" [userId]="this.userService.user._id"></app-user-profile>
 
     <p *ngIf="user && (userService.isLoggedInUser(user) || userService.isAdmin())">
         <button mat-raised-button color="primary" routerLink="{{ getEditLink() }}">
             <mat-icon>edit</mat-icon>
-          {{ common.editProfile | translate }}
+          {{ 'common.editProfile' | translate }}
         </button>
     </p>
 
diff --git a/app/webFrontend/src/app/user/user-edit/user-edit.component.html b/app/webFrontend/src/app/user/user-edit/user-edit.component.html
index ebb20cda8..e17767323 100644
--- a/app/webFrontend/src/app/user/user-edit/user-edit.component.html
+++ b/app/webFrontend/src/app/user/user-edit/user-edit.component.html
@@ -1,5 +1,5 @@
 <div class="edit-user-wrapper">
-<h1>Edit profile</h1>
+<h1>{{ 'common.editProfile' | translate }}</h1>
 <div class="profile" *ngIf="user">
     <span class="user-icon" user-image [user-image]="user" [size]="'100px'"></span>
 </div>
@@ -7,7 +7,7 @@ <h1>Edit profile</h1>
 <form name="form" class="user-form" (ngSubmit)="onSubmit()" [formGroup]="userForm">
   <div class="form-group" formGroupName="profile">
     <mat-form-field class="full-width">
-      <input matInput formControlName="firstName" placeholder="First name" maxlength="64"/>
+      <input matInput formControlName="firstName" [placeholder]="'common.profileDetails.firstName' | translate" maxlength="64"/>
       <div *ngIf="userForm.get('profile').get('firstName').touched">
         <small *ngIf="userForm.get('profile').get('firstName').hasError('required')"
                class="text-danger">
@@ -53,23 +53,23 @@ <h1>Edit profile</h1>
     <input matInput formControlName="email" [placeholder]="'common.email'|translate"/>
   </mat-form-field>
   <button mat-raised-button color="primary" class="mat-button" type="submit" [disabled]="!userForm?.valid">
-    {{ common.save | translate }}
+    {{ 'common.save' | translate }}
   </button>
   <button mat-raised-button class="mat-button" routerLink="/profile" routerLinkActive="active">
-    {{ common.cancel | translate }}
+    {{ 'common.cancel' | translate }}
   </button>
 </form>
 <p *ngIf="!showPwFields()">
   <button mat-raised-button class="mat-button" (click)="resetPassword()">
-    {{ auth.generatePassword | translate }}
+    {{ 'auth.generatePassword' | translate }}
   </button>
 </p>
 <div class="button-wrapper">
   <button mat-raised-button class="mat-button" (click)="openAddPictureDialog()">
-    {{ profileDetails.uploadPicture | translate }}
+    {{ 'common.profileDetails.uploadPicture' | translate }}
   </button>
   <button mat-raised-button class="mat-button" (click)="openChangePasswordDialog()">
-    {{ auth.changePassword | translate }}
+    {{ 'auth.changePassword' | translate }}
   </button>
 </div>
 </div>
diff --git a/app/webFrontend/src/app/user/user-profile/user-profile.component.html b/app/webFrontend/src/app/user/user-profile/user-profile.component.html
index f208bad5b..1c602d251 100644
--- a/app/webFrontend/src/app/user/user-profile/user-profile.component.html
+++ b/app/webFrontend/src/app/user/user-profile/user-profile.component.html
@@ -7,9 +7,9 @@ <h3 class="name-section">
     <span class="name" *ngIf="isCurrentProfile()">{{user.profile.firstName}} {{user.profile.lastName}}</span>
   </h3>
   <div class="user-data">
-    <span><strong>{{ common.email | translate }}: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></span>
+    <span><strong>{{ 'common.email' | translate }}: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></span>
     <span *ngIf="canSeeUid()">
-      <strong>{{ common.profileDetails.uid | translate}}: </strong>{{user.uid}}
+      <strong>{{ 'common.profileDetails.uid' | translate}}: </strong>{{user.uid}}
     </span>
   </div>
 </div>
diff --git a/app/webFrontend/src/app/user/user-report/user-report.component.html b/app/webFrontend/src/app/user/user-report/user-report.component.html
index 2eb8804d8..32117b62b 100644
--- a/app/webFrontend/src/app/user/user-report/user-report.component.html
+++ b/app/webFrontend/src/app/user/user-report/user-report.component.html
@@ -1,5 +1,5 @@
 <div class="user-progress" *ngIf="report?.length > 0">
-  <h2>{{ course.text.yourCourseProgress | translate }}</h2>
+  <h2>{{ 'course.text.yourCourseProgress' | translate }}</h2>
   <mat-card *ngFor="let course of report">
     <mat-card-header>
       <mat-card-title>{{ course.name }}</mat-card-title>
@@ -16,7 +16,7 @@ <h2>{{ course.text.yourCourseProgress | translate }}</h2>
     <mat-card-actions align="start">
       <button mat-button [routerLink]="['/', 'course', course._id]" routerLinkActive="active">
         <mat-icon>arrow_forward</mat-icon>
-        {{ course.text.goToCourse | translate }}
+        {{ 'course.text.goToCourse' | translate }}
       </button>
 
     </mat-card-actions>

From 3f426ce533809b084f07655291fa5559e237c41a Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 15:50:16 +0200
Subject: [PATCH 14/32] - add more vars

---
 .../course-container/course-container.component.html   |  2 +-
 .../course-manage-content.component.html               |  6 +++---
 app/webFrontend/src/app/course/course.component.html   |  2 +-
 .../access-key-dialog/access-key-dialog.component.html | 10 +++++-----
 .../button-save-cancel.component.html                  |  4 ++--
 .../change-password-dialog.component.html              |  8 ++++----
 .../confirm-dialog/confirm-dialog.component.html       |  2 +-
 .../filepicker-dialog/filepicker-dialog.component.html | 10 +++++-----
 .../components/info-dialog/info-dialog.component.html  |  2 +-
 .../markdown-editor/markdown-editor.component.html     |  4 +---
 .../pick-media-dialog/pick-media-dialog.component.html |  4 ++--
 11 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-container/course-container.component.html b/app/webFrontend/src/app/course/course-container/course-container.component.html
index 6fda57787..3125f14d7 100644
--- a/app/webFrontend/src/app/course/course-container/course-container.component.html
+++ b/app/webFrontend/src/app/course/course-container/course-container.component.html
@@ -10,7 +10,7 @@
 
 
 <div class="courses" *ngIf="expand">
-  <p class="subtitle" *ngIf="!courses.length">No courses added yet.</p>
+  <p class="subtitle" *ngIf="!courses.length">{{ 'course.text.noCourses' | translate }}</p>
   <app-course *ngFor="let course of courses" [course]="course" (onLeave)="leaveCallback($event)" (onEnroll)="enrollCallback($event)"></app-course>
 </div>
 
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
index 4f4726784..a2c5bffec 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/course-manage-content.component.html
@@ -7,7 +7,7 @@
     </app-lecture-edit>
   </div>
 
-  <p *ngIf="!course.lectures.length">No lectures added yet.</p>
+  <p *ngIf="!course.lectures.length">{{ 'lecture.text.noLecture' | translate }}</p>
 
   <app-lecture-form *ngIf="isInMode('lecture', 'create')" (onSubmit)="createLecture($event)" [onCancel]="closeAddLecture"
                     actionLabel="Add"></app-lecture-form>
@@ -24,6 +24,6 @@
   <div *ngIf="isLectureOpen()" (click)="onAddUnit('code-kata')">{{ 'unit.addCodeKata' | translate }}</div>
   <div *ngIf="isLectureOpen()" (click)="onAddUnit('video')">{{ 'unit.addVideos' | translate }}</div>
   <div *ngIf="isLectureOpen()" (click)="onAddUnit('free-text')">{{ 'unit.addFreeText' | translate }}</div>
-  <div (click)="onImportLecture()">Import lecture</div>
-  <div (click)="onAddLecture()">Add lecture</div>
+  <div (click)="onImportLecture()">{{ 'lecture.text.import' | translate }}</div>
+  <div (click)="onAddLecture()">{{ 'lecture.text.add' | translate }}</div>
 </app-mat-fab-menu>
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index 9768a5576..d6570aac6 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -41,7 +41,7 @@
     </button>
     </span>
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
-            color="primary" [matTooltip]="'course.tooltip.resetPassword' | translate" class="details-button" [routerLink]="['course', course._id]">
+            color="primary" [matTooltip]="'course.tooltip.enroll' | translate" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>
     </button>
   </mat-card-actions>
diff --git a/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html b/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html
index 85e0210e4..4e1e9b5e5 100644
--- a/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html
@@ -1,13 +1,13 @@
-<h1 matDialogTitle>This course requires an access key</h1>
-<div mat-dialog-content>Please enter the course's access key:</div>
+<h1 matDialogTitle>{{ 'course.text.needAccessKey' | translate }}</h1>
+<div mat-dialog-content>{{ 'course.text.enterAccessKey' | translate }}</div>
 <div>
   <mat-form-field class="full-width">
-    <input async matInput type="password" id="accessKey" placeholder="access key" [(ngModel)]="accessKey"
+    <input async matInput type="password" id="accessKey" placeholder="'course.placeholder.accessKey' | translate" [(ngModel)]="accessKey"
            [ngModelOptions]="{standalone: true}">
   </mat-form-field>
 </div>
 <div mat-dialog-actions>
-  <button mat-raised-button color="primary" (click)="dialogRef.close(accessKey)" style="margin-right: 10px">Continue
+  <button mat-raised-button color="primary" (click)="dialogRef.close(accessKey)" style="margin-right: 10px">{{ 'common.continue' | translate }}
   </button>
-  <button mat-raised-button color="warn" (click)="dialogRef.close(null)">Discard</button>
+  <button mat-raised-button color="warn" (click)="dialogRef.close(null)">{{ 'common.dicard' | translate }}</button>
 </div>
diff --git a/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html b/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html
index 86ab27b53..5034032c9 100644
--- a/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html
+++ b/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html
@@ -1,2 +1,2 @@
-<button mat-raised-button color="primary" class="add-unit" (click)="emitSave()" type="submit">Save</button>
-<button mat-raised-button color="secondary" (click)="emitCancel()">Cancel</button>
+<button mat-raised-button color="primary" class="add-unit" (click)="emitSave()" type="submit">{{ 'common.save' | translate }}</button>
+<button mat-raised-button color="secondary" (click)="emitCancel()">{{ 'common.cancel' | translate }}</button>
diff --git a/app/webFrontend/src/app/shared/components/change-password-dialog/change-password-dialog.component.html b/app/webFrontend/src/app/shared/components/change-password-dialog/change-password-dialog.component.html
index c5e7a2673..b9498a6e4 100644
--- a/app/webFrontend/src/app/shared/components/change-password-dialog/change-password-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/change-password-dialog/change-password-dialog.component.html
@@ -1,12 +1,12 @@
-<h2>Change Password</h2>
+<h2>{{ 'auth.changePassword' | translate }}</h2>
 <form name="form" [formGroup]="pwForm">
   <ng-container *ngIf="isSameUser()">
     <mat-form-field class="full-width">
-     <input matInput type="password" formControlName="currentPassword" placeholder="current Password"/>
+     <input matInput type="password" formControlName="currentPassword" [placeholder]="'auth.tooltip.currentPassword' | translate"/>
     </mat-form-field>
   </ng-container>
   <app-password-input [form]="pwForm"></app-password-input>
-  <button mat-raised-button color="primary" type="submit" (click)="onSubmit()" [disabled]="!pwForm?.valid">Save</button>
-  <button mat-raised-button (click)="cancel()">Cancel</button>
+  <button mat-raised-button color="primary" type="submit" (click)="onSubmit()" [disabled]="!pwForm?.valid">{{ 'common.save' | translate }}</button>
+  <button mat-raised-button (click)="cancel()">{{ 'common.cancel' | translate }}</button>
 </form>
 
diff --git a/app/webFrontend/src/app/shared/components/confirm-dialog/confirm-dialog.component.html b/app/webFrontend/src/app/shared/components/confirm-dialog/confirm-dialog.component.html
index 120380726..54bf664be 100644
--- a/app/webFrontend/src/app/shared/components/confirm-dialog/confirm-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/confirm-dialog/confirm-dialog.component.html
@@ -1,4 +1,4 @@
 <h2>{{title}}</h2>
 <p>{{message}}</p>
 <button mat-raised-button color="warn" (click)="dialogRef.close(true)">{{confirmText}}</button>
-<button mat-raised-button (click)="dialogRef.close(false)">Cancel</button>
+<button mat-raised-button (click)="dialogRef.close(false)">{{ 'common.cancel' | translate }}</button>
diff --git a/app/webFrontend/src/app/shared/components/filepicker-dialog/filepicker-dialog.component.html b/app/webFrontend/src/app/shared/components/filepicker-dialog/filepicker-dialog.component.html
index 17769b00b..b1d1ca161 100644
--- a/app/webFrontend/src/app/shared/components/filepicker-dialog/filepicker-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/filepicker-dialog/filepicker-dialog.component.html
@@ -1,12 +1,12 @@
-<h2>Select a File</h2>
+<h2>{{ 'file.tooltip.selectFile' | translate }}</h2>
 <p>{{message}}</p>
 <div *ngIf="!showProgressBar">
-  <input type="file" name="filepicker" ng2FileSelect [uploader]="uploader" placeholder="Select a file"/>
+  <input type="file" name="filepicker" ng2FileSelect [uploader]="uploader" [placeholder]="'file.tooltip.selectFile' | translate"/>
 </div>
 <div *ngIf="showProgressBar">
   <h2>Uploading...</h2>
   <mat-progress-bar mode="determinate" [value]="uploader.progress"></mat-progress-bar>
-  <button mat-raised-button class="btn-cancel-upload" color="warn" (click)="cancel()">Cancel</button>
+  <button mat-raised-button class="btn-cancel-upload" color="warn" (click)="cancel()">{{ 'common.cancel' | translate }}</button>
 </div>
-<button mat-raised-button color="primary" (click)="upload()">OK</button>
-<button mat-raised-button (click)="cancel()">Cancel</button>
+<button mat-raised-button color="primary" (click)="upload()">{{ 'common.ok' | translate }}</button>
+<button mat-raised-button (click)="cancel()">{{ 'common.cancel' | translate }}</button>
diff --git a/app/webFrontend/src/app/shared/components/info-dialog/info-dialog.component.html b/app/webFrontend/src/app/shared/components/info-dialog/info-dialog.component.html
index 68a558ce1..341dfa966 100644
--- a/app/webFrontend/src/app/shared/components/info-dialog/info-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/info-dialog/info-dialog.component.html
@@ -1,3 +1,3 @@
 <h2>{{title}}</h2>
 <p>{{message}}</p>
-<button mat-raised-button color="primary" (click)="dialogRef.close(true)">OK</button>
+<button mat-raised-button color="primary" (click)="dialogRef.close(true)">{{ 'common.ok' | translate }}</button>
diff --git a/app/webFrontend/src/app/shared/components/markdown-editor/markdown-editor.component.html b/app/webFrontend/src/app/shared/components/markdown-editor/markdown-editor.component.html
index 46cfedee5..549397b28 100644
--- a/app/webFrontend/src/app/shared/components/markdown-editor/markdown-editor.component.html
+++ b/app/webFrontend/src/app/shared/components/markdown-editor/markdown-editor.component.html
@@ -3,9 +3,7 @@
     <mat-tab label="Write">
       <p class="info-text">
         <mat-icon>info</mat-icon>
-        Add Markdown to add text.
-        A Cheatsheet you can find
-        <a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">here</a>.
+        {{ 'common.addMarkdownText' | translate }}
       </p>
 
       <ace-editor #editor
diff --git a/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html b/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
index 76798862e..5da2a3e2f 100644
--- a/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
@@ -19,9 +19,9 @@ <h2>Add files to unit</h2>
 
 <mat-dialog-actions>
   <button mat-raised-button color="primary" (click)="save()">
-    SAVE
+    {{ 'common.save' | translate }}
   </button>
   <button mat-raised-button (click)="cancel()">
-    CANCEL
+    {{ 'common.cancel' | translate }}
   </button>
 </mat-dialog-actions>

From 84feb94c43cfb3d06b120e76c19caaceb94f2314 Mon Sep 17 00:00:00 2001
From: wurmc <clarawurm95@gmail.com>
Date: Thu, 17 May 2018 15:51:14 +0200
Subject: [PATCH 15/32] bugfix: de.json and en.json expanded

---
 app/webFrontend/src/assets/i18n/de.json | 16 ++++++++++++++++
 app/webFrontend/src/assets/i18n/en.json | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 56ec28204..55a44f213 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -38,6 +38,7 @@
       "reset": "Zurücksetzen"
     },
     "tooltip": {
+      "currentPassword": "Current password",
       "ForgotPassword": "Klicken Sie hier, um ein neues Passwort anzufordern.",
       "ResetPassword": "Klicken Sie hier, um das Passwort zurückzusetzen."
     }
@@ -57,13 +58,16 @@
   "common": {
     "about": "Über",
     "actions": "Aktionen",
+    "addMarkdownText": "Füge Markdown hinzu.\n Eine Referenz finden Sie hier: <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet\" target=\"_blank\"></a>.",
     "administration": "Administration",
     "amount": "Menge",
     "back": "Zurück",
     "cancel": "Abbrechen",
     "cheatSheetYouFind": "Einen Spickzettel finden Sie hier.",
+    "continue": "Weiter",
     "delete": "Löschen",
     "description": "Beschreibung",
+    "discard": "Verwerfen",
     "dismiss": "Schließen",
     "download": "Download",
     "duplicate": "Duplizieren",
@@ -79,6 +83,7 @@
     "login": "Login",
     "name": "Name",
     "notifications": "Benachrichtigungen",
+    "ok": "OK",
     "password": "Passwort",
     "profile": "Profil",
     "profileDetails": {
@@ -133,11 +138,14 @@
       "canNotSeenByStudents": "Kurs ist für Studenten nicht sichtbar.",
       "canSeenByStudents": "Kurs ist für Studenten sichtbar.",
       "editCourse": "Kurs bearbeiten",
+      "enterAccessKey": "Bitte geben Sie den Einschreibeschlüssel dieses Kurses ein.",
       "enterAccessKeyForStudents": "Geben Sie einen Einschreibeschlüssel für die Studenten ein.",
       "goToCourse": "Zum Kurs",
       "inCourse": "Im Kurs",
       "infoWhitelist": "Allen Benutzern dieser Liste, ist es erlaubt, dem Kurs beizutreten.",
       "isFreeForEveryone": "Der Kurs ist offen und für jeden zugänglich.",
+      "needAccessKey": "Dieser Kurs benötigt einen Einschreibeschlüssel.",
+      "noCourses": "Noch keine Kurse hinzugefügt.",
       "notInCourse": "Nicht im Kurs",
       "overview": "Übersicht",
       "reportFor": "Ergebnis für",
@@ -181,12 +189,20 @@
       "progress": "Fortschritt",
       "RemoveFromQueue": "Datei aus der Schlange löschen.",
       "takePicture": "Bild aufnehmen"
+    },
+    "tooltip":{
+      "selectFile": "Datei auswählen"
     }
   },
   "home": {
     "welcomeTo": "Willkommen auf"
   },
   "lecture": {
+    "text":{
+      "add": "Kapitel hinzufügen",
+      "import": "Kapitel importieren",
+      "noLecture": "Noch kein Kapitel hinzugefügt."
+    },
     "tooltip": {
       "add": "Einheit hinzufügen",
       "delete": "Einheit löschen",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 02255c8d5..0f74fbb19 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -38,6 +38,7 @@
       "reset": "Reset"
     },
     "tooltip": {
+      "currentPassword": "Current password",
       "ForgotPassword": "Click here to request a new password.",
       "ResetPassword": "Click here to reset password."
     }
@@ -57,13 +58,16 @@
   "common": {
     "about": "About",
     "actions": "Actions",
+    "addMarkdownText": "Add Markdown to add text.\n A Cheatsheet you can find here: <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet\" target=\"_blank\"></a>.",
     "administration": "Administration",
     "amount": "Amount",
     "back": "Back",
     "cancel": "Cancel",
     "cheatSheetYouFind": "A cheat sheet you can find ",
+    "continue": "Continue",
     "delete": "Delete",
     "description": "Description",
+    "discard": "Discard",
     "dismiss": "Dismiss",
     "download": "Download",
     "duplicate": "Duplicate",
@@ -79,6 +83,7 @@
     "login": "Login",
     "name": "Name",
     "notifications": "Notifications",
+    "ok": "OK",
     "password": "Password",
     "profile": "Profile",
     "profileDetails": {
@@ -133,11 +138,14 @@
       "canNotSeenByStudents": "Course cannot be seen by students.",
       "canSeenByStudents": "Course can be seen by students.",
       "editCourse": "Edit course",
+      "enterAccessKey": "Please enter the course's access key.",
       "enterAccessKeyForStudents": "Enter an access key for the students.",
       "goToCourse": "Go to course",
       "inCourse": "In Course",
       "infoWhitelist": "All users on this list are allowed to join this course.",
       "isFreeForEveryone": "The course is free and accessible for everyone.",
+      "needAccessKey": "This course requires an access key.",
+      "noCourses": "No courses added yet.",
       "notInCourse": "Not in course",
       "overview": "Overview",
       "reportFor": "Report for",
@@ -181,12 +189,20 @@
       "progress": "Progress",
       "RemoveFromQueue": "Remove file from queue.",
       "takePicture": "Take picture"
+    },
+    "tooltip":{
+      "selectFile": "Select file"
     }
   },
   "home": {
     "welcomeTo": "Welcome to"
   },
   "lecture": {
+    "text":{
+      "add": "Add lecture",
+      "import": "Import lecture",
+      "noLecture": "No lecture added yet."
+    },
     "tooltip": {
       "add": "Add new unit",
       "delete": "Delete unit",

From e5811d6914433f0a59992afe9001e4d9be2e960c Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 16:42:15 +0200
Subject: [PATCH 16/32] - more translations

---
 .../shared/components/notfound/notfound.component.html |  8 ++++----
 .../pick-media-dialog/pick-media-dialog.component.html |  2 +-
 .../rename-dialog/rename-dialog.component.html         |  6 +++---
 .../upload-form-dialog.component.html                  |  4 ++--
 .../user-profile-dialog.component.html                 |  6 +++---
 app/webFrontend/src/assets/i18n/de.json                | 10 +++++++++-
 app/webFrontend/src/assets/i18n/en.json                |  8 ++++++++
 7 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/webFrontend/src/app/shared/components/notfound/notfound.component.html b/app/webFrontend/src/app/shared/components/notfound/notfound.component.html
index 9d0ac828a..ec5a3c3d8 100644
--- a/app/webFrontend/src/app/shared/components/notfound/notfound.component.html
+++ b/app/webFrontend/src/app/shared/components/notfound/notfound.component.html
@@ -1,8 +1,8 @@
 <div class="not-found-wrapper">
-    <h1>Page not found :(</h1>
-    <p>Maybe the page you are looking for has been removed, or you typed in the wrong URL</p>
+    <h1>{{ 'errorPage.text.pageNotFound' | translate }}</h1>
+    <p>{{ 'errorPage.text.pageNotFoundHint' | translate }}</p>
     <button mat-raised-button class="mat-button" (click)="goBack()">
         <mat-icon>arrow_backward</mat-icon>
-        Go back
+        {{ 'common.back' | translate }}
     </button>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html b/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
index 5da2a3e2f..5bab32435 100644
--- a/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
@@ -5,7 +5,7 @@ <h2>Add files to unit</h2>
     <li *ngFor="let type of allowedMimeTypes"><small>{{ type }}</small></li>
   </ul>
 </ng-container>
-<small>Files selected: {{ selectedOptions.length }}</small>
+<small>{{ 'file.text.filesSelected' | translate }}: {{ selectedOptions.length }}</small>
 <br>
 <mat-dialog-content>
   <mat-selection-list #fileList dense [(ngModel)]="selectedOptions">
diff --git a/app/webFrontend/src/app/shared/components/rename-dialog/rename-dialog.component.html b/app/webFrontend/src/app/shared/components/rename-dialog/rename-dialog.component.html
index da8d4eeca..e16179da4 100644
--- a/app/webFrontend/src/app/shared/components/rename-dialog/rename-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/rename-dialog/rename-dialog.component.html
@@ -1,7 +1,7 @@
 <mat-dialog-content>
   <form>
     <mat-form-field>
-      <input matInput placeholder="Name to be set" [(ngModel)]="nameField" name="name">
+      <input matInput [placeholder]="'common.name' | translate" [(ngModel)]="nameField" name="name">
     </mat-form-field>
   </form>
 </mat-dialog-content>
@@ -9,9 +9,9 @@
 <mat-dialog-actions>
   <button mat-raised-button color="primary" (click)="save()">
     <mat-icon>save</mat-icon>
-    SAVE
+    {{ 'common.save' | translate }}
   </button>
   <button mat-raised-button (click)="cancel()">
-    CANCEL
+    {{ 'common.cancel' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html b/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html
index d63df898f..3fa71cb85 100644
--- a/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html
@@ -13,7 +13,7 @@ <h2>Add files</h2>
   <button mat-raised-button color="primary"
           (click)="uploadAll()" [disabled]="!checkSave()">
     <mat-icon>file_upload</mat-icon>
-    Upload and save
+    {{ 'file.placeholder.uploadFiles' | translate }}
   </button>
-  <button mat-raised-button (click)="cancel()">Cancel</button>
+  <button mat-raised-button (click)="cancel()">{{ 'common.cancel' | translate }}</button>
 </mat-dialog-actions>
diff --git a/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html b/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html
index 993699bff..a0546c10a 100644
--- a/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html
@@ -5,11 +5,11 @@ <h2 class="name">
       <span>{{user.profile.firstName}} {{user.profile.lastName}}</span>
     </h2>
     <div class="user-data">
-      <div><strong>E-Mail: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></div>
+      <div><strong>{{ 'common.email' | translate }}: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></div>
       <div *ngIf="canSeeUid()">
-          <strong>Matrikelnummer: </strong>{{user.uid}}
+          <strong>{{ 'common.profileDetails.uid' | translate }}: </strong>{{user.uid}}
       </div>
     </div>
   </div>
-  <button mat-raised-button color="primary" (click)="dialogRef.close(true)">CLOSE</button>
+  <button mat-raised-button color="primary" (click)="dialogRef.close(true)">{{ 'common.close' | translate }}</button>
 </div>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 55a44f213..867a04875 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -64,6 +64,7 @@
     "back": "Zurück",
     "cancel": "Abbrechen",
     "cheatSheetYouFind": "Einen Spickzettel finden Sie hier.",
+    "close" : "Schließen",
     "continue": "Weiter",
     "delete": "Löschen",
     "description": "Beschreibung",
@@ -175,15 +176,22 @@
     "myCourses": "Meine Kurse",
     "teacherCourses": "Meine Lehrveranstaltungen"
   },
+  "errorPage": {
+    "text" : {
+      "pageNotFound" : "Seite nicht gefunden :(",
+      "pageNotFoundHint" : "Vielleicht suchen Sie nach einer Seite, die leider nicht mehr existiert."
+    }
+  },
   "file": {
     "placeholder": {
-      "uploadFiles": "UploadFiles"
+      "uploadFiles": "Dateien hochladen"
     },
     "text": {
       "actions": "Aktionen",
       "addFile": "Datei hinzufügen",
       "filename": "Dateiname",
       "filesize": "Dateigröße",
+      "filesSelected" : "Dateien ausgewählt",
       "infoDropAddFiles": "Dateien hier hinziehen oder hier klicken, um Dateien auszuwählen.",
       "noVideo": "Kein Video verfügbar.",
       "progress": "Fortschritt",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 0f74fbb19..834e9b6bb 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -65,6 +65,7 @@
     "cancel": "Cancel",
     "cheatSheetYouFind": "A cheat sheet you can find ",
     "continue": "Continue",
+    "close" : "Close",
     "delete": "Delete",
     "description": "Description",
     "discard": "Discard",
@@ -175,6 +176,12 @@
     "myCourses": "My courses",
     "teacherCourses": "My teacher courses"
   },
+  "errorPage": {
+    "text" : {
+      "pageNotFound" : "Page not found :(",
+      "pageNotFoundHint" : "Maybe the page you are looking for a page has been removed."
+    }
+  },
   "file": {
     "placeholder": {
       "uploadFiles": "UploadFiles"
@@ -184,6 +191,7 @@
       "addFile": "Add file",
       "filename": "File name",
       "filesize": "File size",
+      "filesSelected" : "File selected",
       "infoDropAddFiles": "Drop files here or click here to select files.",
       "noVideo": "No video available.",
       "progress": "Progress",

From e205e87e873420ea62915778e95bb7e49c1696ab Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 20:22:38 +0200
Subject: [PATCH 17/32] more translation in code

---
 .../course-edit/course-edit.component.ts      | 25 +++++++++++--------
 .../course-media/course-media.component.html  |  2 +-
 .../course-user-list-overview.component.html  |  2 +-
 .../course-user-list.component.html           |  2 +-
 app/webFrontend/src/assets/i18n/de.json       | 12 ++++++---
 app/webFrontend/src/assets/i18n/en.json       | 12 ++++++---
 6 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-edit/course-edit.component.ts b/app/webFrontend/src/app/course/course-edit/course-edit.component.ts
index 8cf9ed89c..8bbd3bdfd 100644
--- a/app/webFrontend/src/app/course/course-edit/course-edit.component.ts
+++ b/app/webFrontend/src/app/course/course-edit/course-edit.component.ts
@@ -1,25 +1,21 @@
 import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {TitleService} from '../../shared/services/title.service';
+import {TranslateService} from '@ngx-translate/core';
 
 @Component({
   selector: 'app-course-edit',
   templateUrl: './course-edit.component.html',
   styleUrls: ['./course-edit.component.scss']
 })
-export class CourseEditComponent implements OnInit {
+export class CourseEditComponent {
 
   id: string;
-  tabs = [
-    { path: '.', label: 'General' },
-    { path: 'content', label: 'Content' },
-    { path: 'media', label: 'Media' },
-    { path: 'members', label: 'Members' },
-    { path: 'teachers', label: 'Teachers' },
-  ];
+  tabs = [];
 
   constructor(private route: ActivatedRoute,
-              private titleService: TitleService) {
+              private titleService: TitleService,
+              private translate: TranslateService) {
     this.route.params.subscribe(params => {
       this.id = params['id'];
     });
@@ -27,6 +23,15 @@ export class CourseEditComponent implements OnInit {
 
   ngOnInit() {
     this.titleService.setTitle('Edit Course');
-  }
+    const lang = localStorage.getItem('lang') || this.translate.getBrowserLang() || this.translate.getDefaultLang();
+    this.translate.use(lang);
 
+    this.translate.get(['common.content', 'common.general', 'common.media', 'common.members', 'common.teachers']).subscribe((t: string) => {
+      this.tabs.push({ path: '.', label: t['common.general'] });
+      this.tabs.push({ path: 'content', label: t['common.content'] });
+      this.tabs.push({ path: 'media', label: t['common.media'] });
+      this.tabs.push({ path: 'members', label: t['common.members'] });
+      this.tabs.push({ path: 'teachers', label: t['common.teachers'] });
+    });
+  }
 }
diff --git a/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html b/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
index ce23fecfa..f4cd8ffc5 100644
--- a/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
@@ -87,7 +87,7 @@
           </mat-card>
         </ng-container>
         <p *ngIf="currentFolder?.files.length === 0">
-          No Files so far.
+          {{ 'file.text.noFiles' | translate }}
         </p>
       </div>
     </div>
diff --git a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
index 007bd7c03..55108f2b4 100644
--- a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list-overview/course-user-list-overview.component.html
@@ -1,7 +1,7 @@
 <div class="members" *ngIf="show">
 
   <div>
-    <button class="text-fit" mat-raised-button matTooltip="Toggle all members"
+    <button class="text-fit" mat-raised-button [matTooltip]="'user.tooltip.toggleMembers' | translate"
             (click)="toggleAllUsers()">
       <mat-icon>select_all</mat-icon>
     </button>
diff --git a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
index 5a7ec6c8e..2890f962f 100644
--- a/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-user-list/course-user-list.component.html
@@ -1,5 +1,5 @@
 <mat-form-field class="search">
-  <input matInput placeholder="Search and add {{role}}s by name, Id, e-mail"
+  <input matInput [placeholder]="'course.placeholder.searchAndAdd' | translate"
          [matAutocomplete]="auto" [formControl]="userCtrl" (ngModelOptions)="{debounce : 1000}"
          (ngModelChange)="searchForUsers($event)" [(ngModel)]="search">
 </mat-form-field>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 867a04875..49f7974ac 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -66,6 +66,7 @@
     "cheatSheetYouFind": "Einen Spickzettel finden Sie hier.",
     "close" : "Schließen",
     "continue": "Weiter",
+    "content": "Inhalt",
     "delete": "Löschen",
     "description": "Beschreibung",
     "discard": "Verwerfen",
@@ -78,12 +79,15 @@
     "export": "Export",
     "fullscreenMode": "Vollbildmodus",
     "geli": "geli",
+    "general" : "Allgemein",
     "here": "hier",
     "imprint": "imprint",
     "infobox": "Infobox",
     "login": "Login",
     "name": "Name",
     "notifications": "Benachrichtigungen",
+    "media" : "Medien",
+    "members" : "Mitglieder",
     "ok": "OK",
     "password": "Passwort",
     "profile": "Profil",
@@ -105,6 +109,7 @@
     "send": "Senden",
     "settings": "Einstellungen",
     "submit": "Absenden",
+    "teachers" : "Lehrer",
     "theme": "Thema",
     "tooltip": {
       "quitFullscreenMode": "Vollbildmodus beenden",
@@ -130,8 +135,7 @@
       "accessKey": "Einschreibeschlüssel",
       "Description": "Kursbeschreibung",
       "Name": "Kursname",
-      "searchAdd": "Suchen und hinzufügen:",
-      "searchAddBy": "nach Name, ID und E-Mail"
+      "searchAndAdd": "Benutzer anhand des Namens, der Id oder der E-Mail-Adresse suchen"
     },
     "ShowCourse": "Kurs anzeigen",
     "text": {
@@ -194,6 +198,7 @@
       "filesSelected" : "Dateien ausgewählt",
       "infoDropAddFiles": "Dateien hier hinziehen oder hier klicken, um Dateien auszuwählen.",
       "noVideo": "Kein Video verfügbar.",
+      "noFiles" : "Keine Dateien vorhanden",
       "progress": "Fortschritt",
       "RemoveFromQueue": "Datei aus der Schlange löschen.",
       "takePicture": "Bild aufnehmen"
@@ -290,7 +295,8 @@
       "signedIn": "Eingetragen"
     },
     "tooltip":{
-      "deleteUSers": "Ausgewählte Mitglieder entfernen."
+      "deleteUSers": "Ausgewählte Mitglieder entfernen.",
+      "toggleMembers" : "Alle Benutzer auswählen"
     }
   }
 }
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 834e9b6bb..5456b8e7d 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -65,6 +65,7 @@
     "cancel": "Cancel",
     "cheatSheetYouFind": "A cheat sheet you can find ",
     "continue": "Continue",
+    "content" : "Content",
     "close" : "Close",
     "delete": "Delete",
     "description": "Description",
@@ -78,12 +79,15 @@
     "export": "Export",
     "fullscreenMode": "Fullscreen Mode",
     "geli": "geli",
+    "general": "General",
     "here": "here",
     "imprint": "imprint",
     "infobox": "InfoBox",
     "login": "Login",
     "name": "Name",
     "notifications": "Notifications",
+    "media": "Media",
+    "members": "Members",
     "ok": "OK",
     "password": "Password",
     "profile": "Profile",
@@ -105,6 +109,7 @@
     "send": "Send",
     "settings": "Settings",
     "submit": "Submit",
+    "teachers": "Teachers",
     "theme": "Theme",
     "tooltip": {
       "quitFullscreenMode": "Quit Fullscreen",
@@ -130,8 +135,7 @@
       "accessKey": "Access key",
       "Description": "Course description",
       "Name": "Course name",
-      "searchAdd": "Search and add",
-      "searchAddBy": "by name, id and email"
+      "searchAndAdd": "Search and add user by name, Id or e-mail"
     },
     "ShowCourse": "Show course",
     "text": {
@@ -194,6 +198,7 @@
       "filesSelected" : "File selected",
       "infoDropAddFiles": "Drop files here or click here to select files.",
       "noVideo": "No video available.",
+      "noFiles" : "No files available.",
       "progress": "Progress",
       "RemoveFromQueue": "Remove file from queue.",
       "takePicture": "Take picture"
@@ -290,7 +295,8 @@
       "signedIn": "Signed in"
     },
     "tooltip":{
-      "deleteUSers": "Delete selected Members."
+      "deleteUSers": "Delete selected Members.",
+      "toggleMembers" : "Toggle all members"
     }
   }
 }

From 2c1ed4786ee1d8adc2c5e4c2e247e4195a16d017 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 21:04:11 +0200
Subject: [PATCH 18/32] - add tooltips

- bugfixes
---
 api/package-lock.json                                    | 2 +-
 app/webFrontend/src/app/course/course.component.html     | 9 +++++----
 .../access-key-dialog/access-key-dialog.component.html   | 2 +-
 .../components/upload-form/upload-form.component.html    | 2 +-
 .../free-text-unit-form.component.html                   | 2 +-
 .../unit-general-info-form.component.html                | 6 +++---
 app/webFrontend/src/assets/i18n/de.json                  | 3 +++
 app/webFrontend/src/assets/i18n/en.json                  | 3 +++
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/api/package-lock.json b/api/package-lock.json
index 396334753..491819af2 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "geli-api",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index d6570aac6..753bd2ad3 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -10,16 +10,16 @@
   </mat-card-content>
   <mat-card-actions>
     <span class="course-admin-actions" *ngIf="this.course.userCanEditCourse">
-      <button mat-icon-button (click)="editCourse(course._id)">
+      <button mat-icon-button (click)="editCourse(course._id)" [matTooltip]="'course.text.editCourse' | translate">
         <mat-icon>mode_edit</mat-icon>
       </button>
 
-      <button mat-icon-button (click)="showReport(course._id)">
+      <button mat-icon-button (click)="showReport(course._id)" [matTooltip]="'common.statistics' | translate">
         <mat-icon>show_chart</mat-icon>
       </button>
 
       <button mat-icon-button *ngIf="!course.active" disabled>
-        <mat-icon color="warn">visibility_off</mat-icon>
+        <mat-icon color="warn" [matTooltip]="'course.text.notVisibleToStudents' | translate">visibility_off</mat-icon>
       </button>
     </span>
     <span class="course-student-actions" *ngIf="this.userService.isStudent()">
@@ -41,8 +41,9 @@
     </button>
     </span>
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
-            color="primary" [matTooltip]="'course.tooltip.enroll' | translate" class="details-button" [routerLink]="['course', course._id]">
+            color="primary" [matTooltip]="'common.open' | translate" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>
     </button>
+
   </mat-card-actions>
 </mat-card>
diff --git a/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html b/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html
index 4e1e9b5e5..2394353b7 100644
--- a/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/access-key-dialog/access-key-dialog.component.html
@@ -9,5 +9,5 @@ <h1 matDialogTitle>{{ 'course.text.needAccessKey' | translate }}</h1>
 <div mat-dialog-actions>
   <button mat-raised-button color="primary" (click)="dialogRef.close(accessKey)" style="margin-right: 10px">{{ 'common.continue' | translate }}
   </button>
-  <button mat-raised-button color="warn" (click)="dialogRef.close(null)">{{ 'common.dicard' | translate }}</button>
+  <button mat-raised-button color="warn" (click)="dialogRef.close(null)">{{ 'common.discard' | translate }}</button>
 </div>
diff --git a/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html b/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
index ceb5ceb5d..508611d8a 100644
--- a/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-form/upload-form.component.html
@@ -3,7 +3,7 @@
      (fileOver)="onFileOverDropzone($event)"
      [uploader]="fileUploader"
      class="file-dropzone">
-  <span>{{ file.text.infoDropAddFiles | translate }}</span>
+  <span>{{ 'file.text.infoDropAddFiles' | translate }}</span>
   <input type="file"
          ng2FileSelect
          [uploader]="fileUploader"
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html
index b7b1304cc..473792f29 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-form.component.html
@@ -4,7 +4,7 @@
   <app-free-text-unit-editor [(markdown)]="this.model.markdown"></app-free-text-unit-editor>
 
   <div class="btn-wrapper">
-    <button mat-raised-button color="secondary" (click)="openFullscreen()">{{ unit.text.fullscreen | translate }}</button>
+    <button mat-raised-button color="secondary" (click)="openFullscreen()">{{ 'unit.text.fullscreen' | translate }}</button>
     <app-button-save-cancel (save)="saveUnit()" (cancel)="onCancel()"></app-button-save-cancel>
   </div>
 </div>
diff --git a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
index 87539ba46..135a213b1 100644
--- a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="form">
   <mat-form-field>
-    <input matInput required formControlName="name" [placeholder]="'common.name'| translate ">
+    <input matInput required formControlName="name" [placeholder]="'common.name'| translate">
   </mat-form-field>
 
   <mat-form-field>
@@ -15,8 +15,8 @@
 
   <div>
     <mat-slide-toggle formControlName="visible">
-      <span *ngIf="form.value.visible">{{ unit.text.canBeSeenByStudents | translate }}</span>
-      <span *ngIf="!form.value.visible">{{ unit.text.canNotBeSeenByStudents | translate }}s</span>
+      <span *ngIf="form.value.visible">{{ 'unit.text.canBeSeenByStudents' | translate }}</span>
+      <span *ngIf="!form.value.visible">{{ 'unit.text.canNotBeSeenByStudents' | translate }}s</span>
     </mat-slide-toggle>
   </div>
 </form>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 49f7974ac..b73f2f679 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -89,6 +89,7 @@
     "media" : "Medien",
     "members" : "Mitglieder",
     "ok": "OK",
+    "open" : "Öffnen",
     "password": "Passwort",
     "profile": "Profil",
     "profileDetails": {
@@ -108,6 +109,7 @@
     "save": "Speichern",
     "send": "Senden",
     "settings": "Einstellungen",
+    "statistics": "Statistik",
     "submit": "Absenden",
     "teachers" : "Lehrer",
     "theme": "Thema",
@@ -152,6 +154,7 @@
       "needAccessKey": "Dieser Kurs benötigt einen Einschreibeschlüssel.",
       "noCourses": "Noch keine Kurse hinzugefügt.",
       "notInCourse": "Nicht im Kurs",
+      "notVisibleToStudents": "Kurs für Studenten nicht sichtbar",
       "overview": "Übersicht",
       "reportFor": "Ergebnis für",
       "selectAccessType": "Bitte wählen Sie Ihren Kurstyp aus.",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 5456b8e7d..39c6551a2 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -89,6 +89,7 @@
     "media": "Media",
     "members": "Members",
     "ok": "OK",
+    "open" : "Open",
     "password": "Password",
     "profile": "Profile",
     "profileDetails": {
@@ -108,6 +109,7 @@
     "save": "Save",
     "send": "Send",
     "settings": "Settings",
+    "statistics": "Statistics",
     "submit": "Submit",
     "teachers": "Teachers",
     "theme": "Theme",
@@ -150,6 +152,7 @@
       "infoWhitelist": "All users on this list are allowed to join this course.",
       "isFreeForEveryone": "The course is free and accessible for everyone.",
       "needAccessKey": "This course requires an access key.",
+      "notVisibleToStudents": "Course not visible to students",
       "noCourses": "No courses added yet.",
       "notInCourse": "Not in course",
       "overview": "Overview",

From 61cab88e721b415ff9f94407c8535ff30e632849 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 21:27:17 +0200
Subject: [PATCH 19/32] - more vars and translations

- bugfixes
---
 .../course/course-detail/course-detail.component.html  |  2 +-
 .../lecture-edit/lecture-edit.component.html           | 10 +++++-----
 .../course-media/course-media.component.html           |  2 +-
 .../expandable-div/expandable-div.component.html       |  2 +-
 .../pick-media-dialog/pick-media-dialog.component.html |  2 +-
 .../upload-form-dialog.component.html                  |  2 +-
 app/webFrontend/src/assets/i18n/de.json                |  7 +++++--
 app/webFrontend/src/assets/i18n/en.json                |  5 ++++-
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-detail/course-detail.component.html b/app/webFrontend/src/app/course/course-detail/course-detail.component.html
index 6f2457e9d..dd8ec5d9e 100644
--- a/app/webFrontend/src/app/course/course-detail/course-detail.component.html
+++ b/app/webFrontend/src/app/course/course-detail/course-detail.component.html
@@ -1,5 +1,5 @@
 <div class="course-header">
-  <button mat-icon-button color="primary" (click)="openDownloadDialog()" class="download-button">
+  <button mat-icon-button color="primary" [matTooltip]="'course.tooltip.download' | translate" (click)="openDownloadDialog()" class="download-button">
     <mat-icon>get_app</mat-icon>
   </button>
   <h1>{{course?.name}}</h1>
diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
index 2ce062add..8680c89ef 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
@@ -2,7 +2,7 @@
   <div class="lecture-header">
     <mat-icon class="lecture-drag-handle">drag_handle</mat-icon>
     <h2>{{lecture.name}}</h2>
-    <button class="open-toggle" (click)="toggleLecture()"
+    <button class="open-toggle" [matTooltip]="'common.tooltip.clickToOpen' | translate" (click)="toggleLecture()"
             [class.opened]="isOpened()" mat-icon-button>
       <mat-icon>arrow_drop_down</mat-icon>
     </button>
@@ -16,19 +16,19 @@ <h2>{{lecture.name}}</h2>
     <mat-menu #lectureMenu="matMenu">
       <button mat-menu-item [matTooltip]="'lecture.tooltipEdit' | translate" (click)="onEditLecture(lecture)">
         <mat-icon>edit</mat-icon>
-        Edit
+        {{ 'common.edit' | translate }}
       </button>
       <button mat-menu-item [matTooltip]="'lecture.tooltipDownloadLecture' | translate"  (click)="exportLecture(lecture)">
         <mat-icon>file_download</mat-icon>
-        Export
+        {{ 'common.export' | translate }}
       </button>
       <button mat-menu-item [matTooltip]="'lecture.tooltipDuplicate' | translate" (click)="duplicateLecture(lecture)">
         <mat-icon>content_copy</mat-icon>
-        Duplicate
+        {{ 'common.duplicate' | translate }}
       </button>
       <button mat-menu-item [matTooltip]="'lecture.tooltipDelete' | translate" (click)="deleteLecture(lecture)">
         <mat-icon>delete</mat-icon>
-        Delete
+        {{ 'common.delete' | translate }}
       </button>
     </mat-menu>
   </div>
diff --git a/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html b/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
index f4cd8ffc5..c479d535d 100644
--- a/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
@@ -28,7 +28,7 @@
 
       <!-- Multi-Select button area -->
       <div class="btn__area">
-        <button class="text-fit" mat-raised-button matTooltip="Upload file"
+        <button class="text-fit" mat-raised-button [matTooltip]="'file.tooltip.uploadFile' | translate"
                 (click)="addFile()">
           <mat-icon>add</mat-icon>
         </button>
diff --git a/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html b/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html
index 31244cbc3..c48cc7109 100644
--- a/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html
+++ b/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html
@@ -1,6 +1,6 @@
 <ng-template #innerContent>
   {{title}}
-  <button class="open-toggle" [class.opened] = "opened" mat-icon-button >
+  <button class="open-toggle" [matTooltip]="'common.tooltip.clickToOpen' | translate" [class.opened]="opened" mat-icon-button >
     <mat-icon class="arrow">
       arrow_drop_down
     </mat-icon>
diff --git a/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html b/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
index 5bab32435..7bd78c9a3 100644
--- a/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/pick-media-dialog/pick-media-dialog.component.html
@@ -1,4 +1,4 @@
-<h2>Add files to unit</h2>
+<h2>{{ 'unit.addFilesToUnit' | translate }}</h2>
 <ng-container *ngIf="allowedMimeTypes !== undefined && allowedMimeTypes.length > 0">
   <small>Allowed MimeTypes:</small>
   <ul>
diff --git a/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html b/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html
index 3fa71cb85..a734cec8f 100644
--- a/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/upload-form-dialog/upload-form-dialog.component.html
@@ -1,5 +1,5 @@
 <mat-dialog-content>
-  <h2>Add files</h2>
+  <h2>{{ 'unit.addFiles' | translate }}</h2>
 
   <app-upload-form [uploadMethod]="'POST'"
                    [uploadPath]="uploadPath"
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index b73f2f679..95774c70f 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -73,7 +73,7 @@
     "dismiss": "Schließen",
     "download": "Download",
     "duplicate": "Duplizieren",
-    "edit": "bearbeiten",
+    "edit": "Bearbeiten",
     "editProfile": "Profil bearbeiten",
     "email": "E-Mail",
     "export": "Export",
@@ -166,6 +166,7 @@
     "tooltip" : {
       "add": "Kurs hinzufügen",
       "addUserToWhitelist": "Benutzer zu Freigabeliste hinzufügen",
+      "download" : "Kurs herunterladen",
       "enroll": "Einschreiben",
       "keyRequired" : "Zugangscode benötigt",
       "leave": "Verlassen",
@@ -207,7 +208,8 @@
       "takePicture": "Bild aufnehmen"
     },
     "tooltip":{
-      "selectFile": "Datei auswählen"
+      "selectFile": "Datei auswählen",
+      "uploadFile": "Datei hochladen"
     }
   },
   "home": {
@@ -257,6 +259,7 @@
     "addCodeKata": "Code-Kata hinzufügen",
     "addContent": "Inhalt hinzufügen",
     "addFiles": "Dateien hinzufügen",
+    "addFilesToUnit": "Dateien zur Einheit hinzufügen",
     "addFreeText": "Freitext hinzufügen",
     "addTasks": "Aufgaben hinzufügen",
     "addVideos": "Videos hinzufügen",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 39c6551a2..f4f875b14 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -166,6 +166,7 @@
     "tooltip" : {
       "add": "Add Course",
       "addUserToWhitelist": "Add user to whitelist",
+      "download" : "Download course",
       "enroll": "Enroll",
       "keyRequired" : "Access key required",
       "leave": "Leave",
@@ -207,7 +208,8 @@
       "takePicture": "Take picture"
     },
     "tooltip":{
-      "selectFile": "Select file"
+      "selectFile": "Select file",
+      "uploadFile": "Upload file"
     }
   },
   "home": {
@@ -257,6 +259,7 @@
     "addCodeKata": "Add code-kata",
     "addContent": "Add content",
     "addFiles": "Add files",
+    "addFilesToUnit": "Add files to unit",
     "addFreeText": "Add free text",
     "addTasks": "Add tasks",
     "addVideos": "Add videos",

From 1149d4759712b2dae2478407bca8da3da3f27ea9 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Thu, 17 May 2018 21:31:52 +0200
Subject: [PATCH 20/32] - add info to CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77638393..d7f472e57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -->
 
 ## [NEXT] 
+### Changed
+- rework existing translation
+- add vars to html-files
+- add translations to resource files
+- include translation for components
+
 ### Changed
 - Migrate MatSnackBar to SnackBarService. [#724](https://github.com/h-da/geli/pull/724)
 - Reload user list after deleting an account. [#724](https://github.com/h-da/geli/pull/724)

From 0814eca3e384659e01ca5211d0b550bdd7b02469 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Fri, 18 May 2018 18:48:42 +0200
Subject: [PATCH 21/32] - some bugfixes

- change headline-const in resource-var
---
 app/webFrontend/src/app/about/about.component.html     |  2 +-
 app/webFrontend/src/app/admin/admin.component.html     |  8 ++++----
 .../src/app/admin/user-admin/user-admin.component.html | 10 +++++-----
 .../user-profile-dialog.component.html                 |  2 +-
 .../unit/code-kata-unit/code-kata-unit.component.html  |  2 +-
 .../free-text-unit-editor.dialog.html                  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/webFrontend/src/app/about/about.component.html b/app/webFrontend/src/app/about/about.component.html
index cb5ed6c6c..be4cad227 100644
--- a/app/webFrontend/src/app/about/about.component.html
+++ b/app/webFrontend/src/app/about/about.component.html
@@ -1,4 +1,4 @@
-<h1>{{ common.about | translate }}</h1>
+<h1>{{ 'common.about' | translate }}</h1>
 
 <app-general-info></app-general-info>
 
diff --git a/app/webFrontend/src/app/admin/admin.component.html b/app/webFrontend/src/app/admin/admin.component.html
index 5260c57c9..1c12cd56f 100644
--- a/app/webFrontend/src/app/admin/admin.component.html
+++ b/app/webFrontend/src/app/admin/admin.component.html
@@ -1,14 +1,14 @@
-<h1>{{ common.administration | translate }}</h1>
+<h1>{{ 'common.administration' | translate }}</h1>
 <mat-toolbar>
   <mat-toolbar-row>
     <button mat-button routerLink="/admin/users">
-      <span>{{ common.users | translate }}</span>
+      <span>{{ 'common.users' | translate }}</span>
     </button>
     <button [routerLink]="['/admin/markdownEdit']" [queryParams]="{type: 'imprint', header: 'Imprint'}" mat-button>
-      <span>{{ common.imprint | translate }}</span>
+      <span>{{ 'common.imprint' | translate }}</span>
     </button>
     <button mat-button [routerLink]="['/admin/markdownEdit']" [queryParams]="{type: 'infoBox', header: 'InfoBox'}">
-      <span>{{ common.infobox | translate }}</span>
+      <span>{{ 'common.infobox' | translate }}</span>
     </button>
   </mat-toolbar-row>
 </mat-toolbar>
diff --git a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
index 1e33c2e90..8b43da656 100644
--- a/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
+++ b/app/webFrontend/src/app/admin/user-admin/user-admin.component.html
@@ -1,11 +1,11 @@
-<h2>Users</h2>
+<h2>{{ 'common.users' | translate }}</h2>
 <table class="table">
   <thead>
   <tr>
-    <th>{{ common.name | translate }}</th>
-    <th>{{ common.email | translate }}</th>
-    <th>{{ common.role | translate}}</th>
-    <th>{{ common.actions | translate }}</th>
+    <th>{{ 'common.name' | translate }}</th>
+    <th>{{ 'common.email' | translate }}</th>
+    <th>{{ 'common.role' | translate}}</th>
+    <th>{{ 'common.actions' | translate }}</th>
   </tr>
   </thead>
   <tbody>
diff --git a/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html b/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html
index a0546c10a..e5860c64f 100644
--- a/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html
+++ b/app/webFrontend/src/app/shared/components/user-profile-dialog/user-profile-dialog.component.html
@@ -5,7 +5,7 @@ <h2 class="name">
       <span>{{user.profile.firstName}} {{user.profile.lastName}}</span>
     </h2>
     <div class="user-data">
-      <div><strong>{{ 'common.email' | translate }}: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></div>
+      <div><strong>{{ 'common.email' | translate }}u: </strong><a href="mailto:{{user.email}}">{{user.email}}</a></div>
       <div *ngIf="canSeeUid()">
           <strong>{{ 'common.profileDetails.uid' | translate }}: </strong>{{user.uid}}
       </div>
diff --git a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
index 89cc5cb2f..ea892791e 100644
--- a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
+++ b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
@@ -28,7 +28,7 @@
   </ace-editor>
 
   <div *ngIf="!isExampleCode">
-    <button mat-raised-button (click)="validate()">{{ common.validate | translate }}</button>
+    <button mat-raised-button (click)="validate()">{{ 'common.validate' | translate }}</button>
     <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">{{ common.submit | translate }}</button>
   </div>
   <div *ngIf="logs!==undefined" class="logs-title">
diff --git a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
index f44c7ab96..388d19489 100644
--- a/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
+++ b/app/webFrontend/src/app/unit/unit-form/free-text-unit-form/free-text-unit-editor/free-text-unit-editor-dialog/free-text-unit-editor.dialog.html
@@ -1,6 +1,6 @@
 <mat-toolbar matDialogTitle role="heading">
   <mat-toolbar-row>
-    <span>{{ common.fullscreenMode | translate }}</span>
+    <span>{{ 'common.fullscreenMode' | translate }}</span>
     <span class="toolbar-fill"></span>
     <button mat-mini-fab color="primary" (click)="onCloseClick()" [matTooltip]="'common.tooltip.quitFullscreenMode' | translate">
       <mat-icon>close</mat-icon>

From e8de99d79b383b5abf4e3df903e51c1fae2044d1 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Fri, 18 May 2018 21:42:08 +0200
Subject: [PATCH 22/32] bugfix

---
 .../app/user/user-settings/user-settings.component.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/webFrontend/src/app/user/user-settings/user-settings.component.html b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
index f3f5ed3a2..53aac8fb9 100644
--- a/app/webFrontend/src/app/user/user-settings/user-settings.component.html
+++ b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
@@ -1,5 +1,5 @@
-<h1>{{ common.settings | translate }}</h1>
-<h2>{{ common.notifications | translate }}</h2>
+<h1>{{ 'common.settings' | translate }}</h1>
+<h2>{{ 'common.notifications' | translate }}</h2>
 <mat-table #table [dataSource]="dataSource">
   <ng-container matColumnDef="Notifications">
     <mat-header-cell class="header" *matHeaderCellDef>
@@ -7,7 +7,7 @@ <h2>{{ common.notifications | translate }}</h2>
                     [checked]="notificationSelection.hasValue() && isAllSelected(notificationSelection)"
                     [indeterminate]="notificationSelection.hasValue() && !isAllSelected(notificationSelection)">
       </mat-checkbox>
-      <span>{{ common.notifications | translate }}</span>
+      <span>{{ 'common.notifications' | translate }}</span>
     </mat-header-cell>
     <mat-cell class="checkBox" *matCellDef="let course">
       <mat-checkbox (click)="$event.stopPropagation()"
@@ -28,7 +28,7 @@ <h2>{{ common.notifications | translate }}</h2>
                     [checked]="emailSelection.hasValue() && isAllSelected(emailSelection)"
                     [indeterminate]="emailSelection.hasValue() && !isAllSelected(emailSelection)">
       </mat-checkbox>
-      <span>{{ common.email | translate}}</span>
+      <span>{{ 'common.email' | translate}}</span>
     </mat-header-cell>
     <mat-cell class="checkBox" *matCellDef="let course">
       <mat-checkbox (click)="$event.stopPropagation()"

From 73dd747c48195b7567b7b0e0620f0af2de706e7a Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Fri, 18 May 2018 22:09:20 +0200
Subject: [PATCH 23/32] another bugfix

---
 .../src/app/user/user-settings/user-settings.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webFrontend/src/app/user/user-settings/user-settings.component.html b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
index 53aac8fb9..bb1196aac 100644
--- a/app/webFrontend/src/app/user/user-settings/user-settings.component.html
+++ b/app/webFrontend/src/app/user/user-settings/user-settings.component.html
@@ -42,4 +42,4 @@ <h2>{{ 'common.notifications' | translate }}</h2>
   <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
   <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
 </mat-table>
-<button mat-raised-button color="primary" class="mat-button saveButton" (click)="saveNotificationSettings()">{{ common.save | translate }}</button>
+<button mat-raised-button color="primary" class="mat-button saveButton" (click)="saveNotificationSettings()">{{ 'common.save' | translate }}</button>

From 922d479ab6d292472a08dc1399dc2cec641a8b44 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Mon, 21 May 2018 18:43:47 +0200
Subject: [PATCH 24/32] - bugfixes

---
 .../src/app/course/course-new/course-new.component.html       | 4 ++--
 .../src/app/lecture/lecture-form/lecture-form.component.html  | 1 -
 app/webFrontend/src/assets/i18n/de.json                       | 4 ++--
 app/webFrontend/src/assets/i18n/en.json                       | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-new/course-new.component.html b/app/webFrontend/src/app/course/course-new/course-new.component.html
index 0b4dd3087..aabc7bef5 100644
--- a/app/webFrontend/src/app/course/course-new/course-new.component.html
+++ b/app/webFrontend/src/app/course/course-new/course-new.component.html
@@ -1,5 +1,5 @@
 <div class="center-both">
-  <h1>Create Course</h1>
+  <h1>{{ 'dashboard.addCourse' | translate }}</h1>
   <mat-card>
     <form class="course-form" (ngSubmit)="newCourse.valid && createCourse()" [formGroup]="newCourse">
       <mat-form-field class="full-width">
@@ -13,7 +13,7 @@ <h1>Create Course</h1>
         <textarea matInput formControlName="description" [placeholder]="'course.placeholder.description' | translate"></textarea>
       </mat-form-field>
       <br/>
-      <button mat-raised-button color="primary" [matTooltip]="'course.tooltipAdd' | translate" class="mat-button" type="submit">Add</button>
+      <button mat-raised-button color="primary" [matTooltip]="'course.tooltip,Add' | translate" class="mat-button" type="submit">{{ 'dashboard.addCourse' | translate }}</button>
     </form>
   </mat-card>
 </div>
diff --git a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
index 95f8a456c..651a8dd6c 100644
--- a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
+++ b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
@@ -6,7 +6,6 @@
   <mat-form-field>
     <textarea matInput formControlName="description" [placeholder]="'common.description' | translate"></textarea>
   </mat-form-field>
-
   <p>
     <button mat-raised-button [disabled]="!lectureForm.valid" color="primary" type="submit">{{ actionLabel }}</button>
     <button mat-raised-button (click)="onCancel()">{{ 'common.cancel' | translate }}</button>
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 95774c70f..79a452cd1 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -135,8 +135,8 @@
     "delete": "Kurs löschen",
     "placeholder": {
       "accessKey": "Einschreibeschlüssel",
-      "Description": "Kursbeschreibung",
-      "Name": "Kursname",
+      "description": "Kursbeschreibung",
+      "name": "Kursname",
       "searchAndAdd": "Benutzer anhand des Namens, der Id oder der E-Mail-Adresse suchen"
     },
     "ShowCourse": "Kurs anzeigen",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index f4f875b14..82498878b 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -135,8 +135,8 @@
     "delete": "Delete course",
     "placeholder": {
       "accessKey": "Access key",
-      "Description": "Course description",
-      "Name": "Course name",
+      "description": "Course description",
+      "name": "Course name",
       "searchAndAdd": "Search and add user by name, Id or e-mail"
     },
     "ShowCourse": "Show course",

From df5dd85f45fc6495c3e8c11f5117772084383ba6 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Mon, 21 May 2018 22:11:19 +0200
Subject: [PATCH 25/32] deleted course tooltip

---
 .../app/course/course-container/course-container.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webFrontend/src/app/course/course-container/course-container.component.html b/app/webFrontend/src/app/course/course-container/course-container.component.html
index 3125f14d7..ca2accc68 100644
--- a/app/webFrontend/src/app/course/course-container/course-container.component.html
+++ b/app/webFrontend/src/app/course/course-container/course-container.component.html
@@ -2,7 +2,7 @@
 
   <app-badge [displayNumber]="courses.length"></app-badge>
 
-  <button class="open-toggle" [matTooltip]="'common.tooltip.clickToOpen' | translate" [class.opened]="expand" mat-icon-button>
+  <button class="open-toggle" [class.opened]="expand" mat-icon-button>
     <mat-icon class="arrow">
       arrow_drop_down
     </mat-icon>

From f26f202996c3062ecf63c6875992c549d78f8de3 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 22 May 2018 22:04:00 +0200
Subject: [PATCH 26/32] - solve automerge conflict

---
 .../file-unit-form/file-unit-form.component.html | 11 +++++------
 .../unit-general-info-form.component.html        | 16 +++++++---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html b/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
index e6f7f7976..e2c398d57 100644
--- a/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/file-unit-form/file-unit-form.component.html
@@ -1,11 +1,10 @@
 <ng-container [formGroup]="unitForm">
-  <h3 *ngSwitchCase="'video'">{{ 'unit.addVideos' | translate }}</h3>
-  <h3 *ngSwitchDefault>{{ 'unit.addFiles' | translate}}</h3>
+  <div *ngIf="unitForm.controls.files" formArrayName="files" class="file-list-container uploaded-files">
     <div class="file-list">
       <div class="file-list-row file-list-header">
-      <span>{{ 'file.text.filename' | translate }}</span>
-      <span>{{ 'file.text.filesize' | translate }}</span>
-      <span>{{ 'file.text.actions' | translate }}</span>
+        <span>{{ 'file.text.filename' | translate }}</span>
+        <span>{{ 'file.text.filesize' | translate }}</span>
+        <span>{{ 'file.text.actions' | translate }}</span>
       </div>
       <div class="file-list-row" *ngFor="let file of unitForm.controls.files.controls;">
         <span class="filename">{{file.value.name}}</span>
@@ -13,7 +12,7 @@ <h3 *ngSwitchDefault>{{ 'unit.addFiles' | translate}}</h3>
         <mat-action-row>
           <button mat-raised-button color="warn" (click)="removeFile(file)">
             <mat-icon>delete</mat-icon>
-          {{ 'common.delete' | translate }}
+            {{ 'common.delete' | translate }}
           </button>
         </mat-action-row>
       </div>
diff --git a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
index 5491c39cf..521a5589c 100644
--- a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
@@ -4,26 +4,24 @@
 <mat-hint *ngIf="unitFormService.unitInfoText as unitInfoText">
   <span>{{unitInfoText}}</span>
 </mat-hint>
-
 <ng-container  [formGroup]="unitForm">
 <mat-form-field >
-    <input matInput required formControlName="name" [placeholder]="'common.name'| translate">
+  <input matInput required formControlName="name" [placeholder]="'common.name'| translate">
 </mat-form-field>
-
 <mat-form-field >
-    <textarea matInput formControlName="description" [placeholder]="'common.description' | translate" rows="4"></textarea>
+  <textarea matInput formControlName="description" [placeholder]="'common.description' | translate"  rows="4"></textarea>
 </mat-form-field>
 
 <mat-form-field *ngIf="model?.progressable">
-    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" [placeholder]="'unit.placeholder.optionalDeadline' | translate">
+  <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="Optional deadline">
   <mat-datepicker-toggle matSuffix [for]="deadlineDatepicker"></mat-datepicker-toggle>
   <mat-datepicker #deadlineDatepicker (selectedChanged)="updateDateTime($event)"></mat-datepicker>
 </mat-form-field>
-
 <div>
   <mat-slide-toggle formControlName="visible">
-      <span *ngIf="form.value.visible">{{ 'unit.text.canBeSeenByStudents' | translate }}</span>
-      <span *ngIf="!form.value.visible">{{ 'unit.text.canNotBeSeenByStudents' | translate }}s</span>
+    <span *ngIf="form.value.visible">{{ 'unit.text.canBeSeenByStudents' | translate }}</span>
+    <span *ngIf="!form.value.visible">{{ 'unit.text.canNotBeSeenByStudents' | translate }}</span>
   </mat-slide-toggle>
-</div>
+  </div>
 </ng-container>
+

From 76321448ee182e2e539539dd125335a4428d64c5 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 22 May 2018 22:12:28 +0200
Subject: [PATCH 27/32] solve automerge problem

---
 .../unit-general-info-form.component.html     | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
index 521a5589c..c26f931c9 100644
--- a/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.html
@@ -1,27 +1,22 @@
-<div *ngIf="unitFormService.headline as headline">
-  <strong>{{headline}}</strong>
-</div>
-<mat-hint *ngIf="unitFormService.unitInfoText as unitInfoText">
-  <span>{{unitInfoText}}</span>
-</mat-hint>
 <ng-container  [formGroup]="unitForm">
-<mat-form-field >
-  <input matInput required formControlName="name" [placeholder]="'common.name'| translate">
-</mat-form-field>
-<mat-form-field >
-  <textarea matInput formControlName="description" [placeholder]="'common.description' | translate"  rows="4"></textarea>
-</mat-form-field>
+  <mat-form-field >
+    <input matInput required formControlName="name" [placeholder]="'common.name'| translate">
+  </mat-form-field>
 
-<mat-form-field *ngIf="model?.progressable">
-  <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="Optional deadline">
-  <mat-datepicker-toggle matSuffix [for]="deadlineDatepicker"></mat-datepicker-toggle>
-  <mat-datepicker #deadlineDatepicker (selectedChanged)="updateDateTime($event)"></mat-datepicker>
-</mat-form-field>
-<div>
-  <mat-slide-toggle formControlName="visible">
-    <span *ngIf="form.value.visible">{{ 'unit.text.canBeSeenByStudents' | translate }}</span>
-    <span *ngIf="!form.value.visible">{{ 'unit.text.canNotBeSeenByStudents' | translate }}</span>
-  </mat-slide-toggle>
+  <mat-form-field >
+    <textarea matInput formControlName="description" [placeholder]="'common.description'| translate" rows="4"></textarea>
+  </mat-form-field>
+
+  <mat-form-field *ngIf="model?.progressable">
+    <input matInput formControlName="deadline" [matDatepicker]="deadlineDatepicker" placeholder="Optional deadline">
+    <mat-datepicker-toggle matSuffix [for]="deadlineDatepicker"></mat-datepicker-toggle>
+    <mat-datepicker #deadlineDatepicker (selectedChanged)="updateDateTime($event)"></mat-datepicker>
+  </mat-form-field>
+
+  <div>
+    <mat-slide-toggle formControlName="visible">
+      <span *ngIf="unitForm.value.visible">{{ 'unit.text.canBeSeenByStudents' | translate }}</span>
+      <span *ngIf="!unitForm.value.visible">{{ 'unit.text.canNotBeSeenByStudents' | translate }}</span>
+    </mat-slide-toggle>
   </div>
 </ng-container>
-

From 6b48ef17659dcb4600fbc0df4c8d97eef690e8e3 Mon Sep 17 00:00:00 2001
From: Max <max.leppla@gmx.de>
Date: Tue, 22 May 2018 22:31:40 +0200
Subject: [PATCH 28/32] merging bugfix

---
 .../task-unit-edit.component.html             | 45 ++++++++++---------
 app/webFrontend/src/assets/i18n/de.json       |  1 +
 app/webFrontend/src/assets/i18n/en.json       |  3 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
index 8813542ed..2dc23fec0 100644
--- a/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
+++ b/app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html
@@ -1,32 +1,33 @@
 <ng-container [formGroup]="unitForm">
   <div class="task-unit-edit" formArrayName="tasks">
-  <div *ngFor="let task of formTasks.controls" class="question-answer">
-    <mat-form-field matLine class="question">
-      <textarea matInput id="name" [placeholder]="'unit.placeholder.enterQuestion' | translate" [(ngModel)]="task.name"></textarea>
-    </mat-form-field>
+    <div *ngFor="let task of formTasks.controls" class="question-answer">
+      <mat-form-field matLine class="question">
+        <textarea matInput id="name" [placeholder]="'unit.placeholder.enterQuestion' | translate" [formControl]="task.controls.name"></textarea>
+      </mat-form-field>
 
-    <button mat-button class="remove" type="button" (click)="removeTask(task)">
-      <mat-icon>delete</mat-icon>
-    </button>
+      <button mat-button class="remove" type="button" [matTooltip]="'unit.tooltip.deleteQuestion' | translate" (click)="removeTask(task)">
+        <mat-icon>delete</mat-icon>
+      </button>
 
-    <div matLine class="answers">
-      <div class="answer" *ngFor="let answer of task.controls.answers.controls; let idx = index;">
-        <div class="check-answer">
-          <mat-checkbox [formControl]="answer.controls.value" name="value_{{idx}}"></mat-checkbox>
-          <mat-form-field>
-            <input matInput [placeholder]="'unit.placeholder.enterAnswer' | translate" [(ngModel)]="answer.text">
-          </mat-form-field>
-          <button mat-button class="remove" (click)="removeAnswer(task, idx)" [matTooltip]="'task.tooltip.deleteAnswer' | translate">
-            <mat-icon>delete</mat-icon>
+      <div matLine class="answers">
+        <div class="answer" *ngFor="let answer of task.controls.answers.controls; let idx = index;">
+          <div class="check-answer">
+            <mat-checkbox [formControl]="answer.controls.value" name="value_{{idx}}"></mat-checkbox>
+            <mat-form-field>
+              <input matInput  [placeholder]="'unit.placeholder.enterAnswer' | translate" [formControl]="answer.controls.text">
+            </mat-form-field>
+            <button mat-button type="button" class="remove" (click)="removeAnswer(task, idx)" [matTooltip]="'unit.tooltip.deleteAnswer' | translate">
+              <mat-icon>delete</mat-icon>
+            </button>
+          </div>
+        </div>
+        <div class="add-answer">
+          <button mat-button type="button" (click)="addAnswerAtEnd(task)">
+            <mat-icon>add</mat-icon> {{ 'unit.text.addAnswer' | translate }}
           </button>
         </div>
       </div>
-      <div class="add-answer">
-        <button mat-button type="button" (click)="addAnswerAtEnd(task)">
-          <mat-icon>add</mat-icon> {{ 'unit.text.addAnswer' | translate }}
-        </button>
-      </div>
     </div>
   </div>
-</div>
 </ng-container>
+
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 79a452cd1..7fd9e9fd7 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -287,6 +287,7 @@
       "delete": "Einheit löschen",
       "deleteAnswer": "Antwort löschen",
       "deleteQuestion": "Frage löschen",
+      "deleteTask" : "Aufgabe löschen",
       "download": "Diese Einheit downloaden",
       "downloadUnits": "Einheiten downloaden",
       "duplicate": "Diese Einheit kopieren",
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 82498878b..2cb258957 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -73,7 +73,7 @@
     "dismiss": "Dismiss",
     "download": "Download",
     "duplicate": "Duplicate",
-    "edit": "Ddit",
+    "edit": "Edit",
     "editProfile": "Edit profile",
     "email": "Email",
     "export": "Export",
@@ -287,6 +287,7 @@
       "delete": "delete unit",
       "deleteAnswer": "Delete answer",
       "deleteQuestion": "Delete question",
+      "deleteTask" : "Delete Task",
       "download": "Download this unit",
       "downloadUnits": "Download units",
       "duplicate": "Copy this unit",

From 7c813621c36f07b5cedd6da79274c79b4b0158cf Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick@r-skowronek.de>
Date: Wed, 23 May 2018 22:20:26 +0200
Subject: [PATCH 29/32] Fixed missing reset from merge

---
 .../button-save-cancel/button-save-cancel.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html b/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html
index 10194a17a..cd36025cf 100644
--- a/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html
+++ b/app/webFrontend/src/app/shared/components/button-save-cancel/button-save-cancel.component.html
@@ -1,7 +1,7 @@
 <ng-container>
   <ng-content select="[left]"></ng-content>
 <button mat-raised-button color="primary" class="add-unit" (click)="emitSave()" type="submit">{{ 'common.save' | translate }}</button>
-<button mat-raised-button color="secondary" (click)="emitCancel()">{{ 'common.cancel' | translate }}</button>
+<button mat-raised-button color="secondary" type="reset" (click)="emitCancel()">{{ 'common.cancel' | translate }}</button>
 <ng-content select="[right]"></ng-content>
 </ng-container>
 <!--Example to add content before/after:

From 65b9f475203de3b6e276f84901b782658508369c Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick@r-skowronek.de>
Date: Wed, 23 May 2018 22:25:03 +0200
Subject: [PATCH 30/32] Some small changes

---
 .../lecture-edit/lecture-edit.component.html           | 10 +++++-----
 .../expandable-div/expandable-div.component.html       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
index e7d4224f0..461345e7e 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
@@ -2,7 +2,7 @@
   <div class="lecture-header">
     <mat-icon class="lecture-drag-handle">drag_handle</mat-icon>
     <h2>{{lecture.name}}</h2>
-    <button class="open-toggle" [matTooltip]="'common.tooltip.clickToOpen' | translate" (click)="toggleLecture()"
+    <button class="open-toggle" (click)="toggleLecture()"
             [class.opened]="isOpened()" mat-icon-button>
       <mat-icon>arrow_drop_down</mat-icon>
     </button>
@@ -14,19 +14,19 @@ <h2>{{lecture.name}}</h2>
     </button>
 
     <mat-menu #lectureMenu="matMenu">
-      <button mat-menu-item [matTooltip]="'lecture.tooltipEdit' | translate" (click)="onEditLecture(lecture)">
+      <button mat-menu-item (click)="onEditLecture(lecture)">
         <mat-icon>edit</mat-icon>
         {{ 'common.edit' | translate }}
       </button>
-      <button mat-menu-item [matTooltip]="'lecture.tooltipDownloadLecture' | translate"  (click)="exportLecture(lecture)">
+      <button mat-menu-item (click)="exportLecture(lecture)">
         <mat-icon>file_download</mat-icon>
         {{ 'common.export' | translate }}
       </button>
-      <button mat-menu-item [matTooltip]="'lecture.tooltipDuplicate' | translate" (click)="duplicateLecture(lecture)">
+      <button mat-menu-item (click)="duplicateLecture(lecture)">
         <mat-icon>content_copy</mat-icon>
         {{ 'common.duplicate' | translate }}
       </button>
-      <button mat-menu-item [matTooltip]="'lecture.tooltipDelete' | translate" (click)="deleteLecture(lecture)">
+      <button mat-menu-item (click)="deleteLecture(lecture)">
         <mat-icon>delete</mat-icon>
         {{ 'common.delete' | translate }}
       </button>
diff --git a/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html b/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html
index c48cc7109..84b7a0d03 100644
--- a/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html
+++ b/app/webFrontend/src/app/shared/components/expandable-div/expandable-div.component.html
@@ -1,6 +1,6 @@
 <ng-template #innerContent>
   {{title}}
-  <button class="open-toggle" [matTooltip]="'common.tooltip.clickToOpen' | translate" [class.opened]="opened" mat-icon-button >
+  <button class="open-toggle" [class.opened]="opened" mat-icon-button >
     <mat-icon class="arrow">
       arrow_drop_down
     </mat-icon>

From d5baa6004f783e46bd5bcba023e1dd1097236dc0 Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick@r-skowronek.de>
Date: Wed, 23 May 2018 23:13:21 +0200
Subject: [PATCH 31/32] Some more changes

---
 .../lecture-edit/lecture-edit.component.html      |  4 ++--
 .../course-media/course-media.component.html      |  2 +-
 .../general-tab/general-tab.component.html        |  2 +-
 .../course/course-new/course-new.component.html   |  2 +-
 .../src/app/course/course.component.html          |  2 +-
 .../lecture-form/lecture-form.component.html      |  2 +-
 .../code-kata-unit/code-kata-unit.component.html  |  4 ++--
 .../app/user/user-edit/user-edit.component.html   |  2 +-
 app/webFrontend/src/assets/i18n/de.json           | 15 +++++++++++++--
 app/webFrontend/src/assets/i18n/en.json           | 11 +++++++++++
 10 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
index 461345e7e..7ccc32e1f 100644
--- a/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-manage-content/lecture-edit/lecture-edit.component.html
@@ -47,7 +47,7 @@ <h2>{{lecture.name}}</h2>
           <span class="unit-type">{{ unit.__t }}</span>
           <span class="unit-date">{{ unit.updatedAt | date:"y-MM-dd" }}</span>
           <span class="unit-actions">
-              <button mat-icon-button [matTooltip]="'common.edit' | translate" (click)="onEditUnit(unit)">
+              <button mat-icon-button (click)="onEditUnit(unit)">
                 <mat-icon>edit</mat-icon>
               </button>
               <button class="unit-menu-button" mat-icon-button [matMenuTriggerFor]="unitMenu">
@@ -77,7 +77,7 @@ <h2>{{lecture.name}}</h2>
         </app-unit-form>
       </div>
 
-      <p *ngIf="!lecture.units.length">No units added yet.</p>
+      <p *ngIf="!lecture.units.length">{{ 'lecture.noUnits' | translate}}</p>
     </div>
 
     <app-unit-form *ngIf="getDataForKey('unit-create-mode') && getDataForKey('unit-create-type')"
diff --git a/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html b/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
index c479d535d..57cb40849 100644
--- a/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
+++ b/app/webFrontend/src/app/course/course-edit/course-media/course-media.component.html
@@ -36,7 +36,7 @@
         <!--<mat-icon>select_all</mat-icon>-->
         <!--</button>-->
         <button [disabled]="selectedFiles.length <= 1"
-                class="text-fit" mat-raised-button matTooltip="Remove file"
+                class="text-fit" mat-raised-button [matTooltip]="'file.text.fileRemove' | translate"
                 color="warn"
                 (click)="removeSelectedFile()">
           <mat-icon>delete</mat-icon>
diff --git a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
index 1e032be7a..3ad88fa10 100644
--- a/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
+++ b/app/webFrontend/src/app/course/course-edit/general-tab/general-tab.component.html
@@ -11,7 +11,7 @@
 
   <mat-form-field class="full-width">
     <mat-select name="courseTypes" [placeholder]="'course.text.selectAccessType' | translate" id="courseTypes" [(ngModel)]="enrollType">
-      <mat-option *ngFor="let enrollType of enrollTypes" [value]="enrollType">{{enrollType}}</mat-option>
+      <mat-option *ngFor="let enrollType of enrollTypes" [value]="enrollType">{{'course.text.selectAccessTypes.' + enrollType | translate}}</mat-option>
     </mat-select><br>
   </mat-form-field>
 
diff --git a/app/webFrontend/src/app/course/course-new/course-new.component.html b/app/webFrontend/src/app/course/course-new/course-new.component.html
index aabc7bef5..56038ecdf 100644
--- a/app/webFrontend/src/app/course/course-new/course-new.component.html
+++ b/app/webFrontend/src/app/course/course-new/course-new.component.html
@@ -13,7 +13,7 @@ <h1>{{ 'dashboard.addCourse' | translate }}</h1>
         <textarea matInput formControlName="description" [placeholder]="'course.placeholder.description' | translate"></textarea>
       </mat-form-field>
       <br/>
-      <button mat-raised-button color="primary" [matTooltip]="'course.tooltip,Add' | translate" class="mat-button" type="submit">{{ 'dashboard.addCourse' | translate }}</button>
+      <button mat-raised-button color="primary" class="mat-button" type="submit">{{ 'dashboard.addCourse' | translate }}</button>
     </form>
   </mat-card>
 </div>
diff --git a/app/webFrontend/src/app/course/course.component.html b/app/webFrontend/src/app/course/course.component.html
index 753bd2ad3..6c2e996ae 100644
--- a/app/webFrontend/src/app/course/course.component.html
+++ b/app/webFrontend/src/app/course/course.component.html
@@ -41,7 +41,7 @@
     </button>
     </span>
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
-            color="primary" [matTooltip]="'common.open' | translate" class="details-button" [routerLink]="['course', course._id]">
+            color="primary" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>
     </button>
 
diff --git a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
index 651a8dd6c..3662f0ced 100644
--- a/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
+++ b/app/webFrontend/src/app/lecture/lecture-form/lecture-form.component.html
@@ -7,7 +7,7 @@
     <textarea matInput formControlName="description" [placeholder]="'common.description' | translate"></textarea>
   </mat-form-field>
   <p>
-    <button mat-raised-button [disabled]="!lectureForm.valid" color="primary" type="submit">{{ actionLabel }}</button>
+    <button mat-raised-button [disabled]="!lectureForm.valid" color="primary" type="submit">{{ 'lecture.action.' + actionLabel | translate }}</button>
     <button mat-raised-button (click)="onCancel()">{{ 'common.cancel' | translate }}</button>
   </p>
 </form>
diff --git a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
index ea892791e..8cfe427f7 100644
--- a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
+++ b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
@@ -18,7 +18,7 @@
               [durationBeforeCallback]="333"
               (textChanged)="onUserInput()">
   </ace-editor>
-  <div>{{ code-kata.text.testsNeedToSuccees | translate }}:</div>
+  <div>{{ 'code-kata.text.testsNeedToSuccees' | translate }}:</div>
   <ace-editor
     #testEditor
     [(text)]="codeKataUnit.test"
@@ -29,7 +29,7 @@
 
   <div *ngIf="!isExampleCode">
     <button mat-raised-button (click)="validate()">{{ 'common.validate' | translate }}</button>
-    <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">{{ common.submit | translate }}</button>
+    <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">{{ 'common.submit' | translate }}</button>
   </div>
   <div *ngIf="logs!==undefined" class="logs-title">
     Logs:
diff --git a/app/webFrontend/src/app/user/user-edit/user-edit.component.html b/app/webFrontend/src/app/user/user-edit/user-edit.component.html
index e17767323..8ca6c0693 100644
--- a/app/webFrontend/src/app/user/user-edit/user-edit.component.html
+++ b/app/webFrontend/src/app/user/user-edit/user-edit.component.html
@@ -25,7 +25,7 @@ <h1>{{ 'common.editProfile' | translate }}</h1>
     </mat-form-field>
 
     <mat-form-field class="full-width">
-      <input matInput formControlName="lastName" placeholder="Last name" maxlength="64"/>
+      <input matInput formControlName="lastName" [placeholder]="'common.profileDetails.lastName' | translate" maxlength="64"/>
       <div *ngIf="userForm.get('profile').get('lastName').touched">
         <small *ngIf="userForm.get('profile').get('lastName').hasError('required')"
                class="text-danger">
diff --git a/app/webFrontend/src/assets/i18n/de.json b/app/webFrontend/src/assets/i18n/de.json
index 7fd9e9fd7..9c414afa6 100644
--- a/app/webFrontend/src/assets/i18n/de.json
+++ b/app/webFrontend/src/assets/i18n/de.json
@@ -38,7 +38,7 @@
       "reset": "Zurücksetzen"
     },
     "tooltip": {
-      "currentPassword": "Current password",
+      "currentPassword": "Aktuelles Passwort",
       "ForgotPassword": "Klicken Sie hier, um ein neues Passwort anzufordern.",
       "ResetPassword": "Klicken Sie hier, um das Passwort zurückzusetzen."
     }
@@ -158,6 +158,11 @@
       "overview": "Übersicht",
       "reportFor": "Ergebnis für",
       "selectAccessType": "Bitte wählen Sie Ihren Kurstyp aus.",
+      "selectAccessTypes": {
+        "free": "Frei",
+        "accesskey": "Einschreibeschlüssel",
+        "whitelist": "Whitelist"
+      },
       "uploadWhitelist": "Laden Sie Ihre OBS-csv-Datei mit Ihren Kursteilnehmern hoch, um sie auf die Freigabeliste zu setzen.<br />Alte Freigabelisten-Benutzer werden durch Hochladen einer neuen Datei entfernt.",
       "userResults": "Benutzerergebnisse",
       "yourCourseProgress": "Ihr Kursfortschritt",
@@ -200,6 +205,7 @@
       "filename": "Dateiname",
       "filesize": "Dateigröße",
       "filesSelected" : "Dateien ausgewählt",
+      "fileRemove": "Datei löschen",
       "infoDropAddFiles": "Dateien hier hinziehen oder hier klicken, um Dateien auszuwählen.",
       "noVideo": "Kein Video verfügbar.",
       "noFiles" : "Keine Dateien vorhanden",
@@ -216,6 +222,7 @@
     "welcomeTo": "Willkommen auf"
   },
   "lecture": {
+    "noUnits": "Keine Unterkapitel angelegt!",
     "text":{
       "add": "Kapitel hinzufügen",
       "import": "Kapitel importieren",
@@ -227,6 +234,10 @@
       "download": "Einheit downloaden",
       "duplicate": "Kapitel kopieren",
       "edit": "Einheit bearbeiten"
+    },
+    "action": {
+      "Add": "Hinzufügen",
+      "Update": "Aktualisieren"
     }
   },
   "mail":{
@@ -239,7 +250,7 @@
     "about": "Über geli",
     "admin": "Admin",
     "imprint": "Impressum",
-    "logout": "Logout",
+    "logout": "Ausloggen",
     "userSettings": "Einstellungen"
   },
   "notifications": {
diff --git a/app/webFrontend/src/assets/i18n/en.json b/app/webFrontend/src/assets/i18n/en.json
index 2cb258957..d5b0c164d 100644
--- a/app/webFrontend/src/assets/i18n/en.json
+++ b/app/webFrontend/src/assets/i18n/en.json
@@ -158,6 +158,11 @@
       "overview": "Overview",
       "reportFor": "Report for",
       "selectAccessType": "Please select your course access type.",
+      "selectAccessTypes": {
+        "free": "Free",
+        "accesskey": "Accesskey",
+        "whitelist": "Whitelist"
+      },
       "uploadWhitelist": "Upload your OBS csv file with your course members for whitelisting students.<br />Old whitelist users are removed by uploading a new file.",
       "userResults": "User results",
       "yourCourseProgress": "Your course progress",
@@ -199,6 +204,7 @@
       "addFile": "Add file",
       "filename": "File name",
       "filesize": "File size",
+      "fileRemove": "Remove File",
       "filesSelected" : "File selected",
       "infoDropAddFiles": "Drop files here or click here to select files.",
       "noVideo": "No video available.",
@@ -216,6 +222,7 @@
     "welcomeTo": "Welcome to"
   },
   "lecture": {
+    "noUnits": "No units added yet.",
     "text":{
       "add": "Add lecture",
       "import": "Import lecture",
@@ -227,6 +234,10 @@
       "download": "Download this unit",
       "duplicate": "Copy this lecture",
       "edit": "Edit this unit"
+    },
+    "action": {
+      "Add": "Add",
+      "Update": "Update"
     }
   },
   "mail":{

From 66a22bd5fa0dd1b3b13f5341773f3e739be82555 Mon Sep 17 00:00:00 2001
From: PatrickSkowronek <patrick.skowronek@stud.h-da.de>
Date: Thu, 24 May 2018 12:04:34 +0200
Subject: [PATCH 32/32] Fixed code-kata

---
 .../unit/code-kata-unit/code-kata-unit.component.html  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
index 8cfe427f7..316db517a 100644
--- a/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
+++ b/app/webFrontend/src/app/unit/code-kata-unit/code-kata-unit.component.html
@@ -7,8 +7,8 @@
     [theme]="'github'"
     [readOnly]="true">
   </ace-editor>
-  <div *ngIf="!isExampleCode">{{ code-kata.text.codeHere | translate }}:</div>
-  <div *ngIf="isExampleCode">{{ code-kata.text.codeExample | translate }}:</div>
+  <div *ngIf="!isExampleCode">Your code goes here:</div>
+  <div *ngIf="isExampleCode">This is the provided example solution:</div>
   <ace-editor class="user-code-editor"
               #codeEditor
               [(text)]="codeKataUnit.code || progress.code"
@@ -18,7 +18,7 @@
               [durationBeforeCallback]="333"
               (textChanged)="onUserInput()">
   </ace-editor>
-  <div>{{ 'code-kata.text.testsNeedToSuccees' | translate }}:</div>
+  <div>These tests need to success:</div>
   <ace-editor
     #testEditor
     [(text)]="codeKataUnit.test"
@@ -28,8 +28,8 @@
   </ace-editor>
 
   <div *ngIf="!isExampleCode">
-    <button mat-raised-button (click)="validate()">{{ 'common.validate' | translate }}</button>
-    <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">{{ 'common.submit' | translate }}</button>
+    <button mat-raised-button (click)="validate()">Validate</button>
+    <button mat-raised-button color="primary" class="submit-progress" (click)="submitProgress()">Submit</button>
   </div>
   <div *ngIf="logs!==undefined" class="logs-title">
     Logs: