diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index dbdc617b..1c4d4abd 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -45,8 +45,7 @@ function User_edit_vouchers_view($user) {
       buttons([
           button(user_link($user), glyph('chevron-left') . _("back")) 
       ]),
-      heading(sprintf(_("angel should receive at least  %d vouchers."), User_get_eligable_voucher_count($user)), 3),
-      heading(_("This is a automatically calculated MINIMUM value, you can of course give out more if appropriate!"), 4),
+      info(sprintf(_("Angel should receive at least  %d vouchers."), User_get_eligable_voucher_count($user)), true),
       form([
           form_spinner('vouchers', _("Number of vouchers given out"), $user['got_voucher']),
           form_submit('submit', _("Save")) 
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index c9139c28..bb5563d6 100644
Binary files a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo and b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 30e5c8dd..c4d5d648 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: 2015-12-28 17:45+0100\n"
-"PO-Revision-Date: 2015-12-28 17:46+0100\n"
+"POT-Creation-Date: 2016-03-22 14:48+0100\n"
+"PO-Revision-Date: 2016-03-22 14:51+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -66,7 +66,7 @@ msgstr "Nichts gefunden."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
 #: /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:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
@@ -105,7 +105,7 @@ 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:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171
 msgid "view"
 msgstr "ansehen"
 
@@ -117,8 +117,8 @@ msgstr "ansehen"
 #: /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:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:225
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -126,6 +126,7 @@ msgstr "bearbeiten"
 #: /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/pages/admin_rooms.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:117
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:220
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:48
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:93
@@ -170,7 +171,7 @@ 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:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:66
 msgid "Please enter a name."
 msgstr "Gib bitte einen Namen an."
 
@@ -372,77 +373,96 @@ msgstr "Deine Führerschein-Infos wurden gespeichert."
 msgid "Edit %s driving license information"
 msgstr "Bearbeite die Führerschein-Infos von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:46
+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
+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
+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
+#, php-format
+msgid "Delete %s"
+msgstr "%s löschen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:111
 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:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:121
 msgid "Saved the number of vouchers."
 msgstr "Anzahl der Voucher gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
 #, php-format
 msgid "%s's vouchers"
 msgstr "Voucher von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:142
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:207
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:162
+#: /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:123
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:221
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:121
 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:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:227
 msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:196
+#: /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/pages/user_settings.php:37
 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:200
+#: /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/pages/user_settings.php:41
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:279
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:262
 #, 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:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:266
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -526,6 +546,18 @@ msgstr "Du wurdest aus einer Schicht ausgetragen:"
 msgid "Removed from Shift"
 msgstr "Von Schicht ausgetragen"
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:7
+msgid "Your account has been deleted"
+msgstr "Dein Konto wurde gelöscht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:7
+msgid ""
+"Your angelsystem account has been deleted. If you have any questions "
+"regarding your account deletion, please contact heaven."
+msgstr ""
+"Dein Engelsystem-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere "
+"bitte den Himmel."
+
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:4
 msgid "Active angels"
 msgstr "Aktive Engel"
@@ -548,10 +580,11 @@ 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:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:164
 #: /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
 msgid "back"
 msgstr "zurück"
@@ -584,41 +617,41 @@ msgstr "Engel hat ein T-Shirt bekommen."
 msgid "Angel has got no t-shirt."
 msgstr "Engel hat kein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135
 msgid "set active"
 msgstr "setze aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
 msgid "remove active"
 msgstr "entferne aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:138
 msgid "got t-shirt"
 msgstr "hat t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:141
 msgid "remove t-shirt"
 msgstr "entferne t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:159
 #: /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/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:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
 msgid "Sum"
 msgstr "Summe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:166
 msgid "Search angel:"
 msgstr "Suche Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167
 msgid "Show all shifts"
 msgstr "Alle Schichten anzeigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:132
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:133
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
@@ -628,60 +661,60 @@ msgstr "Alle Schichten anzeigen"
 msgid "Search"
 msgstr "Suche"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:171
 msgid "How much angels should be active?"
 msgstr "Wie viele Engel sollten aktiv sein?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:173
+#: /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:322
 msgid "Preview"
 msgstr "Vorschau"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:176
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:136
 msgid "Nickname"
 msgstr "Nick"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
+#: /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
 msgid "Size"
 msgstr "Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:236
 msgid "Shifts"
 msgstr "Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:311
 msgid "Length"
 msgstr "Länge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:180
 msgid "Active?"
 msgstr "Aktiv?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:94
 msgid "Forced"
 msgstr "Gezwungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182
 msgid "T-shirt?"
 msgstr "T-Shirt?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:185
 msgid "Shirt statistics"
 msgstr "T-Shirt Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
 msgid "Needed shirts"
 msgstr "Benötigte T-Shirts"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
 msgid "Given shirts"
 msgstr "Ausgegebene T-Shirts"
 
@@ -714,7 +747,7 @@ msgstr "zurücksetzen"
 #: /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/view/User_view.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:227
 msgid "arrived"
 msgstr "angekommen"
 
@@ -748,7 +781,7 @@ msgstr "Summe angekommen"
 #: /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_news.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
 msgid "Date"
 msgstr "Datum"
 
@@ -786,7 +819,7 @@ msgstr "Nur bestätigte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
 #: /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:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
 msgid "Nick"
 msgstr "Nick"
 
@@ -795,7 +828,7 @@ msgstr "Nick"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
 #: /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:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
 msgid "DECT"
 msgstr "DECT"
 
@@ -808,7 +841,7 @@ 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:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:258
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -819,13 +852,13 @@ msgstr "Gruppenrechte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29
 #: /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:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:175
+#: /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/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:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
 msgid "Name"
 msgstr "Name"
 
@@ -836,9 +869,9 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:53
 #: /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:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:149
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:257
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62
+#: /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:183
@@ -848,10 +881,10 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:191
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_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:33
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:256
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:274
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34
 msgid "Save"
 msgstr "Speichern"
@@ -861,8 +894,8 @@ 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:131
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:181
 msgid "Frab import"
 msgstr "Frab Import"
 
@@ -972,7 +1005,7 @@ 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:220
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
 msgid "Day"
 msgstr "Tag"
 
@@ -1045,7 +1078,7 @@ 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:74
+#: /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
 msgid "Message"
@@ -1057,7 +1090,8 @@ 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:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
 msgid "Delete"
 msgstr "löschen"
 
@@ -1114,39 +1148,43 @@ msgstr "Antwort von"
 msgid "Rooms"
 msgstr "Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:62
+msgid "This name is already in use."
+msgstr "Dieser Name ist bereits vergeben."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:89
 #, 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:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:117
 msgid "Room saved."
 msgstr "Raum gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:132
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:182
 msgid "Public"
 msgstr "Öffentlich"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:138
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143
 msgid "Needed angels:"
 msgstr "Benötigte Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:158
 #, php-format
 msgid "Room %s deleted."
 msgstr "Raum %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:166
 #, 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:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:176
 msgid "add"
 msgstr "Neu"
 
@@ -1247,7 +1285,6 @@ 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:165
 msgid "This user does not exist."
 msgstr "Benutzer existiert nicht."
 
@@ -1268,7 +1305,7 @@ msgid ""
 msgstr ""
 "Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:200
 msgid "Edit user"
 msgstr "User bearbeiten"
 
@@ -1343,12 +1380,12 @@ 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:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:272
 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:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1403,10 +1440,6 @@ msgstr "Wohnort"
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:272
-msgid "Your password is incorrect.  Please try it again."
-msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:276
 msgid "Please enter a password."
 msgstr "Gib bitte ein Passwort ein."
@@ -1448,62 +1481,62 @@ 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/user_messages.php:3
+#: /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:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:25
 msgid "Select recipient..."
 msgstr "Empfänger auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:36
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:39
+#: /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
 msgid "Unable to load user."
 msgstr "Konnte Benutzer nicht laden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:64
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:66
 msgid "delete message"
 msgstr "Nachricht löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:72
 #, 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:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:75
 msgid "New"
 msgstr "Neu"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:77
 msgid "Transmitted"
 msgstr "Gesendet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:104
 msgid "Incomplete call, missing Message ID."
 msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:111
 msgid "No Message found."
 msgstr "Keine Nachricht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
 msgid "Transmitting was terminated with an Error."
 msgstr "Übertragung wurde mit einem Fehler abgebrochen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:123
 msgid "Wrong action."
 msgstr "Falsche Aktion."
 
@@ -1517,7 +1550,7 @@ msgid "Key changed."
 msgstr "Key geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:232
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1534,15 +1567,19 @@ msgstr ""
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:61
+msgid "Please enter a freeload comment!"
+msgstr "Gib bitte einen Schwänz-Kommentar ein!"
+
+#: /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:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:105
 msgid "Shift canceled."
 msgstr "Schichteintrag gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:107
 msgid ""
 "It's too late to sign yourself off the shift. If neccessary, ask the "
 "dispatcher to do so."
@@ -1609,7 +1646,7 @@ 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:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:229
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1752,7 +1789,7 @@ msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:307
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:206
 msgid "Freeloader"
 msgstr "Schwänzer"
 
@@ -1810,7 +1847,7 @@ msgid "Add more angels"
 msgstr "Neue Engel hinzufügen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:803
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
 msgid "Time"
 msgstr "Zeit"
 
@@ -2057,8 +2094,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:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:167
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -2070,27 +2107,27 @@ msgstr "Schwänzer Kommentar (Nur für die Schicht-Koordination):"
 msgid "Edit shift entry"
 msgstr "Schichteintrag bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:26
 msgid "Angel:"
 msgstr "Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:27
 msgid "Date, Duration:"
 msgstr "Termin, Dauer:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:28
 msgid "Location:"
 msgstr "Ort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:29
 msgid "Title:"
 msgstr "Titel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:30
 msgid "Type:"
 msgstr "Typ:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:31
 msgid "Comment (for your eyes only):"
 msgstr "Kommentar (nur für Dich):"
 
@@ -2113,7 +2150,7 @@ 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:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
 msgid "Location"
 msgstr "Ort"
 
@@ -2143,143 +2180,161 @@ msgstr "Neuer Schichttyp"
 msgid "Please select..."
 msgstr "Bitte auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
-msgid "Number of vouchers"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:31
+msgid ""
+"Do you really want to delete the user including all his shifts and every "
+"other piece of his data?"
+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
+msgid "Your password"
+msgstr "Dein Passwort"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
+#, fuzzy, 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
+#, fuzzy
+msgid "Number of vouchers given out"
 msgstr "Anzahl Voucher"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
 msgid "m/d/Y h:i a"
 msgstr "d.m.Y H:i"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
 msgid "New user"
 msgstr "Neuer User"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:87
 msgid "Prename"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 msgid "Arrived"
 msgstr "Angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:91
 msgid "Voucher"
 msgstr "Voucher"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:92
 msgid "Freeloads"
 msgstr "Schwänzereien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
 msgid "Active"
 msgstr "Aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97
 msgid "Last login"
 msgstr "Letzter Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:113
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
 #, php-format
 msgid "Next shift %c"
 msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
 #, php-format
 msgid "Shift starts %c"
 msgstr "Schicht startet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
 #, php-format
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
 #, 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:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:218
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:226
 msgid "driving license"
 msgstr "Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:228
 msgid "Edit vouchers"
 msgstr "Voucher bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:230
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:231
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:241
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:243
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
 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:228
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:246
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2288,7 +2343,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:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:256
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2297,11 +2352,11 @@ 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:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:259
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -2402,23 +2457,15 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
-msgid ""
-"angel should receive at least  %d vouchers."
-msgstr ""
-"Engel sollte mindestens %d voucher bekommen."
+#~ msgid " vouchers."
+#~ msgstr " Vouchers."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
-msgid ""
-" vouchers."
-msgstr ""
-" Vouchers."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
-msgid ""
-"This is a automatically calculated MINIMUM value, you can of course give out more if appropriate!"
-msgstr ""
-"Dies ist ein automatisch berechneter MINIMAL Wert, du kannst natürlich mehr ausgeben, wenn du es für angemessen hälst!"
+#~ msgid ""
+#~ "This is a automatically calculated MINIMUM value, you can of course give "
+#~ "out more if appropriate!"
+#~ msgstr ""
+#~ "Dies ist ein automatisch berechneter MINIMAL Wert, du kannst natürlich "
+#~ "mehr ausgeben, wenn du es für angemessen hälst!"
 
 #~ msgid "You have been signed off from the shift."
 #~ msgstr "Du wurdest aus der Schicht ausgetragen."
@@ -2449,9 +2496,6 @@ msgstr ""
 #~ "Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen "
 #~ "Dispatcher Dich nachzutragen."
 
-#~ msgid "The shift is already full."
-#~ msgstr "Diese Schicht ist bereits voll belegt."
-
 #~ msgid ""
 #~ "Hello %s, here you can change your personal settings i.e. password, color "
 #~ "settings etc."