update german translation

2 files changed, 797 insertions, 742 deletions

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 3af2ad49..4625691a 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 090dd6f9..f429bef0 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2016-09-27 18:05+0100\n"
-"PO-Revision-Date: 2016-09-27 18:08+0100\n"
+"POT-Creation-Date: 2016-09-29 15:50+0100\n"
+"PO-Revision-Date: 2016-09-29 15:52+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
 "X-Poedit-SearchPath-1: .\n"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:56
 msgid ""
 "Please enter your planned date of departure on your settings page to give us "
 "a feeling for teardown capacities."
@@ -25,7 +25,7 @@ msgstr ""
 "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
 "Planung bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:65
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -34,7 +34,7 @@ msgstr ""
 "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
 "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:72
 msgid ""
 "You are not marked as arrived. Please go to heaven's desk, get your angel "
 "badge and/or tell them that you arrived already."
@@ -42,11 +42,11 @@ msgstr ""
 "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
 "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:78
 msgid "You need to specify a tshirt size in your settings!"
 msgstr "Bitte eine T-Shirt-Größe auswählen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:84
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter \"-\"."
@@ -54,100 +54,101 @@ msgstr ""
 "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
 "keine Nummer hast, bitte einfach \"-\" angeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:155
 msgid "Admin"
 msgstr "Admin"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:362
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:358
 msgid "No data found."
 msgstr "Nichts gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:819
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:885
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:259
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:327
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:213
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:257
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
 msgid "Teams/Job description"
 msgstr "Team-/Aufgabenbeschreibung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:88
 #, php-format
 msgid "Angeltype %s deleted."
 msgstr "Engeltyp %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41
 #, php-format
 msgid "Delete angeltype %s"
 msgstr "Lösche Engeltyp %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:143
 msgid "Please check the name. Maybe it already exists."
 msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:163
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:51
 #, php-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:199
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:220
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:208
 #, php-format
 msgid "Team %s"
 msgstr "Team %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212
 msgid "view"
 msgstr "ansehen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:223
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:16
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270
 msgid "edit"
 msgstr "bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:224
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:247
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:61
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:218
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:48
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:67
 msgid "delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:252
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:87
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:252
 msgid "leave"
 msgstr "verlassen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:231
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:254
 msgid "join"
 msgstr "mitmachen"
 
@@ -155,41 +156,40 @@ msgstr "mitmachen"
 msgid "Event config"
 msgstr "Event Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:51
 msgid "Please enter buildup start date."
 msgstr "Bitte gib das Aufbau Start Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:55
 msgid "Please enter event start date."
 msgstr "Bitte gib das Event Start Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:59
 msgid "Please enter event end date."
 msgstr "Bitte gib das Event Ende Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:63
 msgid "Please enter teardown end date."
 msgstr "Bitte gib das Abbau Ende Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:69
 msgid "The buildup start date has to be before the event start date."
 msgstr "Das Aufbau Start Datum muss vor dem Event Start Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:68
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:74
 msgid "The event start date has to be before the event end date."
 msgstr "Das Event Start Datum muss vor dem Event End Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:79
 msgid "The event end date has to be before the teardown end date."
 msgstr "Das Event Ende Datum muss vor dem Abbau Ende Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:84
 msgid "The buildup start date has to be before the teardown end date."
 msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
@@ -197,194 +197,194 @@ msgstr "Einstellungen gespeichert."
 msgid "Shift could not be found."
 msgstr "Schicht konnte nicht gefunden werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:31
 #, php-format
 msgid "Shifttype %s deleted."
 msgstr "Schichttyp %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:30
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:12
 #, php-format
 msgid "Delete shifttype %s"
 msgstr "Lösche Schichttyp %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:61
 msgid "Shifttype not found."
 msgstr "Schichttyp nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:67
 msgid "Please enter a name."
 msgstr "Gib bitte einen Namen an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:97
 msgid "Updated shifttype."
 msgstr "Schichttyp geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:104
 msgid "Created shifttype."
 msgstr "Schichttyp erstellt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:161
 msgid "Shifttypes"
 msgstr "Schichttypen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:22
 #, php-format
 msgid "There is %d unconfirmed angeltype."
 msgid_plural "There are %d unconfirmed angeltypes."
 msgstr[0] "Es gibt %d nicht freigeschalteten Engeltypen!"
 msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:22
 msgid "Angel types which need approvals:"
 msgstr "Engeltypen die bestätigt werden müssen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:133
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:259
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:296
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:304
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:203
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:325
 msgid "Angeltype doesn't exist."
 msgstr "Engeltyp existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:46
 msgid "You are not allowed to delete all users for this angeltype."
 msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:57
 #, php-format
 msgid "Denied all users for angeltype %s."
 msgstr "Alle Benutzer mit Engeltyp %s abgelehnt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:14
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:15
 msgid "Deny all users"
 msgstr "Alle Benutzer ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:92
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:125
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:236
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:268
 msgid "User angeltype doesn't exist."
 msgstr "Benutzer-Engeltype existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:97
 msgid "You are not allowed to confirm all users for this angeltype."
 msgstr "Du darfst nicht alle Benutzer für diesen Engeltyp freischalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:108
 #, php-format
 msgid "Confirmed all users for angeltype %s."
 msgstr "Alle Benutzer für Engeltyp %s freigeschaltet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:26
 msgid "Confirm all users"
 msgstr "Alle Benutzer bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:148
 msgid "You are not allowed to confirm this users angeltype."
 msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:197
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:286
 msgid "User doesn't exist."
 msgstr "Benutzer existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:168
 #, php-format
 msgid "%s confirmed for angeltype %s."
 msgstr "%s für Engeltyp %s freigeschaltet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:161
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:37
 msgid "Confirm angeltype for user"
 msgstr "Engeltyp für Benutzer bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:217
 msgid "You are not allowed to delete this users angeltype."
 msgstr "Du darfst diesen Benutzer nicht von diesem Engeltyp entfernen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:227
 #, php-format
 msgid "User %s removed from %s."
 msgstr "Benutzer %s von %s entfernt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:219
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:48
 msgid "Remove angeltype"
 msgstr "Engeltyp löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:247
 msgid "You are not allowed to set coordinator rights."
 msgstr "Du darfst keine Koordinatorrechte bearbeiten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:259
 msgid "No coordinator update given."
 msgstr "Kein Update für Koordinationsrechte gegeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:296
 #, php-format
 msgid "Added coordinator rights for %s to %s."
 msgstr "%s hat %s als Koordinator bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:296
 #, php-format
 msgid "Removed coordinator rights for %s from %s."
 msgstr "%s hat jetzt nicht mehr %s als Koordinator."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:284
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:304
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4
 msgid "Add coordinator rights"
 msgstr "Koordinatorrechte geben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:284
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:304
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4
 msgid "Remove coordinator rights"
 msgstr "Koordinatorrechte entfernen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:347
 msgid "Please select a user."
 msgstr "Bitte einen Benutzer auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:359
 #, php-format
 msgid "User %s added to %s."
 msgstr "Benutzer %s zu %s hinzugefügt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:349
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:374
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:64
 msgid "Add user to angeltype"
 msgstr "Benutzer zu Engeltyp hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:358
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:384
 #, php-format
 msgid "You are already a %s."
 msgstr "Du bist bereits %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:367
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:394
 #, php-format
 msgid "You joined %s."
 msgstr "Du bist %s beigetreten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:382
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:410
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:78
 #, php-format
 msgid "Become a %s"
 msgstr "Werde ein %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:27
 #, php-format
 msgid ""
 "You joined an angeltype which requires a driving license. Please edit your "
