Merge branch 'develop' into feature/refactor

Author: Allan Asp Christensen

src/app/admin/users/user-list/user-table/user-table.component.html

@@ -6,7 +6,7 @@
                 <th scope="col">{{ 'USERS.EMAIL' | translate }}</th>
                 <th scope="col">{{ 'USERS.GLOBALADMIN' | translate }}</th>
                 <th scope="col">{{ 'USERS.STATUS' | translate }}</th>
-                <th scope="col">{{ 'USERS.EMAIL' | translate }}</th>
+                <th scope="col">{{ 'USERS.LOGIN' | translate }}</th>
                 <th scope="col"></th>
             </tr>
         </thead>

src/assets/i18n/da.json

@@ -419,6 +419,7 @@
     "LASTLOG": "Sidste Login",
     "EDIT": "Redigér User",
     "CREATE": "Opret ny burger",
+    "LOGIN": "Sidst aktiv",
     "TABLE-ROW": {
       "EDIT": "Redigér",
       "DELETE": "Slet"
@@ -430,7 +431,7 @@
       "EMAIL-PLACEHOLDER": "Email",
       "PASSWORD": "Password",
       "PASSWORD-PLACEHOLDER": "Indtast eller redigér password",
-      "ACTIVE": "Skal brugeren aktiveres eller deaktiveres?",
+      "ACTIVE": "Aktiveret",
       "GLOBAL-ADMIN": "Skal den nye bruger være global administrator?",
       "SAVE": "Gem Bruger"
     },