user list rewritten

1 files changed, 181 insertions, 137 deletions

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index ec86d098..231c65a2 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-08-24 16:47+0100\n"
-"PO-Revision-Date: 2014-08-24 16:47+0100\n"
+"POT-Creation-Date: 2014-09-28 14:25+0100\n"
+"PO-Revision-Date: 2014-09-28 14:26+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -17,20 +17,24 @@ msgstr ""
 "X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
 "X-Poedit-SearchPath-1: .\n"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:85
+msgid "Admin"
+msgstr "Admin"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:280
 msgid "No data found."
 msgstr "Nichts gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:112
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:46
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:160
 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:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:289
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:205
 msgid "Teams/Job description"
@@ -68,15 +72,16 @@ msgid "view"
 msgstr "ansehen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:141
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:56
 #: /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/pages/admin_user.php:318
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:504
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:169
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -270,54 +275,75 @@ msgstr "Du bist %s beigetreten."
 msgid "Become a %s"
 msgstr "Werde ein %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
+msgid "All users"
+msgstr "Alle Benutzer"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:113
+msgid "Groups"
+msgstr "Gruppen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:44
+msgid "Freeloads"
+msgstr "Schwänzereien"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
+msgid "Forced"
+msgstr "Gezwungen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:189
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:91
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:203
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:126
 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:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:209
 msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:211
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:130
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:115
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:55
 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:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:66
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:59
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:126
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:261
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:244
 #, 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:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:248
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -446,11 +472,13 @@ msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:152
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
 msgid "Size"
 msgstr "Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:153
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -463,11 +491,6 @@ msgstr "Länge"
 msgid "Active?"
 msgstr "Aktiv?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:342
-msgid "Forced"
-msgstr "Gezwungen"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:157
 msgid "T-shirt?"
 msgstr "T-Shirt?"
@@ -506,7 +529,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:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170
 msgid "arrived"
 msgstr "angekommen"
 
@@ -528,34 +551,36 @@ msgid "Only confirmed"
 msgstr "Nur bestätigte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:150
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:274
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:119
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
 msgid "Nick"
 msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:172
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:120
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:42
 msgid "DECT"
 msgstr "DECT"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:181
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
 msgid "Jabber"
 msgstr "Jabber"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:154
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:195
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -574,6 +599,7 @@ msgstr "Gruppenrechte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:269
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:50
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
 msgid "Name"
 msgstr "Name"
 
@@ -586,7 +612,7 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:127
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:228
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:131
 #: /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
@@ -598,7 +624,7 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:55
 #: /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/User_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
 msgid "Save"
 msgstr "Speichern"
 
@@ -644,7 +670,7 @@ msgstr "Anzulegende Schichten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:88
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
 msgid "Day"
 msgstr "Tag"
 
@@ -778,9 +804,9 @@ msgid "Please enter a name."
 msgstr "Gib bitte einen Namen an."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:82
-#, fuzzy, php-format
+#, php-format
 msgid "Please enter needed angels for type %s."
-msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s."
+msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:107
 msgid "Room saved."
@@ -859,71 +885,67 @@ msgstr "Übernehme benötigte Engel von den Raum-Einstellungen"
 msgid "The following angels are needed"
 msgstr "Die folgenden Engel werden benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:4
 msgid "All Angels"
 msgstr "Engelliste"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:15
+msgid "Edit user"
+msgstr "User bearbeiten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:56
 msgid "Force active"
 msgstr "Aktiv erzwingen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:290
-msgid "Groups"
-msgstr "Gruppen"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:340
-msgid "Freeloads"
-msgstr "Schwänzereien"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:3
 msgid "Credits"
 msgstr "Credits"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:3
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:276
 msgid "Login"
 msgstr "Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203
 msgid "Register"
 msgstr "Registrieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:12
 msgid "Logout"
 msgstr "Logout"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:51
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:44
 #, 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:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:55
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:48
 #, 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:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:75
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:68
 msgid "Please check your jabber account information."
 msgstr "Bitte überprüfe deine Jabber Account Eingabe."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:84
 msgid "Please select your shirt size."
 msgstr "Bitte wähle Deine T-Shirt Größe."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:95
 #, php-format
 msgid "Your password is too short (please use at least %s characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:136
 msgid "Angel registration successful!"
 msgstr "Engel-Registrierung erfolgreich!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:143
 msgid ""
 "By completing this form you're registering as a Chaos-Angel. This script "
 "will create you an account in the angel task sheduler."
@@ -931,33 +953,33 @@ msgstr ""
 "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in "
 "der Engel-Aufgabenverwaltung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:157
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:184
 msgid "Shirt size"
 msgstr "T-Shirt Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:159
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:261
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
 msgid "Password"
 msgstr "Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185
 msgid "What do you want to do?"
 msgstr "Was möchtest Du machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185
 msgid "Description of job types"
 msgstr "Beschreibung der Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:167
 msgid ""
 "Restricted angel types need will be confirmed later by an archangel. You can "
 "change your selection in the options section."