@@ -393,132 +393,132 @@ msgstr ""
 "Du bist einem Engeltypen beigetreten, der Führerschein-Infos benötigt. Bitte "
 "trage Deine Führerschein-Infos hier ein: %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:27
 msgid "driving license information"
 msgstr "Führerschein-Infos"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:123
 msgid "Please select at least one driving license."
 msgstr "Bitte wähle mindestens einen Führerschein-Typen aus."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:133
 msgid "Your driver license information has been removed."
 msgstr "Deine Führerschein-Infos wurden gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:147
 msgid "Your driver license information has been saved."
 msgstr "Deine Führerschein-Infos wurden gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:155
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
 #, php-format
 msgid "Edit %s driving license information"
 msgstr "Bearbeite die Führerschein-Infos von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:50
 msgid "You cannot delete yourself."
 msgstr "Du kannst Dich nicht selber löschen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:297
 msgid "Your password is incorrect.  Please try it again."
 msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:69
 msgid "User deleted."
 msgstr "Engel gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:61
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:118
 msgid "Please enter a valid number of vouchers."
 msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:129
 msgid "Saved the number of vouchers."
 msgstr "Anzahl der Voucher gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
 #, php-format
 msgid "%s's vouchers"
 msgstr "Voucher von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:151
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:115
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:223
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:217
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:130
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128
 msgid "Your password is to short (please use at least 6 characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:243
 msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:132
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:247
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:251
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:265
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:69
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36
 msgid "E-mail address is not correct."
 msgstr "Die E-Mail Adresse ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:255
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:273
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:73
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:40
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:262
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:281
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:299
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:281
 #, php-format
 msgid "Please visit %s to recover your password."
 msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:286
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12
 #, php-format
 msgid "Hi %s,"
 msgstr "Hallo %s,"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12
 msgid "here is a message for you from the engelsystem:"
 msgstr "hier ist eine Nachricht aus dem Engelsystem für Dich:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12
 msgid ""
 "This email is autogenerated and has not to be signed. You got this email "
 "because you are registered in the engelsystem."
@@ -564,27 +564,27 @@ msgstr "Die aktualisierte Schicht:"
 msgid "Your Shift has changed"
 msgstr "Deine Schicht hat sich geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:62
 msgid "A Shift you are registered on was deleted:"
 msgstr "Eine deiner Schichten wurde gelöscht:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:71
 msgid "Your Shift was deleted"
 msgstr "Deine Schicht wurde gelöscht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:80
 msgid "You have been assigned to a Shift:"
 msgstr "Du wurdest in eine Schicht eingetragen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:86
 msgid "Assigned to Shift"
 msgstr "In Schicht eingetragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:94
 msgid "You have been removed from a Shift:"
 msgstr "Du wurdest aus einer Schicht ausgetragen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:100
 msgid "Removed from Shift"
 msgstr "Von Schicht ausgetragen"
 
@@ -604,7 +604,7 @@ msgstr ""
 msgid "Active angels"
 msgstr "Aktive Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:29
 #, php-format
 msgid ""
 "At least %s angels are forced to be active. The number has to be greater."
