From 5ae328b2b1d46b25131e2755939bb326efcdc507 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sun, 20 Nov 2016 17:54:16 +0100
Subject: [PATCH] hide event countdown for mobile clients

---
 includes/pages/guest_login.php            |  15 +-
 includes/view/EventConfig_view.php        |  34 +-
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 41205 -> 40961 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 471 +++++++++++-----------
 public/css/theme0.css                     |   8 +-
 public/css/theme1.css                     |   8 +-
 public/css/theme2.css                     |   8 +-
 public/css/theme3.css                     |   8 +-
 themes/base.less                          |   9 +-
 9 files changed, 299 insertions(+), 262 deletions(-)

diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 1e6ac41a..b7f85555 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -328,13 +328,8 @@ function guest_login() {
           div('row', [
               EventConfig_countdown_page($event_config) 
           ]),
-          div('row', []),
           div('row', [
-              div('col-md-4 text-center', [
-                  heading(register_title(), 2),
-                  get_register_hint() 
-              ]),
-              div('col-md-4', [
+              div('col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4', [
                   div('panel panel-primary first', [
                       div('panel-heading', [
                           '<span class="icon-icon_angel"></span> ' . _("Login") 
@@ -354,8 +349,14 @@ function guest_login() {
                           glyph('info-sign') . _("Please note: You have to activate cookies!") 
                       ]) 
                   ]) 
+              ]) 
+          ]),
+          div('row', [
+              div('col-sm-6 text-center', [
+                  heading(register_title(), 2),
+                  get_register_hint() 
               ]),
-              div('col-md-4 text-center', [
+              div('col-sm-6 text-center', [
                   heading(_("What can I do?"), 2),
                   '<p>' . _("Please read about the jobs you can do to help us.") . '</p>',
                   buttons([
diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php
index bf3ad3a4..37a19839 100644
--- a/includes/view/EventConfig_view.php
+++ b/includes/view/EventConfig_view.php
@@ -14,39 +14,39 @@ function EventConfig_countdown_page($event_config) {
   $elements = [];
   
   if ($event_config['event_name'] != null) {
-    $elements[] = div('col-md-12 text-center', [
+    $elements[] = div('col-sm-12 text-center', [
         heading(sprintf(_("Welcome to the %s!"), $event_config['event_name'] . ' <span class="icon-icon_angel"></span> ENGELSYSTEM'), 2) 
     ]);
   }
   
-  if ($event_config['buildup_start_date'] != null) {
-    $elements[] = div('col-md-3 text-center', [
-        heading(_("Buildup starts"), 3),
-        '<h2 class="moment-countdown" data-timestamp="' . $event_config['buildup_start_date'] . '">%c</h2>',
+  if ($event_config['buildup_start_date'] != null && time() < $event_config['buildup_start_date']) {
+    $elements[] = div('col-sm-3 text-center hidden-xs', [
+        heading(_("Buildup starts"), 4),
+        '<span class="moment-countdown text-big" data-timestamp="' . $event_config['buildup_start_date'] . '">%c</span>',
         '<small>' . date(_("Y-m-d"), $event_config['buildup_start_date']) . '</small>' 
     ]);
   }
   
-  if ($event_config['event_start_date'] != null) {
-    $elements[] = div('col-md-3 text-center', [
-        heading(_("Event starts"), 3),
-        '<h2 class="moment-countdown" data-timestamp="' . $event_config['event_start_date'] . '">%c</h2>',
+  if ($event_config['event_start_date'] != null && time() < $event_config['event_start_date']) {
+    $elements[] = div('col-sm-3 text-center hidden-xs', [
+        heading(_("Event starts"), 4),
+        '<span class="moment-countdown text-big" data-timestamp="' . $event_config['event_start_date'] . '">%c</span>',
         '<small>' . date(_("Y-m-d"), $event_config['event_start_date']) . '</small>' 
     ]);
   }
   
-  if ($event_config['event_end_date'] != null) {
-    $elements[] = div('col-md-3 text-center', [
-        heading(_("Event ends"), 3),
-        '<h2 class="moment-countdown" data-timestamp="' . $event_config['event_end_date'] . '">%c</h2>',
+  if ($event_config['event_end_date'] != null && time() < $event_config['event_end_date']) {
+    $elements[] = div('col-sm-3 text-center hidden-xs', [
+        heading(_("Event ends"), 4),
+        '<span class="moment-countdown text-big" data-timestamp="' . $event_config['event_end_date'] . '">%c</span>',
         '<small>' . date(_("Y-m-d"), $event_config['event_end_date']) . '</small>' 
     ]);
   }
   
-  if ($event_config['teardown_end_date'] != null) {
-    $elements[] = div('col-md-3 text-center', [
-        heading(_("Teardown ends"), 3),
-        '<h2 class="moment-countdown" data-timestamp="' . $event_config['teardown_end_date'] . '">%c</h2>',
+  if ($event_config['teardown_end_date'] != null && time() < $event_config['teardown_end_date']) {
+    $elements[] = div('col-sm-3 text-center hidden-xs', [
+        heading(_("Teardown ends"), 4),
+        '<span class="moment-countdown text-big" data-timestamp="' . $event_config['teardown_end_date'] . '">%c</span>',
         '<small>' . date(_("Y-m-d"), $event_config['teardown_end_date']) . '</small>' 
     ]);
   }
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 7e98477ddc7420ba2a6c24b45e681296d650cfcd..c3c35f2538a9cdc1934dbbf65f1c66cfff499d3e 100644
GIT binary patch
delta 10953
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

delta 11172
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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 0dbdafec..3d11f2fe 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: 2016-11-15 17:40+0100\n"
-"PO-Revision-Date: 2016-11-15 17:49+0100\n"
+"POT-Creation-Date: 2016-11-20 17:33+0100\n"
+"PO-Revision-Date: 2016-11-20 17:34+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -18,96 +18,96 @@ msgstr ""
 "X-Poedit-SearchPath-1: .\n"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:356
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:351
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:252
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:362
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:320
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:110
 msgid "Teams/Job description"
 msgstr "Team-/Aufgabenbeschreibung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:72
 #, php-format
 msgid "Angeltype %s deleted."
 msgstr "Engeltyp %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:77
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41
 #, php-format
 msgid "Delete angeltype %s"
 msgstr "Lösche Engeltyp %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:116
 msgid "Please check the name. Maybe it already exists."
 msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
 #, php-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:202
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:247
 #, php-format
 msgid "Team %s"
 msgstr "Team %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:274
 msgid "view"
 msgstr "ansehen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:183
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:16
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:102
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:277
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:328
 msgid "edit"
 msgstr "bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:226
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:184
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:177
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:42
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:120
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:105
 #: /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/ShiftTypes_view.php:16
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:57
 msgid "delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:231
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:282
 msgid "leave"
 msgstr "verlassen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:233
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:284
 msgid "join"
 msgstr "mitmachen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:216
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:29
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:35
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:65
@@ -177,7 +177,7 @@ msgid "My shifts"
 msgstr "Meine Schichten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348
 msgid "Freeloader"
 msgstr "Schwänzer"
 
@@ -233,7 +233,7 @@ msgstr "Schichttyp"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:320
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:63
 msgid "Title"
 msgstr "Titel"
 
@@ -252,7 +252,7 @@ msgstr "Ende:"
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:141
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:270
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:334
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89
 msgid "Needed angels"
 msgstr "Benötigte Engel"
 
@@ -265,8 +265,8 @@ msgstr "Benötigte Engel"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:44
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:107
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:122
 #: /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:39
@@ -276,7 +276,7 @@ msgstr "Benötigte Engel"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:402
 msgid "Save"
 msgstr "Speichern"
 
@@ -381,7 +381,7 @@ msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:130
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:176
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:241
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:309
 msgid "User doesn't exist."
 msgstr "Benutzer existiert nicht."
 
@@ -428,13 +428,13 @@ msgid "Removed supporter rights for %s from %s."
 msgstr "%s hat jetzt nicht mehr %s als Supporter."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4
 msgid "Add supporter rights"
 msgstr "Supporterrechte geben"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:142
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4
 msgid "Remove supporter rights"
 msgstr "Supporterrechte entfernen"
@@ -478,19 +478,19 @@ msgstr ""
 msgid "driving license information"
 msgstr "Führerschein-Infos"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:113
+msgid "Your driver license information has been saved."
+msgstr "Deine Führerschein-Infos wurden gespeichert."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:116
 msgid "Please select at least one driving license."
 msgstr "Bitte wähle mindestens einen Führerschein-Typen aus."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121
 msgid "Your driver license information has been removed."
 msgstr "Deine Führerschein-Infos wurden gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:138
-msgid "Your driver license information has been saved."
-msgstr "Deine Führerschein-Infos wurden gespeichert."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:127
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
 #, php-format
 msgid "Edit %s driving license information"
@@ -538,54 +538,50 @@ msgstr "Benutzer nicht gefunden."
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:214
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:224
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:96
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:228
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:94
 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:239
-msgid "Password could not be updated."
-msgstr "Passwort kann nicht neu gesetzt werden."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:261
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:265
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:258
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:21
 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:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:262
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:71
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:25
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:295
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:292
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267
 #, 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:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:268
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -760,8 +756,8 @@ msgstr "entferne t-shirt"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:165
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:180
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:208
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:224
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165
 msgid "Sum"
 msgstr "Summe"
@@ -807,7 +803,7 @@ msgstr "Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:6
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:339
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:364
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -938,9 +934,9 @@ msgstr "Nur bestätigte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:92
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:211
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:345
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:185
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
@@ -949,8 +945,8 @@ msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:94
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:241
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:186
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184
 msgid "DECT"
@@ -965,7 +961,7 @@ msgstr "Jabber"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:96
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:214
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:361
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:386
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -978,8 +974,8 @@ msgstr "Gruppenrechte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:263
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:77
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
@@ -1100,7 +1096,7 @@ msgstr "Anzulegende Schichten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:341
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:366
 msgid "Day"
 msgstr "Tag"
 
@@ -1108,7 +1104,7 @@ msgstr "Tag"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:67
 msgid "Start"
 msgstr "Beginn"
 
@@ -1116,7 +1112,7 @@ msgstr "Beginn"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75
 msgid "End"
 msgstr "Ende"
 
@@ -1229,7 +1225,7 @@ msgid "Answered by"
 msgstr "Antwort von"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172
 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:170
 msgid "Rooms"
 msgstr "Räume"
@@ -1368,14 +1364,14 @@ msgid "This user does not exist."
 msgstr "Benutzer existiert nicht."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:46
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67
 msgid "Yes"
 msgstr "Ja"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67
 msgid "No"
 msgstr "Nein"
 
@@ -1399,7 +1395,8 @@ msgid "Credits"
 msgstr "Credits"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:338
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:340
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:347
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
 msgid "Login"
@@ -1478,14 +1475,14 @@ msgid "Shirt size"
 msgstr "T-Shirt Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:337
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:346
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:400
 msgid "Password"
 msgstr "Passwort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:376
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:401
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1556,32 +1553,32 @@ msgstr ""
 msgid "Please enter a nickname."
 msgstr "Gib bitte einen Nick an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:340
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101
 msgid "I forgot my password"
 msgstr "Passwort vergessen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:354
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:103
 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:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:359
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:107
 msgid "What can I do?"
 msgstr "Was kann ich machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:360
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108
 msgid "Please read about the jobs you can do to help us."
 msgstr ""
 "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:364
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:375
 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:371
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:382
 msgid "Registration is disabled."
 msgstr "Registrierung ist abgeschaltet."
 
@@ -1769,15 +1766,15 @@ msgstr "Konnte Passwort nicht speichern."
 msgid "Theme changed."
 msgstr "Aussehen geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:83
 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:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:95
 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:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:105
 msgid ""
 "The administration has not configured any angeltypes yet - or you are not "
 "subscribed to any angeltype."
@@ -1785,34 +1782,34 @@ 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:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:154
 msgid "occupied"
 msgstr "belegt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:158
 msgid "free"
 msgstr "frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:178
 msgid "Occupancy"
 msgstr "Belegung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:179
 msgid ""
 "The tasks shown here are influenced by the angeltypes you joined already!"
 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:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:179
 msgid "Description of the jobs."
 msgstr "Beschreibung der Aufgaben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181
 msgid "iCal export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181
 #, php-format
 msgid ""
 "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1823,16 +1820,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:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:182
 msgid "Filter"
 msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:204
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23
 msgid "All"
 msgstr "Alle"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:205
 msgid "None"
 msgstr "Keine"
 
@@ -1849,7 +1846,7 @@ msgid "No data found."
 msgstr "Nichts gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:239
 msgid "Unconfirmed"
 msgstr "Unbestätigt"
 
@@ -1879,16 +1876,16 @@ msgstr "Möchtest Du den Engeltypen %s löschen?"
 msgid "cancel"
 msgstr "abbrechen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:256
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:264
 msgid "Restricted"
 msgstr "Beschränkt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67
 msgid "Requires driver license"
 msgstr "Benötigt Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68
 msgid ""
 "Restricted angel types can only be used by an angel if enabled by an "
 "archangel (double opt-in)."
@@ -1896,23 +1893,23 @@ msgstr ""
 "Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator "
 "freigeschaltet werden (double-opt-in)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:200
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:93
 msgid "Description"
 msgstr "Beschreibung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:70
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:38
 msgid "Please use markdown for the description."
 msgstr "Bitte benutze Markdown für die Beschreibung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
 msgid "my driving license"
 msgstr "Meine Führerschein-Infos"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:92
 msgid ""
 "This angeltype requires a driver license. Please enter your driver license "
 "information!"
@@ -1920,7 +1917,7 @@ msgstr ""
 "Dieser Engeltyp benötigt Führerschein-Infos. Bitte trage Deine Führerschein-"
 "Infos ein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:96
 #, php-format
 msgid ""
 "You are unconfirmed for this angeltype. Please go to the introduction for %s "
@@ -1929,78 +1926,78 @@ msgstr ""
 "Du bist noch nicht für diesen Engeltyp bestätigt. Bitte gehe zur Einführung "
 "für %s um bestätigt zu werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:135
 msgid "confirm"
 msgstr "bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:136
 msgid "deny"
 msgstr "ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
 msgid "remove"
 msgstr "entfernen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174
 msgid "Driver"
 msgstr "Fahrer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:175
 msgid "Has car"
 msgstr "Hat Auto"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:176
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27
 msgid "Car"
 msgstr "Auto"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
 msgid "3,5t Transporter"
 msgstr "3,5t Transporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178
 msgid "7,5t Truck"
 msgstr "7,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:179
 msgid "12,5t Truck"
 msgstr "12,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:180
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31
 msgid "Forklift"
 msgstr "Gabelstapler"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:210
 msgid "supporters"
 msgstr "Supporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:230
 msgid "Members"
 msgstr "Mitglieder"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:233
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:72
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:241
 msgid "confirm all"
 msgstr "Alle bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:242
 msgid "deny all"
 msgstr "Alle ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:259
 msgid "New angeltype"
 msgstr "Neuer Engeltyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:257
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:265
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:290
 msgid ""
 "This angeltype is restricted by double-opt-in by a team supporter. Please "
 "show up at the according introduction meetings."
@@ -2008,11 +2005,11 @@ msgstr ""
 "Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet "
 "werden. Bitte komme zu den entsprechenden Einführungstreffen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:311
 msgid "FAQ"
 msgstr "FAQ"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:305
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:313
 msgid ""
 "Here is the list of teams and their tasks. If you have questions, read the "
 "FAQ."
@@ -2020,88 +2017,87 @@ 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/EventConfig_view.php:9
-msgid "We got no information about the event right now."
-msgstr "Wir haben aktuell keine Informationen über das Event."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:19
-#, php-format
-msgid "from %s to %s"
-msgstr "vom %s bis %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:23
-#, php-format
-msgid "Buildup starts in %c"
-msgstr "Aufbau startet in %c"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:18
+#, php-format
+msgid "Welcome to the %s!"
+msgstr "Willkommen beim %s!"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:24
+msgid "Buildup starts"
+msgstr "Aufbau startet"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77
+msgid "Y-m-d"
+msgstr "d.m.Y"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:27
-#, php-format
-msgid "Event starts in %c"
-msgstr "Event startet in %c"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:32
+msgid "Event starts"
+msgstr "Event startet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:31
-#, php-format
-msgid "Event ends in %c"
-msgstr "Event endet in %c"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:40
+msgid "Event ends"
+msgstr "Event endet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:35
-#, php-format
-msgid "Teardown ends in %c"
-msgstr "Abbau endet in %c"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:48
+msgid "Teardown ends"
+msgstr "Abbau endet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:67
 #, php-format
 msgid "%s, from %s to %s"
 msgstr "%s, vom %s bis %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61
-msgid "Y-m-d"
-msgstr "d.m.Y"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:72
 #, php-format
 msgid "%s, starting %s"
 msgstr "%s, ab dem %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:77
 #, php-format
 msgid "Event from %s to %s"
 msgstr "Event von %s bis %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106
 msgid "Event Name"
 msgstr "Event Name"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:107
 msgid "Event Name is shown on the start page."
 msgstr "Event Name wird auf der Startseite angezeigt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:108
 msgid "Event Welcome Message"
 msgstr "Event Willkommens-Nachricht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:109
 msgid ""
 "Welcome message is shown after successful registration. You can use markdown."
 msgstr ""
 "Die Willkommens-Nachricht wird nach einer erfolgreichen Registrierung "
 "angezeigt. Du kannst Markdown benutzen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:112
 msgid "Buildup date"
 msgstr "Aufbau Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:113
 msgid "Event start date"
 msgstr "Event Start Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:116
 msgid "Teardown end date"
 msgstr "Abbau Ende Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:117
 msgid "Event end date"
 msgstr "Event Ende Datum"
 
@@ -2113,28 +2109,28 @@ msgstr "Offene Fragen"
 msgid "Your Question:"
 msgstr "Deine Frage:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:367
 msgid "Time"
 msgstr "Zeit"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:239
 msgid "Your shift"
 msgstr "Meine Schicht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:240
 msgid "Help needed"
 msgstr "Hilfe benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:241
 msgid "Other angeltype needed / collides with my shifts"
 msgstr "Andere Engeltypen benötigt / kollidiert mit meinen Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:234
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:242
 msgid "Shift is full"
 msgstr "Schicht ist voll"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:243
 msgid "Shift running/ended"
 msgstr "Schicht läuft/vorbei"
 
@@ -2165,8 +2161,8 @@ msgid "Become %s"
 msgstr "Werde ein %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:263
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:265
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:269
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -2234,16 +2230,16 @@ msgstr "erstellt am %s von %s"
 msgid "edited at %s by %s"
 msgstr "bearbeitet am %s von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:53
 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:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:54
 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:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:343
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:368
 msgid "Location"
 msgstr "Ort"
 
@@ -2417,7 +2413,7 @@ msgid "Prename"
 msgstr "Vorname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
 msgid "Arrived"
 msgstr "Angekommen"
 
@@ -2430,12 +2426,12 @@ msgid "Freeloads"
 msgstr "Schwänzereien"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:313
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:352
 msgid "Active"
 msgstr "Aktiv"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:314
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:353
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
@@ -2463,80 +2459,80 @@ msgstr "Schicht startet %c"
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:280
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:305
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:308
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329
+msgid "driving license"
+msgstr "Führerschein"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331
+msgid "Edit vouchers"
+msgstr "Voucher bearbeiten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333
+msgid "iCal Export"
+msgstr "iCal Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334
+msgid "JSON Export"
+msgstr "JSON Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:347
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:351
 #, php-format
 msgid "Got %s voucher"
 msgid_plural "Got %s vouchers"
 msgstr[0] "Einen Voucher bekommen"
 msgstr[1] "%s Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:351
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:360
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329
-msgid "driving license"
-msgstr "Führerschein"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331
-msgid "Edit vouchers"
-msgstr "Voucher bearbeiten"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333
-msgid "iCal Export"
-msgstr "iCal Export"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334
-msgid "JSON Export"
-msgstr "JSON Export"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:344
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:369
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:345
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:370
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:371
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373
 msgid "Your night shifts between 2 and 8 am count twice."
 msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:374
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2545,7 +2541,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:359
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:384
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2554,15 +2550,15 @@ 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:362
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:387
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:398
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:422
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:447
 msgid ""
 "Please enter your planned date of departure on your settings page to give us "
 "a feeling for teardown capacities."
@@ -2570,7 +2566,7 @@ msgstr ""
 "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
 "Planung bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:432
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:457
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2579,7 +2575,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/includes/view/User_view.php:443
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:468
 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."
@@ -2587,11 +2583,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/includes/view/User_view.php:453
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:478
 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/includes/view/User_view.php:463
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:488
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter \"-\"."
@@ -2611,6 +2607,15 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "Password could not be updated."
+#~ msgstr "Passwort kann nicht neu gesetzt werden."
+
+#~ msgid "We got no information about the event right now."
+#~ msgstr "Wir haben aktuell keine Informationen über das Event."
+
+#~ msgid "from %s to %s"
+#~ msgstr "vom %s bis %s"
+
 #~ msgid "Please enter your planned date of departure."
 #~ msgstr "Bitte gib Dein geplantes Abreisedatum an."
 
diff --git a/public/css/theme0.css b/public/css/theme0.css
index f623f239..4c09a094 100644
--- a/public/css/theme0.css
+++ b/public/css/theme0.css
@@ -6731,7 +6731,13 @@ body {
   color: #777777;
 }
 .first {
-  margin-top: 20px;
+  margin-top: 30px;
+}
+.text-big {
+  display: block;
+  font-size: 30px;
+  line-height: 30px;
+  margin: 0px;
 }
 .panel-primary .panel-heading a {
   color: #ffffff;
diff --git a/public/css/theme1.css b/public/css/theme1.css
index 163e9b1e..3b5201b6 100644
--- a/public/css/theme1.css
+++ b/public/css/theme1.css
@@ -6754,7 +6754,13 @@ body {
   color: #888888;
 }
 .first {
-  margin-top: 20px;
+  margin-top: 30px;
+}
+.text-big {
+  display: block;
+  font-size: 30px;
+  line-height: 30px;
+  margin: 0px;
 }
 .panel-primary .panel-heading a {
   color: #ffffff;
diff --git a/public/css/theme2.css b/public/css/theme2.css
index 0fd65393..07f2ea10 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -6731,7 +6731,13 @@ body {
   color: #777777;
 }
 .first {
-  margin-top: 20px;
+  margin-top: 30px;
+}
+.text-big {
+  display: block;
+  font-size: 30px;
+  line-height: 30px;
+  margin: 0px;
 }
 .panel-primary .panel-heading a {
   color: #ffffff;
diff --git a/public/css/theme3.css b/public/css/theme3.css
index 78d58f0b..2b5358be 100644
--- a/public/css/theme3.css
+++ b/public/css/theme3.css
@@ -6740,7 +6740,13 @@ body {
   color: #777777;
 }
 .first {
-  margin-top: 20px;
+  margin-top: 30px;
+}
+.text-big {
+  display: block;
+  font-size: 30px;
+  line-height: 30px;
+  margin: 0px;
 }
 .panel-primary .panel-heading a {
   color: #ffffff;
diff --git a/themes/base.less b/themes/base.less
index f105377f..713119ff 100644
--- a/themes/base.less
+++ b/themes/base.less
@@ -11,7 +11,14 @@ body {
 }
 
 .first {
-	margin-top: 20px;
+	margin-top: 30px;
+}
+
+.text-big {
+	display: block;
+	font-size: 30px;
+	line-height: 30px;
+	margin: 0px;
 }
 
 .panel-primary .panel-heading a {