From 30e974402d29eb92a415cae6a75de2b739d8357b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sun, 28 Dec 2014 01:32:43 +0100
Subject: [PATCH] update german translation

---
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 32312 -> 32481 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 286 ++++++++++++----------
 2 files changed, 152 insertions(+), 134 deletions(-)

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 4ebb4924a975b4fb1c750bd3fffd41c7322b064b..5b946e930c44891ccc5ce8a17d60231ce89d1b41 100644
GIT binary patch
delta 9389
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

delta 9205
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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 4374c91a..902ef8b5 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-26 23:51+0100\n"
-"PO-Revision-Date: 2014-12-26 23:51+0100\n"
+"POT-Creation-Date: 2014-12-28 01:31+0100\n"
+"PO-Revision-Date: 2014-12-28 01:32+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -57,7 +57,7 @@ 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:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
@@ -96,7 +96,7 @@ 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:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
 msgid "view"
 msgstr "ansehen"
 
@@ -108,8 +108,8 @@ msgstr "ansehen"
 #: /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:143
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -332,67 +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:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:60
 msgid "User got vouchers."
 msgstr "Engel hat Voucher bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:60
 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/controller/users_controller.php:118
 #: /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:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:133
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:143
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:102
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:143
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:100
 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:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:153
 msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:151
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:104
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /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/controller/users_controller.php:177
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:35
 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:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:181
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:39
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:205
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:188
 #, 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:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:192
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -593,7 +593,7 @@ 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:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:202
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -649,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:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192
 msgid "arrived"
 msgstr "angekommen"
 
@@ -674,7 +674,7 @@ msgstr "Nur bestätigte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:170
 #: /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/pages/user_settings.php:147
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:129
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:155
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167
@@ -684,7 +684,7 @@ msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
 #: /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/pages/user_settings.php:152
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:168
@@ -694,14 +694,14 @@ msgstr "DECT"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:156
 msgid "Jabber"
 msgstr "Jabber"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:213
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:226
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -731,20 +731,19 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:257
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:130
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62
 #: /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:219
-#: /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_settings.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
 #: /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:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
 msgid "Save"
 msgstr "Speichern"
 
@@ -840,7 +839,7 @@ msgstr "Anzulegende Schichten"
 #: /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/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:204
 msgid "Day"
 msgstr "Tag"
 
@@ -879,7 +878,7 @@ msgstr "Titel"
 #: /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:815
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:817
 msgid "Room"
 msgstr "Raum"
 
@@ -984,7 +983,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:828
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:830
 msgid "Rooms"
 msgstr "Räume"
 
@@ -1121,17 +1120,29 @@ msgstr "Die folgenden Engel werden benötigt"
 msgid "All Angels"
 msgstr "Engelliste"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:21
+#, fuzzy
+msgid "This user does not exist."
+msgstr "Benutzer existiert nicht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:155
 msgid "Please send me an email if my shifts change"
 msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:64
 msgid "Force active"
 msgstr "Aktiv erzwingen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:83
+msgid ""
+"Please visit the angeltypes page or the users profile to manage users "
+"angeltypes."
+msgstr ""
+"Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:216
 msgid "Edit user"
 msgstr "User bearbeiten"
 
@@ -1154,19 +1165,17 @@ msgid "Logout"
 msgstr "Logout"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:48
 #, php-format
 msgid "Your nick &quot;%s&quot; already exists."
 msgstr "Der Nick &quot;%s&quot; existiert schon."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:52
 #, php-format
 msgid "Your nick &quot;%s&quot; is too short (min. 2 characters)."
 msgstr "Der Nick &quot;%s&quot; ist zu kurz (Mindestens 2 Zeichen)."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:48
 msgid "Please check your jabber account information."
 msgstr "Bitte überprüfe deine Jabber Account Eingabe."
 
@@ -1192,28 +1201,26 @@ msgstr ""
 "der Engel-Aufgabenverwaltung."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:158
 msgid "Shirt size"
 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:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237
 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:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:218
 msgid "What do you want to do?"
 msgstr "Was möchtest Du machen?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:218
 msgid "Description of job types"
 msgstr "Beschreibung der Aufgaben"
 
@@ -1226,36 +1233,37 @@ msgstr ""
 "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:153
 msgid "Mobile"
 msgstr "Handy"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:151
 msgid "Phone"
 msgstr "Telefon"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:149
 msgid "First name"
 msgstr "Vorname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:148
 msgid "Last name"
 msgstr "Nachname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:150
 msgid "Age"
 msgstr "Alter"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:157
 msgid "Hometown"
 msgstr "Wohnort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:146
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
@@ -1373,7 +1381,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:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:198
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1465,68 +1473,63 @@ 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:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:195
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:91
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98
 msgid "-> not OK. Please try again."
 msgstr "-> Nicht OK. Bitte erneut versuchen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:106
 msgid "Failed setting password."
 msgstr "Konnte Passwort nicht speichern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
 msgid "Theme changed."
 msgstr "Aussehen geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:199