@@ -612,151 +612,151 @@ msgstr ""
 "Mindestens %s engel werden als aktiv gekennzeichnet. Die Nummer muss größer "
 "sein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:34
 msgid "Please enter a number of angels to be marked as active."
 msgstr ""
 "Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59
 msgid "Marked angels."
 msgstr "Engel wurden markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:127
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:251
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:67
 msgid "back"
 msgstr "zurück"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:61
 msgid "apply"
 msgstr "anwenden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71
 msgid "Angel has been marked as active."
 msgstr "Engel wurde als aktiv markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:22
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:34
 msgid "Angel not found."
 msgstr "Engel nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:81
 msgid "Angel has been marked as not active."
 msgstr "Engel wurde als nicht aktiv markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:91
 msgid "Angel has got a t-shirt."
 msgstr "Engel hat ein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:101
 msgid "Angel has got no t-shirt."
 msgstr "Engel hat kein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:144
 msgid "set active"
 msgstr "setze aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:147
 msgid "remove active"
 msgstr "entferne aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:148
 msgid "got t-shirt"
 msgstr "hat t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:151
 msgid "remove t-shirt"
 msgstr "entferne t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:159
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:155
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:179
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:105
 msgid "Sum"
 msgstr "Summe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
 msgid "Search angel:"
 msgstr "Suche Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178
 msgid "Show all shifts"
 msgstr "Alle Schichten anzeigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:131
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:132
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:26
 msgid "Search"
 msgstr "Suche"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182
 msgid "How much angels should be active?"
 msgstr "Wie viele Engel sollten aktiv sein?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:239
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:342
 msgid "Preview"
 msgstr "Vorschau"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:176
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145
 msgid "Nickname"
 msgstr "Nick"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
 msgid "Size"
 msgstr "Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:281
 msgid "Shifts"
 msgstr "Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:310
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:329
 msgid "Length"
 msgstr "Länge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:191
 msgid "Active?"
 msgstr "Aktiv?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129
 msgid "Forced"
 msgstr "Gezwungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:193
 msgid "T-shirt?"
 msgstr "T-Shirt?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:196
 msgid "Shirt statistics"
 msgstr "T-Shirt Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:199
 msgid "Needed shirts"
 msgstr "Benötigte T-Shirts"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:200
 msgid "Given shirts"
 msgstr "Ausgegebene T-Shirts"
 
@@ -764,245 +764,246 @@ msgstr "Ausgegebene T-Shirts"
 msgid "Arrived angels"
 msgstr "Angekommene Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:20
 msgid "Reset done. Angel has not arrived."
 msgstr "Zurückgesetzt. Engel ist nicht angekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:31
 msgid "Angel has been marked as arrived."
 msgstr "Engel wurde als angekommen markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:41
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:9
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:53
 msgid "yes"
 msgstr "Ja"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:72
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:161
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:176
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:226
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:272
 msgid "arrived"
 msgstr "angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146
 msgid "Planned arrival"
 msgstr "Geplanter Ankunftstag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:147
 msgid "Arrived?"
 msgstr "Angekommen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:148
 msgid "Arrival date"
 msgstr "Ankunftsdatum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:149
 msgid "Planned departure"
 msgstr "Geplante Abreise"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:154
 msgid "Planned arrival statistics"
 msgstr "Geplante Ankunfts-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:187
 msgid "arrived sum"
 msgstr "Summe angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:153
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:168
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:82
 msgid "Date"
 msgstr "Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:154
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:194
 msgid "Count"
 msgstr "Anzahl"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:169
 msgid "Arrival statistics"
 msgstr "Ankunfts-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
 msgid "Planned departure statistics"
 msgstr "Geplante Abreise-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:4
 msgid "Free angels"
 msgstr "Freie Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70
 msgid "Angeltype"
 msgstr "Engeltyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:84
 msgid "Only confirmed"
 msgstr "Nur bestätigte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:312
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:153
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:335
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
 msgid "Nick"
 msgstr "Nick"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:210
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:154
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
 msgid "DECT"
 msgstr "DECT"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:219
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
 msgid "Jabber"
 msgstr "Jabber"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:257
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:303
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:4
 msgid "Grouprights"
 msgstr "Gruppenrechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:145
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:133
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:33
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123
 msgid "Name"
 msgstr "Name"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:30
 msgid "Privileges"
 msgstr "Privilegien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:257
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:196
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:33
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:319
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34
 msgid "Save"
 msgstr "Speichern"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:55
 msgid "Edit group"
 msgstr "Gruppe bearbeiten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:134
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:189
 msgid "Frab import"
 msgstr "Frab Import"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:25
 msgid "Webserver has no write-permission on import directory."
 msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:50
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:59
 msgid "Please select a shift type."
 msgstr "Bitte einen Schichttyp wählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:202
 msgid "Please enter an amount of minutes to add to a talk's begin."
 msgstr ""
 "Bitte gib eine Anzahl Minuten ein, die vor dem Talk-Beginn hinzugefügt "
 "werden sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:209
 msgid "Please enter an amount of minutes to add to a talk's end."
 msgstr ""
 "Bitte gib eine Anzahl Minuten ein, die nach dem Talk-Ende hinzugefügt werden "
 "sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:75
 msgid "No valid xml/xcal file provided."
 msgstr "Keine valide xml/xcal Datei hochgeladen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80
 msgid "File upload went wrong."
 msgstr "Das Hochladen der Datei ist schiefgegangen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:84
 msgid "Please provide some data."
 msgstr "Bitte lade eine Datei hoch."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252
 msgid "File Upload"
 msgstr "Datei hochladen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252
 msgid "Validation"
 msgstr "Überprüfen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252
 msgid "Import"
 msgstr "Importieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
 msgid ""
 "This import will create/update/delete rooms and shifts by given FRAB-export "
 "file. The needed file format is xcal."
