From 99c8751059c8d28af71bb5c5b56f982890814370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Tue, 22 Mar 2016 14:51:30 +0100
Subject: [PATCH] some minor text changes on user vouchers

---
 includes/view/User_view.php               |   3 +-
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 37514 -> 38019 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 402 ++++++++++++----------
 3 files changed, 224 insertions(+), 181 deletions(-)

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 c9139c28f15e461f4e1165d95c15b0740724192d..bb5563d63388903fcb670d5290974a117eafa4d7 100644
GIT binary patch
delta 11231
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

delta 10889
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

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."