@@ -965,49 +987,49 @@ msgstr ""
 "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet "
 "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:175
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
 msgid "Mobile"
 msgstr "Handy"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:178
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
 msgid "Phone"
 msgstr "Telefon"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
 msgid "First name"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:187
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
 msgid "Last name"
 msgstr "Nachname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
 msgid "Age"
 msgstr "Alter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:195
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
 msgid "Hometown"
 msgstr "Wohnort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
 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:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:239
 msgid "Please enter a password."
 msgstr "Gib bitte ein Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:243
 msgid ""
 "No user was found with that Nickname. Please try again. If you are still "
 "having problems, ask an Dispatcher."
@@ -1015,27 +1037,31 @@ msgstr ""
 "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch "
 "einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:247
 msgid "Please enter a nickname."
 msgstr "Gib bitte einen Nick an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:259
+msgid "Please sign up, if you want to help us!"
+msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:266
+msgid "Registration is disabled."
+msgstr "Registrierung ist abgeschaltet."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:278
 msgid "I forgot my password"
 msgstr "Passwort vergessen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:280
 msgid "Please note: You have to activate cookies!"
 msgstr "Hinweis: Cookies müssen aktiviert sein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271
-msgid "Please sign up, if you want to help us!"
-msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:286
 msgid "What can I do?"
 msgstr "Was kann ich machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:287
 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."
@@ -1268,10 +1294,6 @@ msgstr "Hier kannst Du Deine Sprache auswählen:"
 msgid "Language:"
 msgstr "Sprache:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:3
-msgid "All Shifts"
-msgstr "Alle Schichten"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:25
 msgid "Shift entry deleted."
 msgstr "Schicht-Eintrag gelöscht."
@@ -1355,7 +1377,7 @@ msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:269
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
 msgid "Freeloader"
 msgstr "Schwänzer"
 
@@ -1400,7 +1422,7 @@ msgid "Add more angels"
 msgstr "Neue Engel hinzufügen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:724
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
 msgid "Time"
 msgstr "Zeit"
 
@@ -1589,8 +1611,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:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:117
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -1631,83 +1653,102 @@ msgid "Please select..."
 msgstr "Bitte auswählen..."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:28
+msgid "m/d/Y h:i a"
+msgstr "d.m.Y H:i"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:37
+msgid "New user"
+msgstr "Neuer User"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40
+msgid "Prename"
+msgstr "Vorname"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:155
+msgid "Arrived"
+msgstr "Angekommen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
+msgid "Active"
+msgstr "Aktiv"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:157
+msgid "T-Shirt"
+msgstr "T-Shirt"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
+msgid "Last login"
+msgstr "Letzter Login"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68
 #, php-format
 msgid "Next shift %c"
 msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
 #, php-format
 msgid "Shift starts %c"
 msgstr "Schicht startet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
 #, fuzzy, php-format
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:134
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:152
 msgid "User state"
 msgstr "Engel Zustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
-msgid "Arrived"
-msgstr "Angekommen"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:155
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
-msgid "Active"
-msgstr "Aktiv"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123
-msgid "T-Shirt"
-msgstr "T-Shirt"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:164
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171
 #, fuzzy
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
 msgid "Location"
 msgstr "Ort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -1716,7 +1757,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:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -1725,11 +1766,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:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -1776,7 +1817,7 @@ msgstr "Möchtest Du wirklich %s zu %s hinzufügen?"
 msgid "save"
 msgstr "Speichern"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:97
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:98
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -1785,7 +1826,7 @@ msgstr ""
 "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
 "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:101
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:102
 msgid ""
 "You are not marked as arrived. Please go to heaven's desk, get your angel "
 "badge and/or tell them that you arrived already."
@@ -1793,11 +1834,11 @@ msgstr ""
 "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
 "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:104
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:105
 msgid "You need to specify a tshirt size in your settings!"
 msgstr "Bitte eine T-Shirt-Größe auswählen"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:107
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:108
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter \"-\"."
@@ -1805,11 +1846,11 @@ msgstr ""
 "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
 "keine Nummer hast, bitte einfach \"-\" angeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:230
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:231
 msgid "No Access"
 msgstr "Kein Zugriff"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:231
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:232
 msgid ""
 "You don't have permission to view this page. You probably have to sign in or "
 "register in order to gain access!"
@@ -1817,6 +1858,9 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "All Shifts"
+#~ msgstr "Alle Schichten"
+
 #~ msgid "Exports"
 #~ msgstr "Exporte"