@@ -1010,224 +1011,224 @@ msgstr ""
 "Dieser Import erzeugt, ändert und löscht Räume und Schichten anhand einer "
 "FRAB-Export Datei. Das benötigte Format ist xcal."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:94
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:300
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:319
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:194
 msgid "Shifttype"
 msgstr "Schichttyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:98
 msgid "Add minutes to start"
 msgstr "Minuten vor Talk-Beginn hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:99
 msgid "Add minutes to end"
 msgstr "Minuten nach Talk-Ende hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:100
 msgid "xcal-File (.xcal)"
 msgstr "xcal-Datei (.xcal)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:184
 msgid "Missing import file."
 msgstr "Import-Datei nicht vorhanden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143
 msgid "Rooms to create"
 msgstr "Anzulegende Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:147
 msgid "Rooms to delete"
 msgstr "Zu löschende Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:151
 msgid "Shifts to create"
 msgstr "Anzulegende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:150
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:159
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:168
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:283
 msgid "Day"
 msgstr "Tag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:151
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:160
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:305
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:94
 msgid "Start"
 msgstr "Beginn"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:152
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:161
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:102
 msgid "End"
 msgstr "Ende"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:174
 msgid "Shift type"
 msgstr "Schichttyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:154
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:301
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:320
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:90
 msgid "Title"
 msgstr "Titel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:155
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:801
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:866
 msgid "Room"
 msgstr "Raum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:160
 msgid "Shifts to update"
 msgstr "Zu aktualisierende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:169
 msgid "Shifts to delete"
 msgstr "Zu löschende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:253
 msgid "It's done!"
 msgstr "Erledigt!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:4
 msgid "Log"
 msgstr "Log"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:9
 msgid "Edit news entry"
 msgstr "News-Eintrag bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:31
 msgid "Author"
 msgstr "Autor"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:167
 msgid "Subject"
 msgstr "Betreff"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:30
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:168
 msgid "Message"
 msgstr "Nachricht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:169
 msgid "Meeting"
 msgstr "Treffen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:166
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:69
 msgid "Delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:52
 msgid "News entry updated."
 msgstr "News-Eintrag gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:61
 msgid "News entry deleted."
 msgstr "News-Eintrag gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:4
 msgid "Answer questions"
 msgstr "Fragen beantworten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:14
 msgid "There are unanswered questions!"
 msgstr "Es gibt unbeantwortete Fragen!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:66
 msgid "Unanswered questions"
 msgstr "Unbeantwortete Fragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:75
 msgid "From"
 msgstr "Von"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:76
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:19
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:24
 msgid "Question"
 msgstr "Frage"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:78
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:26
 msgid "Answer"
 msgstr "Antwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:73
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:22
 msgid "Answered questions"
 msgstr "Beantwortete Fragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:77
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:25
 msgid "Answered by"
 msgstr "Antwort von"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:814
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:880
 msgid "Rooms"
 msgstr "Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:63
 msgid "This name is already in use."
 msgstr "Dieser Name ist bereits vergeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:93
 #, php-format
 msgid "Please enter needed angels for type %s."
 msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:123
 msgid "Room saved."
 msgstr "Raum gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:190
 msgid "Public"
 msgstr "Öffentlich"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:145
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:150
 msgid "Needed angels:"
 msgstr "Benötigte Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:166
 #, php-format
 msgid "Room %s deleted."
 msgstr "Raum %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174
 #, php-format
 msgid "Do you want to delete room %s?"
 msgstr "Möchest Du den Raum %s wirklich löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:184
 msgid "add"
 msgstr "Neu"
 
@@ -1235,91 +1236,91 @@ msgstr "Neu"
 msgid "Create shifts"
 msgstr "Schichten erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:71
 msgid "Please select a location."
 msgstr "Bitte einen Ort auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:78
 msgid "Please select a start time."
 msgstr "Bitte eine Startzeit auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:85
 msgid "Please select an end time."
 msgstr "Bitte eine Endzeit auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:90
 msgid "The shifts end has to be after its start."
 msgstr "Die Endzeit muss nach der Startzeit liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:102
 msgid "Please enter a shift duration in minutes."
 msgstr "Gib bitte eine Schichtlänge in Minuten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:110
 msgid "Please split the shift-change hours by colons."
 msgstr "Trenne die Schichtwechselstunden mit einem Komma."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:115
 msgid "Please select a mode."
 msgstr "Bitte einen Modus auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:128
 #, php-format
 msgid "Please check the needed angels for team %s."
 msgstr "Bitte gib die Anzahl der benötigten Engel vom Team %s an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:133
 msgid "There are 0 angels needed. Please enter the amounts of needed angels."
 msgstr "Es werden 0 Engel benötigt. Bitte ändere das."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:137
 msgid "Please select a mode for needed angels."
 msgstr "Bitte wähle einen Modus für benötigte Engel."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:141
 msgid "Please select needed angels."
 msgstr "Bitte wähle benötigte Engel."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:253
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:268
 msgid "Time and location"
 msgstr "Zeit und Ort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:269
 msgid "Type and title"
 msgstr "Typ und Titel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:255
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:315
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:334
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:116
 msgid "Needed angels"
 msgstr "Benötigte Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:326
 msgid "Mode"
 msgstr "Modus"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:308
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:327
 msgid "Create one shift"
 msgstr "Eine Schicht erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:328
 msgid "Create multiple shifts"
 msgstr "Mehrere Schichten erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:330
 msgid "Create multiple shifts with variable length"
 msgstr "Erstelle mehrere Schichten mit unterschiedlicher Länge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:331
 msgid "Shift change hours"
 msgstr "Schichtwechsel-Stunden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:335
 msgid "Take needed angels from room settings"
 msgstr "Übernehme benötigte Engel von den Raum-Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:336
 msgid "The following angels are needed"
 msgstr "Die folgenden Engel werden benötigt"
 
@@ -1327,28 +1328,40 @@ msgstr "Die folgenden Engel werden benötigt"
 msgid "All Angels"
 msgstr "Engelliste"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:23
 msgid "This user does not exist."
 msgstr "Benutzer existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:41
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
 msgid "Please send me an email if my shifts change"
 msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+msgid "Yes"
