From 0b5526298702b1c5dd8808d2a580ce0e21edc818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Fri, 26 Dec 2014 18:45:43 +0100
Subject: [PATCH] update german translation

---
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 31728 -> 32230 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 407 ++++++++++++----------
 2 files changed, 227 insertions(+), 180 deletions(-)

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index ecba53db185f199d830981ddf1bcaa11793b68cf..dd94c9de18571ac19465f38ef7837cb016985654 100644
GIT binary patch
delta 9417
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
V>cI{klj$renw&`&?v~#2{y*E+b-n-q

delta 8987
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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 cfc03bd5..0b4881be 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: 2014-12-22 20:21+0100\n"
-"PO-Revision-Date: 2014-12-22 20:25+0100\n"
+"POT-Creation-Date: 2014-12-26 18:43+0100\n"
+"PO-Revision-Date: 2014-12-26 18:45+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -57,14 +57,14 @@ msgstr "Nichts gefunden."
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:46
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:308
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:230
 msgid "Teams/Job description"
 msgstr "Team-/Aufgabenbeschreibung"
 
@@ -90,13 +90,13 @@ msgid "Edit %s"
 msgstr "%s bearbeiten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:173
 #, php-format
 msgid "Team %s"
 msgstr "Team %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140
 msgid "view"
 msgstr "ansehen"
 
@@ -105,11 +105,11 @@ msgstr "ansehen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:67
 #: /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:140
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:194
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -117,12 +117,12 @@ 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:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:219
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:48
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:68
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:53
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
@@ -131,13 +131,13 @@ msgstr "löschen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:217
 msgid "leave"
 msgstr "verlassen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219
 msgid "join"
 msgstr "mitmachen"
 
@@ -332,59 +332,67 @@ msgstr "Du bist %s beigetreten."
 msgid "Become a %s"
 msgstr "Werde ein %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:82
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:56
+msgid "User got vouchers."
+msgstr "Engel hat Voucher bekommen."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:56
+msgid "User didnt got vouchers."
+msgstr "Engel hat keine Voucher mehr."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:129
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:139
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:92
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:161
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:143
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159
 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:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:149
 msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:151
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:163
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:173
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:59
 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:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:66
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:152
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:201
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:184
 #, 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:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:188
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -542,7 +550,9 @@ msgid "remove t-shirt"
 msgstr "entferne t-shirt"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:149
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
 msgid "Sum"
 msgstr "Summe"
 
@@ -577,13 +587,13 @@ msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:165
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
 msgid "Size"
 msgstr "Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:166
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -597,7 +607,7 @@ msgid "Active?"
 msgstr "Aktiv?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
 msgid "Forced"
 msgstr "Gezwungen"
 
@@ -639,7 +649,7 @@ msgid "reset"
 msgstr "zurücksetzen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:195
 msgid "arrived"
 msgstr "angekommen"
 
@@ -666,9 +676,9 @@ msgstr "Nur bestätigte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:293
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:206
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:140
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
 msgid "Nick"
 msgstr "Nick"
 
@@ -676,9 +686,9 @@ msgstr "Nick"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:211
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:141
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:153
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
 msgid "DECT"
 msgstr "DECT"
 
@@ -691,7 +701,7 @@ msgstr "Jabber"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:173
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:213
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:220
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:226
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -700,15 +710,15 @@ msgid "Grouprights"
 msgstr "Gruppenrechte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:113
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:123
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:168
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:189
 #: /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:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
 msgid "Name"
 msgstr "Name"
 
@@ -729,12 +739,12 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:228
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:233
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:238
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:190
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65
 #: /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/ShiftTypes_view.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:236
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
 msgid "Save"
 msgstr "Speichern"
 
@@ -754,7 +764,7 @@ msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:48
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:159
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:48
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:53
 msgid "Please select a shift type."
@@ -773,16 +783,22 @@ msgid "Please provide some data."
 msgstr "Bitte lade eine Datei hoch."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
 msgid "File Upload"
 msgstr "Datei hochladen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
 msgid "Validation"
 msgstr "Überprüfen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
 msgid "Import"
 msgstr "Importieren"
 
@@ -796,6 +812,7 @@ msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:183
 msgid "Shifttype"
 msgstr "Schichttyp"
 
@@ -804,76 +821,77 @@ msgid "xcal-File (.xcal)"
 msgstr "xcal-Datei (.xcal)"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:149
 msgid "Missing import file."
 msgstr "Import-Datei nicht vorhanden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:108
 msgid "Rooms to create"
 msgstr "Anzulegende Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:112
 msgid "Rooms to delete"
 msgstr "Zu löschende Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:116
 msgid "Shifts to create"
 msgstr "Anzulegende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:134
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:201
-msgid "Day"
-msgstr "Tag"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:126
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:57
-msgid "Start"
-msgstr "Beginn"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:65
-msgid "End"
-msgstr "Ende"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+msgid "Day"
+msgstr "Tag"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:119
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:137
-msgid "Shift type"
-msgstr "Schichttyp"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78
+msgid "Start"
+msgstr "Beginn"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:129
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:53
-msgid "Title"
-msgstr "Titel"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:86
+msgid "End"
+msgstr "Ende"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:130
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
+msgid "Shift type"
+msgstr "Schichttyp"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74
+msgid "Title"
+msgstr "Titel"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:303
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:778
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:806
 msgid "Room"
 msgstr "Raum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125
 msgid "Shifts to update"
 msgstr "Zu aktualisierende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:134
 msgid "Shifts to delete"
 msgstr "Zu löschende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
 msgid "It's done!"
 msgstr "Erledigt!"
 
@@ -917,11 +935,11 @@ msgstr "Treffen"
 msgid "Delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
 msgid "News entry updated."
 msgstr "News-Eintrag gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:58
 msgid "News entry deleted."
 msgstr "News-Eintrag gelöscht."
 
@@ -966,7 +984,7 @@ msgid "Answered by"
 msgstr "Antwort von"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:3
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:791
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:819
 msgid "Rooms"
 msgstr "Räume"
 
@@ -1066,8 +1084,8 @@ msgstr "Typ und Titel"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:255
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:316
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:100
 msgid "Needed angels"
 msgstr "Benötigte Engel"
 
@@ -1180,12 +1198,12 @@ msgstr "T-Shirt Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:294
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
 msgid "Password"
 msgstr "Passwort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:241
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1346,7 +1364,7 @@ msgid "Wrong action."
 msgstr "Falsche Aktion."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:308
 msgid "My shifts"
 msgstr "Meine Schichten"
 
@@ -1355,7 +1373,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:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:201
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1447,7 +1465,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:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:198
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1520,61 +1538,62 @@ msgstr "Schicht-Eintrag gelöscht."
 msgid "Entry not found."
 msgstr "Eintrag nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:110
 msgid "Please select a room."
 msgstr "Bitte einen Raum auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:117
+#, fuzzy
+msgid "Please select a shifttype."
+msgstr "Bitte einen Schichttyp wählen."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:124
 msgid "Please enter a valid starting time for the shifts."
 msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:131
 msgid "Please enter a valid ending time for the shifts."
 msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:136
 msgid "The ending time has to be after the starting time."
 msgstr "Die Endzeit muss nach der Startzeit liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:144
 #, php-format
 msgid "Please check your input for needed angels of type %s."
 msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:165
 msgid "Shift updated."
 msgstr "Schicht aktualisiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181
 msgid "This page is much more comfortable with javascript."
 msgstr "Diese Seite ist mit JavaScript viel komfortabler."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166
-msgid "Name/Description:"
-msgstr "Name/Beschreibung:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185
 msgid "Room:"
 msgstr "Raum:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:186
 msgid "Start:"
 msgstr "Start:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:187
 msgid "End:"
 msgstr "Ende:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:213
 msgid "Shift deleted."
 msgstr "Schicht gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:218
 #, php-format
 msgid "Do you want to delete the shift %s from %s to %s?"
 msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:242
 msgid ""
 "This shift is running now or ended already. Please contact a dispatcher to "
 "join the shift."
@@ -1582,7 +1601,7 @@ msgstr ""
 "Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen Dispatcher "
 "Dich nachzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:252
 msgid ""
 "You already subscribed to shift in the same timeslot. Please contact a "
 "dispatcher to join the shift."
@@ -1590,32 +1609,32 @@ msgstr ""
 "Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen Dispatcher "
 "Dich nachzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:308
 msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:299
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
 msgid "Freeloader"
 msgstr "Schwänzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:329
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:347
 msgid "The administration has not configured any shifts yet."
 msgstr "Die Administratoren haben noch keine Schichten angelegt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:354
 msgid "The administration has not configured any rooms yet."
 msgstr "Die Administratoren habe noch keine Räume eingerichtet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:367
 msgid "occupied"
 msgstr "belegt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:371
 msgid "free"
 msgstr "frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:358
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:376
 msgid ""
 "The administration has not configured any angeltypes yet - or you are not "
 "subscribed to any angeltype."
@@ -1623,36 +1642,36 @@ msgstr ""
 "Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast "
 "noch keine Engeltypen ausgewählt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:598
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:730
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:626
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:758
 #, php-format
 msgid "%d helper needed"
 msgid_plural "%d helpers needed"
 msgstr[0] "%d Helfer benötigt"
 msgstr[1] "%d Helfer benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:639
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:667
 msgid "Add more angels"
 msgstr "Neue Engel hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:778
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:806
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 msgid "Time"
 msgstr "Zeit"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:779
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:807
 msgid "Entries"
 msgstr "Einträge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:796
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:824
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:797
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:825
 msgid "Occupancy"
 msgstr "Belegung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:798
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:826
 msgid ""
 "The tasks shown here are influenced by the preferences you defined in your "
 "settings!"
@@ -1660,19 +1679,19 @@ msgstr ""
 "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen "
 "(Engeltypen/Aufgaben) abhängig!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:798
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:826
 msgid "Description of the jobs."
 msgstr "Beschreibung der Aufgaben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:799
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:827
 msgid "Use new style if possible"
 msgstr "Wenn möglich neuen Stil verwenden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:801
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:829
 msgid "iCal export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:801
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:829
 #, php-format
 msgid ""
 "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1683,21 +1702,21 @@ msgstr ""
 "\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
 "\">API-Key zurücksetzen</a>)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:802
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:830
 msgid "Filter"
 msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:836
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:864
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
 msgid "All"
 msgstr "Alle"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:837
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:865
 msgid "None"
 msgstr "Keine"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:28
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161
 msgid "Unconfirmed"
 msgstr "Unbestätigt"
 
@@ -1728,7 +1747,7 @@ msgid "cancel"
 msgstr "abbrechen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:190
 msgid "Restricted"
 msgstr "Beschränkt"
 
@@ -1750,7 +1769,7 @@ msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
 msgid "Description"
 msgstr "Beschreibung"
@@ -1785,36 +1804,36 @@ msgstr "entfernen"
 msgid "Coordinators"
 msgstr "Koordinatoren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:149
 msgid "Members"
 msgstr "Mitglieder"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
 msgid "confirm all"
 msgstr "Alle bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164
 msgid "deny all"
 msgstr "Alle ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:185
 msgid "New angeltype"
 msgstr "Neuer Engeltyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:191
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:205
 msgid "FAQ"
 msgstr "FAQ"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:207
 msgid ""
 "Here is the list of teams and their tasks. If you have questions, read the "
 "FAQ."
@@ -1822,7 +1841,7 @@ msgstr ""
 "Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue "
 "im FAQ nach."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:224
 msgid ""
 "This angeltype is restricted by double-opt-in by a team coordinator. Please "
 "show up at the according introduction meetings."
@@ -1839,8 +1858,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:131
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:136
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -1876,12 +1895,20 @@ msgstr "Typ:"
 msgid "Comment (for your eyes only):"
 msgstr "Kommentar (nur für Dich):"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:13
 msgid "Sign up"
 msgstr "Eintragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:203
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:64
+msgid "This shift collides with one of your shifts."
+msgstr "Diese Schicht kollidiert mit deinen Schichten."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:65
+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:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
 msgid "Location"
 msgstr "Ort"
 
@@ -1911,103 +1938,120 @@ msgstr "Neuer Schichttyp"
 msgid "Please select..."
 msgstr "Bitte auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
 msgid "m/d/Y h:i a"
 msgstr "d.m.Y H:i"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
 msgid "New user"
 msgstr "Neuer User"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
 msgid "Prename"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
 msgid "Arrived"
 msgstr "Angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:57
+msgid "Voucher"
+msgstr "Voucher"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:58
 msgid "Freeloads"
 msgstr "Schwänzereien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179
 msgid "Active"
 msgstr "Aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:58
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63
 msgid "Last login"
 msgstr "Letzter Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
 #, php-format
 msgid "Next shift %c"
 msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
 #, php-format
 msgid "Shift starts %c"
 msgstr "Schicht startet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:92
 #, fuzzy, php-format
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
+msgid "Got vouchers"
+msgstr "Voucher bekommen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
+msgid "Got no vouchers"
+msgstr "Voucher nicht bekommen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:197
+msgid "Remove vouchers"
+msgstr "Voucher entfernen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:199
 #, fuzzy
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:200
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2016,7 +2060,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:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2025,11 +2069,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:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:227
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -2088,6 +2132,9 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "Name/Description:"
+#~ msgstr "Name/Beschreibung:"
+
 #~ msgid "Timeslot"
 #~ msgstr "Zeiten"