-#, php-format
-msgid ""
-"Hello %s, here you can change your personal settings i.e. password, color "
-"settings etc."
-msgstr ""
-"Hallo %s, hier kannst Du Deine persönlichen Einstellungen (z.B. Passwort, "
-"Aussehen, usw.) ändern."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:145
 msgid "Here you can change your user details."
 msgstr "Hier kannst Du Deine Details ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159
+msgid "Please visit the angeltypes page to manage your angeltypes."
+msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165
 msgid "Here you can change your password."
 msgstr "Hier kannst Du Dein Passwort ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
 msgid "Old password:"
 msgstr "Altes Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:226
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
 msgid "New password:"
 msgstr "Neues Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
 msgid "Password confirmation:"
 msgstr "Passwort wiederholen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
 msgid "Here you can choose your color settings:"
 msgstr "Hier kannst Du das Aussehen auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
 msgid "Color settings:"
 msgstr "Aussehen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:236
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
 msgid "Here you can choose your language:"
 msgstr "Hier kannst Du Deine Sprache auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
 msgid "Language:"
 msgstr "Sprache:"
 
@@ -1609,7 +1612,7 @@ msgstr ""
 "Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen Dispatcher "
 "Dich nachzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:263
 msgid "The shift is already full."
 msgstr "Diese Schicht ist bereits voll belegt."
 
@@ -1618,7 +1621,7 @@ msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:329
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172
 msgid "Freeloader"
 msgstr "Schwänzer"
 
@@ -1646,36 +1649,53 @@ 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:635
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:767
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:636
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:769
 #, 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:676
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:656
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:13
+msgid "Sign up"
+msgstr "Eintragen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:659
+msgid "ended"
+msgstr "vorbei"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:667
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:796
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:15
+#, fuzzy, php-format
+msgid "Become %s"
+msgstr "Werde ein %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:679
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:809
 msgid "Add more angels"
 msgstr "Neue Engel hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:815
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:817
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
 msgid "Time"
 msgstr "Zeit"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:816
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:818
 msgid "Entries"
 msgstr "Einträge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:833
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:835
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:834
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:836
 msgid "Occupancy"
 msgstr "Belegung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:835
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:837
 msgid ""
 "The tasks shown here are influenced by the preferences you defined in your "
 "settings!"
@@ -1683,19 +1703,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:835
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:837
 msgid "Description of the jobs."
 msgstr "Beschreibung der Aufgaben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:836
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:838
 msgid "Use new style if possible"
 msgstr "Wenn möglich neuen Stil verwenden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:838
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:840
 msgid "iCal export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:838
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:840
 #, php-format
 msgid ""
 "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1706,16 +1726,16 @@ 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:839
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:841
 msgid "Filter"
 msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:873
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:875
 #: /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:874
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:876
 msgid "None"
 msgstr "Keine"
 
@@ -1862,8 +1882,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:134
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -1899,15 +1919,6 @@ msgstr "Typ:"
 msgid "Comment (for your eyes only):"
 msgstr "Kommentar (nur für Dich):"
 
-#: /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:15
-#, fuzzy, php-format
-msgid "Become %s"
-msgstr "Werde ein %s"
-
 #: /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."
@@ -1917,7 +1928,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:94
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:206
 msgid "Location"
 msgstr "Ort"
 
@@ -1960,7 +1971,7 @@ msgid "Prename"
 msgstr "Vorname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
 msgid "Arrived"
 msgstr "Angekommen"
 
@@ -1973,12 +1984,12 @@ msgid "Freeloads"
 msgstr "Schwänzereien"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:59
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
 msgid "Active"
 msgstr "Aktiv"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
@@ -2006,61 +2017,61 @@ msgstr "Schicht startet %c"
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193
 msgid "Got vouchers"
 msgstr "Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:194
 msgid "Remove vouchers"
 msgstr "Voucher entfernen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
 #, fuzzy
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:197
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2069,7 +2080,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:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2078,11 +2089,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:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -2141,6 +2152,13 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid ""
+#~ "Hello %s, here you can change your personal settings i.e. password, color "
+#~ "settings etc."
+#~ msgstr ""
+#~ "Hallo %s, hier kannst Du Deine persönlichen Einstellungen (z.B. Passwort, "
+#~ "Aussehen, usw.) ändern."
+
 #~ msgid "Name/Description:"
 #~ msgstr "Name/Beschreibung:"