+msgstr "Ja"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+msgid "No"
+msgstr "Nein"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:62
 msgid "Force active"
 msgstr "Aktiv erzwingen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:81
 msgid ""
 "Please visit the angeltypes page or the users profile to manage users "
 "angeltypes."
 msgstr ""
 "Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:207
 msgid "Edit user"
 msgstr "User bearbeiten"
 
@@ -1357,12 +1370,14 @@ msgid "Credits"
 msgstr "Credits"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:314
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:337
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
 msgid "Login"
 msgstr "Login"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:267
 msgid "Register"
 msgstr "Registrieren"
 
@@ -1370,40 +1385,40 @@ msgstr "Registrieren"
 msgid "Logout"
 msgstr "Logout"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:58
 #, php-format
 msgid "Your nick &quot;%s&quot; already exists."
 msgstr "Der Nick &quot;%s&quot; existiert schon."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62
 #, php-format
 msgid "Your nick &quot;%s&quot; is too short (min. 2 characters)."
 msgstr "Der Nick &quot;%s&quot; ist zu kurz (Mindestens 2 Zeichen)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:84
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:49
 msgid "Please check your jabber account information."
 msgstr "Bitte überprüfe deine Jabber Account Eingabe."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
 msgid "Please select your shirt size."
 msgstr "Bitte wähle Deine T-Shirt Größe."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104
 #, php-format
 msgid "Your password is too short (please use at least %s characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:111
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63
 msgid "Please enter your planned date of arrival."
 msgstr "Bitte gib Dein geplantes Ankunftsdatum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
 msgid "Angel registration successful!"
 msgstr "Engel-Registrierung erfolgreich!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:200
 msgid ""
 "By completing this form you're registering as a Chaos-Angel. This script "
 "will create you an account in the angel task sheduler."
@@ -1411,36 +1426,37 @@ msgstr ""
 "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in "
 "der Engel-Aufgabenverwaltung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
 msgid "Planned date of arrival"
 msgstr "Geplanter Ankunftstag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:220
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191
 msgid "Shirt size"
 msgstr "T-Shirt Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:317
 msgid "Password"
 msgstr "Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:228
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:318
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:231
 msgid "What do you want to do?"
 msgstr "Was möchtest Du machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:231
 msgid "Description of job types"
 msgstr "Beschreibung der Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
 msgid ""
 "Restricted angel types need will be confirmed later by an archangel. You can "
 "change your selection in the options section."
@@ -1448,46 +1464,46 @@ msgstr ""
 "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet "
 "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:213
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:186
 msgid "Mobile"
 msgstr "Handy"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:184
 msgid "Phone"
 msgstr "Telefon"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:222
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
 msgid "First name"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:225
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
 msgid "Last name"
 msgstr "Nachname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:230
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:257
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
 msgid "Age"
 msgstr "Alter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:233
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190
 msgid "Hometown"
 msgstr "Wohnort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:236
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:263
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:301
 msgid "Please enter a password."
 msgstr "Gib bitte ein Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:280
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:305
 msgid ""
 "No user was found with that Nickname. Please try again. If you are still "
 "having problems, ask an Dispatcher."
@@ -1495,96 +1511,100 @@ msgstr ""
 "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch "
 "einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:284
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:309
 msgid "Please enter a nickname."
 msgstr "Gib bitte einen Nick an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:297
-msgid "Please sign up, if you want to help us!"
-msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:304
-msgid "Registration is disabled."
-msgstr "Registrierung ist abgeschaltet."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:339
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
 msgid "I forgot my password"
 msgstr "Passwort vergessen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:318
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:341
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
 msgid "Please note: You have to activate cookies!"
 msgstr "Hinweis: Cookies müssen aktiviert sein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:324
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:347
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
 msgid "What can I do?"
 msgstr "Was kann ich machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
 msgid "Please read about the jobs you can do to help us."
 msgstr ""
 "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst."
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:363
+msgid "Please sign up, if you want to help us!"
+msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:370
+msgid "Registration is disabled."
+msgstr "Registrierung ist abgeschaltet."
+
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:4
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:26
 msgid "Select recipient..."
 msgstr "Empfänger auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:17
 msgid "Unable to load user."
 msgstr "Konnte Benutzer nicht laden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:68
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71
 msgid "delete message"
 msgstr "Nachricht löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78
 #, php-format
 msgid "Hello %s, here can you leave messages for other angels"
 msgstr "Hallo %s, hier kannst Du anderen Engeln Nachrichten schreiben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:81
 msgid "New"
 msgstr "Neu"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:83
 msgid "Transmitted"
 msgstr "Gesendet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:84
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:112
 msgid "Incomplete call, missing Message ID."
 msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:120
 msgid "No Message found."
 msgstr "Keine Nachricht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:128
 msgid "Transmitting was terminated with an Error."
 msgstr "Übertragung wurde mit einem Fehler abgebrochen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:133
 msgid "Wrong action."
 msgstr "Falsche Aktion."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:296
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:325
 msgid "My shifts"
 msgstr "Meine Schichten"
 
@@ -1593,7 +1613,7 @@ msgid "Key changed."
 msgstr "Key geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:277
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1614,15 +1634,15 @@ msgstr "Fortfahren"
 msgid "Please enter a freeload comment!"
 msgstr "Gib bitte einen Schwänz-Kommentar ein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:79
 msgid "Shift saved."
 msgstr "Schicht gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:106
 msgid "Shift canceled."
 msgstr "Schichteintrag gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:108
 msgid ""
 "It's too late to sign yourself off the shift. If neccessary, ask the "
 "dispatcher to do so."
@@ -1630,66 +1650,66 @@ msgstr ""
 "Es ist zu spät um Dich aus der Schicht auszutragen. Wenn notwendig, frage "
 "einen Dispatcher dafür."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:4
 msgid "News comments"
 msgstr "News Kommentare"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:7
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:8
 msgid "News"
 msgstr "News"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:12
 msgid "Meetings"
 msgstr "Treffen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:71
 msgid "Comments"
 msgstr "Kommentare"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:133
 msgid "Entry saved."
 msgstr "Eintrag gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:110
 msgid "New Comment:"
 msgstr "Neuer Kommentar:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:116
 msgid "Invalid request."
 msgstr "Ungültige Abfrage."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:164
 msgid "Create news:"
 msgstr "News anlegen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29
 msgid "Ask an archangel"
 msgstr "Frage einen Erzengel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:30
 msgid "Unable to save question."
 msgstr "Konnte Frage nicht speichern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:32
 msgid "You question was saved."
 msgstr "Frage gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:36
 msgid "Please enter a question!"
 msgstr "Gib eine Frage ein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:44
 msgid "Incomplete call, missing Question ID."
 msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:53
 msgid "No question found."
 msgstr "Keine Frage gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:228
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:274
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1697,125 +1717,125 @@ msgstr "Einstellungen"
 msgid "Please enter your planned date of departure."
 msgstr "Bitte gib Dein geplantes Abreisedatum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:126
 msgid "-> not OK. Please try again."
 msgstr "-> Nicht OK. Bitte erneut versuchen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:134
 msgid "Failed setting password."
 msgstr "Konnte Passwort nicht speichern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:149
 msgid "Theme changed."
 msgstr "Aussehen geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
 msgid "Here you can change your user details."
 msgstr "Hier kannst Du Deine Details ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
 msgid "Planned date of departure"
 msgstr "Geplanter Abreisetag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192
 msgid "Please visit the angeltypes page to manage your angeltypes."
 msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:198
 msgid "Here you can change your password."
 msgstr "Hier kannst Du Dein Passwort ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:199
 msgid "Old password:"
 msgstr "Altes Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200
 msgid "New password:"
 msgstr "Neues Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201
 msgid "Password confirmation:"
 msgstr "Passwort wiederholen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:205
 msgid "Here you can choose your color settings:"
 msgstr "Hier kannst Du das Aussehen auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:206
 msgid "Color settings:"
 msgstr "Aussehen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:210
 msgid "Here you can choose your language:"
 msgstr "Hier kannst Du Deine Sprache auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:211
 msgid "Language:"
 msgstr "Sprache:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:47
 msgid "Shift entry deleted."
 msgstr "Schicht-Eintrag gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:49
 msgid "Entry not found."
 msgstr "Eintrag nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:120
 msgid "Please select a room."
 msgstr "Bitte einen Raum auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:127
 msgid "Please select a shifttype."
 msgstr "Bitte einen Schichttyp wählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:134
 msgid "Please enter a valid starting time for the shifts."
 msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:141
 msgid "Please enter a valid ending time for the shifts."
 msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:146
 msgid "The ending time has to be after the starting time."
 msgstr "Die Endzeit muss nach der Startzeit liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:154
 #, php-format
 msgid "Please check your input for needed angels of type %s."
 msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:177
 msgid "Shift updated."
 msgstr "Schicht aktualisiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:192
 msgid "This page is much more comfortable with javascript."
 msgstr "Diese Seite ist mit JavaScript viel komfortabler."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:196
 msgid "Room:"
 msgstr "Raum:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:197
 msgid "Start:"
 msgstr "Start:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:198
 msgid "End:"
 msgstr "Ende:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:228
 msgid "Shift deleted."
 msgstr "Schicht gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:233
 #, php-format
 msgid "Do you want to delete the shift %s from %s to %s?"
 msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:271
 msgid ""
 "You are not allowed to sign up for this shift. Maybe shift is full or "
 "already running."
@@ -1823,32 +1843,32 @@ msgstr ""
 "Du darfst Dich nicht für diese Schicht eintragen. Vielleicht ist die Schicht "
 "voll oder sie läuft bereits."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:296
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:325
 msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:305
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:334
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
 msgid "Freeloader"
 msgstr "Schwänzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:335
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:366
 msgid "The administration has not configured any shifts yet."
 msgstr "Die Administratoren haben noch keine Schichten angelegt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:373
 msgid "The administration has not configured any rooms yet."
 msgstr "Die Administratoren habe noch keine Räume eingerichtet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:355
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:388
 msgid "occupied"
 msgstr "belegt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:359
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:392
 msgid "free"
 msgstr "frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:364
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:397
 msgid ""
 "The administration has not configured any angeltypes yet - or you are not "
 "subscribed to any angeltype."
@@ -1856,49 +1876,49 @@ msgstr ""
 "Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast "
 "noch keine Engeltypen ausgewählt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:616
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:753
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:671
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:817
 #, php-format
 msgid "%d helper needed"
 msgid_plural "%d helpers needed"
 msgstr[0] "%d Helfer benötigt"
 msgstr[1] "%d Helfer benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:636
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:691
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:25
 msgid "Sign up"
 msgstr "Eintragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:639
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:694
 msgid "ended"
 msgstr "vorbei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:647
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:780
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:702
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:845
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:27
 #, php-format
 msgid "Become %s"
 msgstr "Werde ein %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:659
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:793
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:715
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:858
 msgid "Add more angels"
 msgstr "Neue Engel hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:801
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:866
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:284
 msgid "Time"
 msgstr "Zeit"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:802
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:867
 msgid "Entries"
 msgstr "Einträge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:820
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:886
 msgid "Occupancy"
 msgstr "Belegung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:887
 msgid ""
 "The tasks shown here are influenced by the preferences you defined in your "
 "settings!"
@@ -1906,19 +1926,19 @@ msgstr ""
 "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen "
 "(Engeltypen/Aufgaben) abhängig!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:887
 msgid "Description of the jobs."
 msgstr "Beschreibung der Aufgaben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:822
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:888
 msgid "Use new style if possible"
 msgstr "Wenn möglich neuen Stil verwenden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:824
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:890
 msgid "iCal export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:824
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:890
 #, php-format
 msgid ""
 "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1929,70 +1949,60 @@ msgstr ""
 "\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
 "\">API-Key zurücksetzen</a>)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:825
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:891
 msgid "Filter"
 msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:859
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:930
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23
 msgid "All"
 msgstr "Alle"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:860
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:931
 msgid "None"
 msgstr "Keine"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:28
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:200
 msgid "Unconfirmed"
 msgstr "Unbestätigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:30
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:33
 msgid "Coordinator"
 msgstr "Koordinator"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:35
 msgid "Member"
 msgstr "Mitglied"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:42
 #, php-format
 msgid "Do you want to delete angeltype %s?"
 msgstr "Möchtest Du den Engeltypen %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:14
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:82
 msgid "cancel"
 msgstr "abbrechen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:225
 msgid "Restricted"
 msgstr "Beschränkt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
-msgid "Yes"
-msgstr "Ja"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
-msgid "No"
-msgstr "Nein"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
 msgid "Requires driver license"
 msgstr "Benötigt Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60
 msgid ""
 "Restricted angel types can only be used by an angel if enabled by an "
 "archangel (double opt-in)."
@@ -2000,23 +2010,23 @@ msgstr ""
 "Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator "
 "freigeschaltet werden (double-opt-in)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37
 msgid "Description"
 msgstr "Beschreibung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:38
 msgid "Please use markdown for the description."
 msgstr "Bitte benutze Markdown für die Beschreibung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:74
 msgid "my driving license"
 msgstr "Meine Führerschein-Infos"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81
 msgid ""
 "This angeltype requires a driver license. Please enter your driver license "
 "information!"
@@ -2024,7 +2034,7 @@ msgstr ""
 "Dieser Engeltyp benötigt Führerschein-Infos. Bitte trage Deine Führerschein-"
 "Infos ein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
 #, php-format
 msgid ""
 "You are unconfirmed for this angeltype. Please go to the introduction for %s "
@@ -2033,82 +2043,82 @@ msgstr ""
 "Du bist noch nicht für diesen Engeltyp bestätigt. Bitte gehe zur Einführung "
 "für %s um bestätigt zu werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:126
 msgid "confirm"
 msgstr "bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:127
 msgid "deny"
 msgstr "ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:143
 msgid "remove"
 msgstr "entfernen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:160
 msgid "Driver"
 msgstr "Fahrer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161
 msgid "Has car"
 msgstr "Hat Auto"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:162
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27
 msgid "Car"
 msgstr "Auto"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
 msgid "3,5t Transporter"
 msgstr "3,5t Transporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164
 msgid "7,5t Truck"
 msgstr "7,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165
 msgid "12,5t Truck"
 msgstr "12,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31
 msgid "Forklift"
 msgstr "Gabelstapler"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:171
 msgid "Coordinators"
 msgstr "Koordinatoren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:191
 msgid "Members"
 msgstr "Mitglieder"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:72
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:202
 msgid "confirm all"
 msgstr "Alle bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:203
 msgid "deny all"
 msgstr "Alle ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:220
 msgid "New angeltype"
 msgstr "Neuer Engeltyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:226
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:240
 msgid "FAQ"
 msgstr "FAQ"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:242
 msgid ""
 "Here is the list of teams and their tasks. If you have questions, read the "
 "FAQ."
@@ -2116,7 +2126,7 @@ msgstr ""
 "Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue "
 "im FAQ nach."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:260
 msgid ""
 "This angeltype is restricted by double-opt-in by a team coordinator. Please "
 "show up at the according introduction meetings."
@@ -2124,38 +2134,82 @@ msgstr ""
 "Dieser Engeltyp muss zusätzlich von einem Team-Koordinator freigeschaltet "
 "werden. Bitte komme zu den entsprechenden Einführungstreffen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:9
+msgid "We got no information about the event right now."
+msgstr "Wir haben aktuell keine Informationen über das Event."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:19
+#, php-format
+msgid "from %s to %s"
+msgstr "von %s bis %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:23
+#, php-format
+msgid "Buildup starts in %c"
+msgstr "Aufbau startet in %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:27
+#, php-format
+msgid "Event starts in %c"
+msgstr "Event startet in %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:31
+#, php-format
+msgid "Event ends in %c"
+msgstr "Event endet in %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:35
+#, php-format
+msgid "Teardown ends in %c"
+msgstr "Abbau endet in %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51
+#, php-format
+msgid "%s, from %s to %s"
+msgstr "%s, von %s bis %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
+#, php-format
+msgid "%s, starting %s"
+msgstr "%s, ab %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61
+#, php-format
+msgid "Event from %s to %s"
+msgstr "Event von %s bis %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:90
 msgid "Event Name"
 msgstr "Event Name"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:91
 msgid "Event Name is shown on the start page."
 msgstr "Event Name wird auf der Startseite angezeigt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92
 msgid "Event Welcome Message"
 msgstr "Event Willkommens-Nachricht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93
 msgid ""
 "Welcome message is shown after successful registration. You can use markdown."
 msgstr ""
 "Die Willkommens-Nachricht wird nach einer erfolgreichen Registrierung "
 "angezeigt. Du kannst Markdown benutzen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96
 msgid "Buildup date"
 msgstr "Aufbau Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:97
 msgid "Event start date"
 msgstr "Event Start Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100
 msgid "Teardown end date"
 msgstr "Abbau Ende Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101
 msgid "Event end date"
 msgstr "Event Ende Datum"
 
@@ -2168,8 +2222,8 @@ msgid "Your Question:"
 msgstr "Deine Frage:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -2210,43 +2264,43 @@ msgstr "Kommentar (nur für Dich):"
 msgid "created at %s by %s"
 msgstr "erstellt am %s von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:9
 #, php-format
 msgid "edited at %s by %s"
 msgstr "bearbeitet am %s von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:80
 msgid "This shift collides with one of your shifts."
 msgstr "Diese Schicht kollidiert mit deinen Schichten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:81
 msgid "You are signed up for this shift."
 msgstr "Du bist für diese Schicht eingetragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:285
 msgid "Location"
 msgstr "Ort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:13
 #, php-format
 msgid "Do you want to delete shifttype %s?"
 msgstr "Möchtest Du den Schichttypen %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:29
 msgid "Edit shifttype"
 msgstr "Schichttyp bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:29
 msgid "Create shifttype"
 msgstr "Schichttyp erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:48
 #, php-format
 msgid "for team %s"
 msgstr "für Team %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:74
 msgid "New shifttype"
 msgstr "Neuer Schichttyp"
 
@@ -2254,7 +2308,11 @@ msgstr "Neuer Schichttyp"
 msgid "Please select..."
 msgstr "Bitte auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:28
+msgid "Registration successful"
+msgstr "Registrierung erfolgreich"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:66
 msgid ""
 "Do you really want to delete the user including all his shifts and every "
 "other piece of his data?"
@@ -2262,152 +2320,152 @@ msgstr ""
 "Möchtest Du wirklich den Engel inklusive aller seiner Schichten und allen "
 "anderen seiner Daten löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68
 msgid "Your password"
 msgstr "Dein Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
 #, php-format
 msgid "Angel should receive at least  %d vouchers."
 msgstr "Engel sollte mindestens %d Voucher bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
 msgid "Number of vouchers given out"
 msgstr "Anzahl Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
 msgid "m/d/Y h:i a"
 msgstr "d.m.Y H:i"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
 msgid "New user"
 msgstr "Neuer User"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
 msgid "Prename"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
 msgid "Arrived"
 msgstr "Angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
 msgid "Voucher"
 msgstr "Voucher"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:127
 msgid "Freeloads"
 msgstr "Schwänzereien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:255
 msgid "Active"
 msgstr "Aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:256
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:132
 msgid "Last login"
 msgstr "Letzter Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
 #, php-format
 msgid "Next shift %c"
 msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:162
 #, php-format
 msgid "Shift starts %c"
 msgstr "Schicht startet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:164
 #, php-format
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:218
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:231
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:250
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254
 #, php-format
 msgid "Got %s voucher"
 msgid_plural "Got %s vouchers"
 msgstr[0] "Einen Voucher bekommen"
 msgstr[1] "%s Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:263
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:271
 msgid "driving license"
 msgstr "Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273
 msgid "Edit vouchers"
 msgstr "Voucher bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:275
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:276
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:286
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:287
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:288
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:290
 msgid "Your night shifts between 2 and 8 am count twice."
 msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:291
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2416,7 +2474,7 @@ msgstr ""
 "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
 "einzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:301
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2425,54 +2483,54 @@ msgstr ""
 "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
 "verwendet hast."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:304
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:315
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:5
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6
 #, php-format
 msgid "Do you really want to add coordinator rights for %s to %s?"
 msgstr "Sollen %s %s als neuen Koordinator bekommen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:5
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6
 #, php-format
 msgid "Do you really want to remove coordinator rights for %s from %s?"
 msgstr "Möchtest Du wirklich %s von %s als Koordinator befreien?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:17
 #, php-format
 msgid "Do you really want to deny all users for %s?"
 msgstr "Möchtest Du wirklich alle Benutzer als %s ablehnen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:28
 #, php-format
 msgid "Do you really want to confirm all users for %s?"
 msgstr "Möchtest Du wirklich alle Benutzer als %s bestätigen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:39
 #, php-format
 msgid "Do you really want to confirm %s for %s?"
 msgstr "Möchtest Du wirklich %s für %s bestätigen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:50
 #, php-format
 msgid "Do you really want to delete %s from %s?"
 msgstr "Möchtest Du wirklich %s von %s entfernen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:71
 msgid "User"
 msgstr "Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:80
 #, php-format
 msgid "Do you really want to add %s to %s?"
 msgstr "Möchtest Du wirklich %s zu %s hinzufügen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:83
 msgid "save"
 msgstr "Speichern"
 
@@ -2518,11 +2576,11 @@ msgstr "7,5t LKW"
 msgid "Truck 12,5t"
 msgstr "12,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:150
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:152
 msgid "No Access"
 msgstr "Kein Zugriff"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:151
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:153
 msgid ""
 "You don't have permission to view this page. You probably have to sign in or "
 "register in order to gain access!"
@@ -2597,9 +2655,6 @@ msgstr ""
 #~ msgid "Exports"
 #~ msgstr "Exporte"
 
-#~ msgid "Current ends in %s min"
-#~ msgstr "Ende in %s min"
-
 #~ msgid "Add new angeltype"
 #~ msgstr "Neuer Engeltyp"