From 60ad343b22ab3cff886e8a8c0f57d40bbff8dcfc Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sun, 13 Jan 2019 16:04:01 +0100
Subject: [PATCH] fixes #178: Show not only next but also last shift in free
 angels view

---
 includes/model/ShiftEntry_model.php           |    2 +-
 includes/pages/admin_free.php                 |   36 +-
 includes/view/User_view.php                   |   17 +
 .../lang/de_DE.UTF-8/LC_MESSAGES/default.mo   |  Bin 44970 -> 43682 bytes
 .../lang/de_DE.UTF-8/LC_MESSAGES/default.po   | 1909 +++++++++--------
 5 files changed, 990 insertions(+), 974 deletions(-)

diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index 248e7d1e..54837bac 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -206,7 +206,7 @@ function ShiftEntries_finished_by_user($userId)
           WHERE `ShiftEntry`.`UID` = ?
           AND `Shifts`.`end` < ?
           AND `ShiftEntry`.`freeloaded` = 0
-          ORDER BY `Shifts`.`end`
+          ORDER BY `Shifts`.`end` desc
       ',
         [
             $userId,
diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php
index d2facbc8..1b116805 100644
--- a/includes/pages/admin_free.php
+++ b/includes/pages/admin_free.php
@@ -26,7 +26,7 @@ function admin_free()
 
     $angel_types_source = DB::select('SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`');
     $angel_types = [
-        '' => 'alle Typen'
+        '' => __('Alle')
     ];
     foreach ($angel_types_source as $angel_type) {
         $angel_types[$angel_type['id']] = $angel_type['name'];
@@ -49,18 +49,21 @@ function admin_free()
         ->groupBy('users.id');
 
     if (!empty($angelType)) {
-        $query->join('UserAngelTypes', function ($join) use ($angelType, $request, $query) {
+        $query->join('UserAngelTypes', function ($join) use ($angelType) {
             /** @var JoinClause $join */
             $join->on('UserAngelTypes.user_id', '=', 'users.id')
                 ->where('UserAngelTypes.angeltype_id', '=', $angelType);
-
-            if ($request->has('confirmed_only')) {
-                $join->whereNotNull('UserAngelTypes.confirm_user_id');
-            }
         });
+        $query->join('AngelTypes', 'UserAngelTypes.angeltype_id', 'AngelTypes.id')
+            ->whereNotNull('UserAngelTypes.confirm_user_id')
+            ->orWhere('AngelTypes.restricted', '=', '0');
     }
 
-    $users = $query->get();
+    if($request->has('submit')) {
+        $users = $query->get();
+    } else {
+        $users = [];
+    }
     $free_users_table = [];
     if ($search == '') {
         $tokens = [];
@@ -86,6 +89,7 @@ function admin_free()
         $free_users_table[] = [
             'name'        => User_Nick_render($usr),
             'shift_state' => User_shift_state_render($usr),
+            'last_shift'  => User_last_shift_render($usr),
             'dect'        => $usr->contact->dect,
             'email'       => $usr->settings->email_human ? ($usr->contact->email ? $usr->contact->email : $usr->email) : glyph('eye-close'),
             'actions'     =>
@@ -96,24 +100,16 @@ function admin_free()
     }
     return page_with_title(admin_free_title(), [
         form([
-            div('row', [
-                div('col-md-4', [
-                    form_text('search', __('Search'), $search)
-                ]),
-                div('col-md-4', [
-                    form_select('angeltype', __('Angeltype'), $angel_types, $angelType)
-                ]),
-                div('col-md-2', [
-                    form_checkbox('confirmed_only', __('Only confirmed'), $request->has('confirmed_only'))
-                ]),
-                div('col-md-2', [
+            div('col-md12 form-inline', [
+                    form_text('search', __('Search'), $search),
+                    form_select('angeltype', __('Angeltype'), $angel_types, $angelType),
                     form_submit('submit', __('Search'))
-                ])
             ])
         ]),
         table([
             'name'        => __('Nick'),
-            'shift_state' => '',
+            'shift_state' => __('Next shift'),
+            'last_shift'  => __('Last shift'),
             'dect'        => __('DECT'),
             'email'       => __('E-Mail'),
             'actions'     => ''
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index c2bf4a06..4768f4ac 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -320,6 +320,23 @@ function User_shift_state_render($user)
         . '</span>';
 }
 
+function User_last_shift_render($user)
+{
+    if (!$user->state->arrived) {
+        return '';
+    }
+
+    $last_shifts = ShiftEntries_finished_by_user($user->id);
+    if (empty($last_shifts)) {
+        return '';
+    }
+
+    $lastShift = array_shift($last_shifts);
+    return '<span class="moment-countdown" data-timestamp="' . $lastShift['end'] . '">'
+        . __('Shift ended %c')
+        . '</span>';
+}
+
 /**
  * @param array $needed_angel_type
  * @return string
diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo
index 7411a1bea5734460acbd23db6dea57f6939c827b..671fe8c5dd9c18991cd7833429b27d20b1caf20e 100644
GIT binary patch
delta 12534
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
VJzksqygXw!|618IcUP3x{{i6LTf6`O

delta 13792
zcmajlcYIVuzsK>D0tqc4kkBEA7D`A$Lhm&YdW%#M60%8FlU>|w2q3yh6-7{&CJIWo
zV8Im|hzcq^77*JbiXhlUL{Jp5-Oo2?qWR<A*F7(PdC$z5GwsZrgy;2a{UH32)8T<r
zbt2bVT)o0As|o%bXIa0IeygQQE$hiN%W8ppuo=FOt?(zTg$+7d7LQm-7>nJpIc8xJ
zUXN<(ZsT55dnb_o0@fcSYEaNH-Lh(9Ypjl4u{{nj7GYKL>y4XH9qvF4WG_bHA&kH`
zu?`-?csz@$|EtMIWmr}M{aZ~))Z|76>VbY3hvQK*&BH3V0@d(pV-Pja^;iwJqK&&z
zEATez`3u+p<2x})OhHX_C^n;iYch#sEJHoG4K>r(P!GO^P4P=i#E8yLhb=LId<r(g
zL8$uIp$1llYG)Cu!xgBN-iUQ@Ck8b0=S{)us3kmsF?a^Gv_E1r{$<Lex;QIT4~J3S
z7S)jtwZ!vKE3yLBVGz~N1E_X)<3ilmh4t5x_U`ID*dH~3v8WkOMs+*~^-2P$ncj_>
z(Qa&wFQT6N9991u>XrSB_3$cch2y$81L=c$et0+5Uo)I$3f!ornU8AlPK?C0#*L^M
zK7bnd6Q~)5P%Cf{HS_;qU3|~@H71b%9ku)8x;xKx4v^3i4MM%UF~&k{N&Z&kKWhg+
z+Ttlp!>Arkz8mI{pNSptAojrvsOM99I>&Y#DnA=J0M;5*JAv0p=z(9bA9n8LG~`F+
zw;*j<XHYY2+}jy>3)E7lqsn`tz7GRXD>oC>VIgWWu0*ZedeqYILRKzdJx4-Ib{O?4
zj-!_DG)CZ0s8{eSs-r(p4Mi|&ZK}Gc4s1-qWYkiRH}?xsuc#DNZwadX)mU5Se;Wxk
z^fYe8S5O`2^>toNA=W4FM-5;ls-Yli$v2~(f79Im2(>b&QLpwJ)C7Ju`QK1WUxnqZ
zPXAUHC9pqgB}SkgxW<%EMRnl9k?6x__!4R*PN6#b0k!m3kqvK!_jk&B;26uYGEtjv
zEo!Bn!+<u`X%e~-J;0e^GHM1HsMF93o8xHYKWjEW+Tl|ek0&t)FXCpLFwkk|61F1$
z8|s)g8{|xEFlrAB8^ro+=2I!q3|y!sz7aL!xu_LcimJET<Ts+~ZAT6CQB(djMvy;%
zI{ybz^^Tz0JBAT>617sF4GK7$;~P`(E2_c2Q4dBBb}GiA22kJRTcGN-N3B37RQ)WB
z#4)IWXPf+WsCu(dn|v;6Q!Wdbg0&by!8X)LcbW31jR%eIpgKN<k@&SK{~ooguNq@A
zosL?d>UBgt*9F6|FP48%2awPvnt&S7EYv&qq2AF_Y=rCZ2Hb--HXY(L+!yug24O=S
zgH6zlT7hM#8Q+C!f3xv1?5Oj<pM++9-rTr|8mTqZ`F2-BjnqaBGy|*PK$Fix4RA8*
zn3kXhatG?U9jF04i)r{iCSzn4tD*DXkwgjw`KSigppCmx@9b?<181=T{*B$R!7wL3
z*67A|lrKVNX6?qd_$g*!)#02Z?1B2CmZDAn))OSu!8@pPeIDCj%@NM;`_8C=Wn+6R
zLd|eJ`fv|=u@xVOHMj;<uiYr8UN-8R?=krYQSHBg0evdZl8{%hF~*E`mb5)8pK0<r
zm`r{FYQPVn2K*XouY7@O_%fzq(=pBpj6|(WDUQPjP%Ck94C^07B4w;|%(`G2`93CJ
zjMd4PVr^WA(Repj!;Prtx0~|asFm4^TCrnT8^1RBE2zy~n^EZ1v>eC!tKvusYGEF>
zKp(2(wRjyqi1YAotcvr-JG*}&s)MCi1J|K8=T_rG7)$<f;{nuhJc>>6y#NU{co8*#
zE2wi^b%L|`8lh&KhH9ug*1;^)Os8QCmZF|tg8GZ+9@OT2*pweYy_&aB-<O|J&jrG=
zor2n^nKVVsJQY=;2Wo&>=KdJtOyiBHSFs4ShgM=dZbh~8tnnbK{kKsQIfZdL|38q>
zJG8EGmL?jtgtbr|*G1iLg!)djKrLYss^er-M_o|$`lD7X3tQtjQ(lG%<O4{@)>^Ek
z^S_G(zo4wWn2%SmGtQW(4+O^v`IEqU1N&n1B<DO2MgC~A=3@`si-~x_l*dkXcKvW1
zM!6sL>JFe*_Bdwh{C`G54<=11|L9pma31+pNLyC)RLd&HnRp`}#WC1_nsW^A!sX;2
z!%o=cTIUZFH#Q`{4%PmXCjSm<1;4|9mf`{lEqT~<XUU^b`4~*Vc+`@%NA2=X*dF_#
z-s$zG{3g_^SdN<EJ*alJU_9<ZJ-;8d5=W-9{u;?Arov~~fc#}_iZPr$?dlF#7ki>+
zG#a&u3Q---H7-W&fmPTY*P&MI7<R=0Gc0Qq&P5I2^%((Yq$en-Pr)~+O=Zn=8m^9-
zNdoGAD`RhCHfn%HsF}`3ZPJCPc9x)4a258(?WnzV2K5E37vS$Ey|eL{hs&@7p2KF?
zAeTn58#c$MQ04C<ld^uo#yEZ!uK_*S0#9H|`~#EFrg2SVD9*--n1X@BB-|t}qXsg=
z<;*mQCFCDPJ($SRsE4V>Ow=p77SnM)rr~ZJfhSR)*tP}EDH(@qe<f<gUPhh^SVu|p
zp};D1{=v}~HKSWl?{*{VUG2aKd=9nL`!Na+qBhkV7>OTZRs6)<KWpxPhjl6c#oVvX
ztYdWk<4EX18>6u`YICKc2GZBupNbmD4AcO8sE+5F`%6rI1tw9x*5vmakD&T_A2sk3
zlK!nTB-G%ys0J^fzR|y<I*jJU>Vd|_mZ*UyqfSd_)Qm@=mNpyp%5qWd-iYeB46EY;
z)bq<Rpc{9Q(05=hYKeDYQaJA(+mL^^$k|L+u@(7d#m>1OgnBL;)p0(mz8_WZer$)Y
zU|T$g+LZAg=YDq&>tBt6=@jTgQh*xST-1ZNqL%Ve)C}K6&FBQG<I|{>x@hkIg<8QX
zUgs3Vp*rl0+Psrd$I**6F7>kh`ZDdLpb_pf6+T2Ax9?FM#&Bk2JZi-nVRcNzTG$>F
zu{&z!ld(14Y|6KxP5uyS0AHB=)c}b!3L4+&%y<N9rlqKNy8zYTT1>_lP%HEmYDO1O
zU&N|DM;kS;o~S*OiFI%kYGr1kPC*fB;DLoC>X2B4dT<NI;cl#r2T%_l!&v+T)$uu;
zfZ-+1%1p#M<gZ1&60dQAaRtUuz7E+|)(&JP16FOn^QlZQCZb+NJJf&%qh>e;^<{Ho
zJg&r4+=80vJE-~}p;qv7)bafeyJ6K*XU2U|6Bvngb^d3Oh^L^;xDwUi7Sy|b81?QS
zN6p}A)G0Y+@`q8c<U`a-oyNL&4ioTi)C3adIHw>DHGs)jQ|I4HLKPOEX1)&fuJ>Sj
z{1j6#y3CnLS5&zN`9xUvVrPt)>)h{-I&QO3_3kykik-+`z#iCg9_v4l#B>rv@j>j0
z-(Y`C<Tp<*oQYb}`%#-_8)`-NnDS>)9Ud_Ezc%^HsJ+zeCg*obM{Gzw3$-%2H?jWO
zRC6iNE4a;6*o0d8XHgyPHy%W7t|O@WAE4g(cc>M*jE%A70_PR<Lv7*-s8^F`%4een
zwqyb8uNkeQ;BnlJdbbm9c6R$D)T<~!tw0d9H#VX+-&WKFj-x(gXHWw?hwAVOY9f)h
zIQeSWgM5O?j|q^_45pzrS3YV0rKn9c4>i+8I2zZZz87C%1FUBzkcO(?2m9g>)WDYF
z6kLn?AYCvfEOb8AfnFr^?q;E8uo5-Hb=U|uqduX}V<vuzN!apM=e!Tc#pI{s{dfj7
z^IH}<e;3@29mwxTt;Dye)A0k+U%(3IX+2OAwZsijE0KtrQ7Y;cbu;-)RK3v{f!ClK
zo?`OXq4rEJs$L;#CA_9QfLigTSWoBwE)tsYF5?rZj-N$Ud>J*MH&H9}F>1hHU{m}N
z)nUvM$9PnSjZgz?kD75BYBLT(ZN6-k)4!EZA_C`|3b&v-T#agIvnhWZHK3O;65l}G
zKZf=3H0pT$is~?KsZ+1DvAr=3Rj)Ia|NDP535_fdbuLRyg*&hv`5m|dkD>O;lx5CL
z7oncJ4V&S;s6F!>Y6agz4e+G#d(^A^1N&h0<*a{I5?RZgT|Nf&U><59#i)@kHu+5$
zMLuNm`%vfoxXGVKotB8(oPjk!4X7RV$HCYWm!byn@@=et8i~Is&~Zv-nr(0>s$(xU
z#}%mikK%BA71eR<?aopsqjq^e?1n|CPwjT>fgj;StaC^CzjG}&wj%#hfJ6%tUtmj&
zTIoEHj4F4bI=T(p;dWHLqgaTSa3)T>lWzp>$F|sSmGfL7jwHXt<d35!d>*xV15H;u
z|A_2`i4;sW&PAL22GqNK9`(E7Ba@H4%Na;2YO{^Ubj&wyz!dUtU<O`64J7$)UIWg>
zD4qWoNkmid8aBbBs7-PXYv6CF-CgA#XVW#s>f~EuZA`_Q*bg;<k*HT!gmJjc<Ts$&
zc?z|XZ<ObG|38z^W~&)=zV$6o9goJTI29SZwHLKnhpcgq)hMh(emtrp7goVCRK1(c
z{UsPremz#h-Kbal3|66k>jVkS;52HJeQ&I?)>(;Ws9oFv>)}vrjn|<DumrUd>rt=j
zA=C;SHsxoqJNZi(kICzt3HQhHfB#P;QI{KqsHI(CDlA8hc$3NRLM`Eos8{s?s{SR^
z!2d)IwBCAWLg^SwzAtKpMq_=PiK;huJ?~!~1Sw!MSesBwx5K#Gl!s7DyU&!rf_m<V
z@m<vOCsBLp3+#&LO?j&gW(83zH5B!VCvRZ=hmy#nz=ON7J2t-8F&p)vxD$Kho0yEz
z8=VhHXQLN&o*%(1Jcg>*;6CS=4#r00A49G55lq9A0TOy=HTm5+6_ar}F2gApvx(Kg
zLeyUQ1Fyveo1G8S3A~Q{@0gBLA8`IKS&2=_@59D;0vqCGjKtUnomUiyC!wWnj#~OQ
zCZCFl<U6Cvvr$Vs4Lf2UYAM&EUd2w-{U=e!_jy!DhcN-)LT&Q1CVv5`AF!%yaXN~@
zCR9j8ec?u+I`E=Kz7RE&jo1L6K{a^HcoH>`Z*ds@gxj&tR_A}-JB!8STW@n-K@j7$
zrn^X}!TqQPKfo9~YrJUgt2GUzp|KNccaK7?;B*YfS*XpJk9yZ0?2n6ZARfZrSak;{
zgZ`~SB)qDC+BBCi37hR?c`*~);3udRh}h-SPsG;bS0mprYcICJtcRR0+-y{SBi6@*
zxBx%K44m{Z>t9CVb`okR{1NAa(iSI@?}b{Cd(g%QP@C#y)Id(527DFutxtNCuOnt-
zTf7f@;j5?_Tf3dT(Fb)rN9<<(`;u5hK|g#2+hN#aPQ_%@7p@0J;7E+du~;3ap!P@}
zMqw#d!<(@NE;sjss7<&X_52H{b`L$q`m5kW3TokL<9XD(`yJI$?BmW7Ho~gpGq5K1
zz(^c|>Tm?6;3Sh@YP=gYuuaBY#ytU(*k^nVHPU0K&Gsd#;lGVFo^S?GAL~)x4ApQK
zjKO}W6&a1SaE7^GjB2M0HQ~jm6$`8+p`}=Z+P%9l4BPYL0uCj{6FQoDRl3?!F%832
zk*f}Np{x^rMgD>EQuYD9Pqb3Q=K9ju+9?ZIA6DEk&Z3dmiT5g%XOaJl{A%K5(yfRs
zq#wi@L<#9=8hjcTkiQe3!)AB~h7r0Fu?qF_oUHYH`8So!Yure}U+^blGwJ<AI+fE1
zosM0UHzM7guu1<&R9yOg=ymlsW%ck1afq_ZL`R;v2G0{MNms#SEbrfgg9%+f62pk0
zJe-PmVHR${zlm#!hl$T9JB#|Ak&lOnSVC7bqtaFB<Yx3M!{sF!aleYGqwkN^RU_eQ
zNrZ@xxLJzN5SvJ^AaczEb*UR?>T}zAhlnNg%SYFLh;HR6=f@(Rn@m!h%{I^dX6|<j
zGwXk+I-u}6Lc976q6=kHh@+%u5Z9Bw8(&22^mAB~h@jCY@i9WzG2#qSjq*S6S<2^O
zAtn<akp7u?lo%XVK7UeNBf0q%v5=^^J|=NnrTjCb%S^r}rdPVRgt}{qN=;hR$=6{Z
zA7Lxv73xQuX9~#oP-PDVPvFu@jq!{X!w>z>u(weDDf!CR=ceus3Xhl@J#nc?cjvy3
z_=9+yI6{mfe&PN@Sf9}MATWy`K{7X)2VcWwgue5-`V(!4b{bKos}|3!Am6T1nUZ@<
zz6SMgAl($>sXK?zHIcZ_q+beSkLOcxMR&M15J93X75b_Y4^O}oByFNr@J!3PflN{(
zh+RYj)#AF}sPq8R1BoVtKHeqfo(lseol47pa&HxJ!j!EcJ)G!7R9qXmcN>|_rVhz~
z^);EQr2b0`Ad-n?rovv*7l{Xnc`74z65pEp*HWZwJNcjRZ5%?pK)Nx5>Vo=ZT}bGP
zB(@UKM04tWt^K86+AomNb&pZ$lf*!xHf8tXd~?r@pH!;HEo%h%JmL$|OYnaDftW!2
zN^~a1QeF-B;nS*19MqPLWTaEc=r>2@t0iSuiFSm34UHpeQTHBvi+GXHRiCn+#D~;d
zPrf<nZ_Dre`(rxyE)l1Q<Np?0fltUBrZ5rbVlgqC(4}9#Hxh%03#P1?w5~8Z`5WUX
ze-~58|HssM-}sI3Rqne~hdh6jSl8eh=U%|Ng@Q;j=ZRiKYhny>fY9GXEok^6=?J1N
z=^>OA5q-#4BlZvp<Zs8`_z0ovERjL|XYoE2aGjyfL83e9hS;X!la)qBS7#pRYSN?0
zN0EMj=tX)ZaTjrlxRvNf+`zqCiHhqqi5@1OfghW62i#4>={|j|Cw;vh3J@8@SY@~#
z;YM30X}yGd$=^)eNa&hvbaH&;$^TxdY#8a^h+iv}bu^V<#+xXA6T2~p1sIsgk2Yj<
zjdHMJ$*-bf4*5;QPU1OY8f8Ba<A}rLb=5Y{&L{mR<?j*S6OWbO<&QVgx07Cp^{AUj
ztRw#p`BeSNdV<7TgsywBnQ1VI^ghZu;zRfp&LAc!P3XEx6j1gC@hEYOSWf7wNsK8^
zIY0cST)8>KN%GUQ{%?|KNT)3-Rp?{}v5krch}pzybN?@61ZBGFl0WApt=^T|SZK<`
zOv*c${M-02(OGr%{=X#Alo&)@Ce{%j5IID}Ro5gMo3iIIlc>o+H=29ZNxMyY8}}NJ
ze;2>0Xaqy#_Y*$SuVP>%iMhl?G6`nZlSx-x{YV!PO}Mw1!Vb9I+<e@)2))#K-Q>k*
zmD)H?x)Ei4D&7AtWjiYVWC^FyEfiEI#uEvIuJ4Ffh$!y2z~)3%?tN$Oll|v9O4%JI
z*B*a2>9v$!BK;(BH|f!po;|JeA45Slv6#^RasN}?N^~_1d~S^A-g464o4oj$dZk1>
z=_x8`oo5%iie|ffw#VhlbLIV8Q1VYni9O5f$#?sTU3qqJU23M?x}<}h@ADRuu>D?s
zS}G~==lJ|?Pl4S!bRu<lczA&;*gU;)FgLwnXlnZ5$f!X+SDxEn60*C#6d8)`H88AZ
z<u*dYdbbE~M1ym@rLziMK5MAgul7y0B$VHGOjwMYq7GJ;x7g+PmU%*<e%->W4$sNW
zb@_td4oD5Q7<j3MW?`2Ux_$nVVBDbFLpukRgw^sC&HHx}!TOm)YZka{4?X02OFenP
zX_<o~3%wp!Xj5iVSn$pvH5y%C-l&~3YZev!w%e2M^%dv%-Cj@Vg(1IJ54}2WUzJRk
z&t<zyY}T;U^Y0SncnVxa{&}-qsa7@<aoIV<|5c|XHMn5XM}@B99Cwl0$|?1G3tS$T
zFUQX`ay-1A9Nq*Y&2_mvc8R;d<H}35r+7>40t)?wJmWl^>zb8QTH><jaZ5e=Tm|kD
zKmF%1dMYvoIvYLty8u%v$}?>`3t)SF<<I4LJ#GB-ILBqPC5qi8B}`bac#hjuX1o1P
z$FqIj+?-riw7epBH7a#ND;2#u**x|Y_X~2k$x^yXN}5~Qp|mM8Y9*Dgj3#UsQ=G%=
zV1>&EQNAmj@%9YenI9Y0*3L-nSbgl6>=d?8`8!A%%<}ZKGdiYsOG(d2$>?FH_vqO%
zJ@|4#<67OzOET<^9ebvC41QDaW$<X>bHM@bgp~B2c4~EP@GMtRJ|oL@c@90}cNh5o
zx3b_R_p~P3)^nVFo~sw_Z1kL5JI_@d8g~88@CX(-_<d1gD7M&L<)0m1=4)3abf#=a
zSgkoMADh^DI24#SD?BaJ?cqfZE%leM%~_XR*A3p{VwcCF-an<Te~LqAZYm3l%gQM#
z(n0HBP4X6cygq+u(#<#hv-OV$(nE0z>xb1HSTQ4)ot-klIRkBOeJJ$Vt#5|KjxN=d
zOZ<nnYtF9VBa5@+C%D{x4uX4Dq2DfW<#QHXp5UL0$3|tlid^|#Pw<u{iJ=>oB!{&<
zw4XyZ+jnSxzKhv22irM!_5gE4m{&ngt}C=^>D-#32KOwlIw`ZnE^y~^irH-CJ>>gb
z?gAI{&MES{{H#J|#ZmDzxBkD{|5Og%x8YpC&P*AlBU4uD%j1M`YIHhjnrU!)+%BJ=
zLz!n6mzI>+c{%JhGX_qx%SSz`@c!*G7tecA?ZKrwXns4-?cxlX#w%V;2ddE*b=>9O
zJfAC8XUpk@ck53LExfm8*m&1m(&b${^Yv=~SG0VC7R_T%EiLf5^Yc^fQLZ9JKA45!
znA@er6?g3UrMAmgzC@npp}@w!Vp0lelaGVnE?@W2IU2p*80TF(Q9CUE(0;n2v}b6+
I!%1QP1F@0t_y7O^

diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
index 3f54c381..d4ceb846 100644
--- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2017-12-29 19:01+0100\n"
-"PO-Revision-Date: 2018-10-05 15:35+0200\n"
+"Project-Id-Version: Engelsystem\n"
+"POT-Creation-Date: 2019-01-13 16:02+0100\n"
+"PO-Revision-Date: 2019-01-13 16:02+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -10,160 +10,160 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.11\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-KeywordsList: __;gettext;gettext_noop\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
-"X-Poedit-SearchPath-1: .\n"
-
-#: /Users/msquare/workspace/projects/engelsystem/config/config.default.php:113
-msgid "Please select..."
-msgstr "Bitte auswählen..."
+"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem/"
+"includes\n"
+"X-Poedit-SearchPath-1: /Users/msquare/workspace/projects/engelsystem/src\n"
+"X-Poedit-SearchPath-2: .\n"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:13
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:247
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:759
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:828
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:502
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:499
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:598
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:460
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:496
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:593
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:135
 msgid "Teams/Job description"
 msgstr "Team-/Aufgabenbeschreibung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:89
 #, php-format
 msgid "Angeltype %s deleted."
 msgstr "Engeltyp %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:54
 #, php-format
 msgid "Delete angeltype %s"
 msgstr "Lösche Engeltyp %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:135
 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:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:74
 #, php-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:344
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:203
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:341
 #, php-format
 msgid "Team %s"
 msgstr "Team %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:292
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:382
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:409
 msgid "view"
 msgstr "ansehen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:300
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:294
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:44
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:387
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:465
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:547
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:414
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:512
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:607
 msgid "edit"
 msgstr "bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:305
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:243
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:60
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:76
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:15
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:22
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:28
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:16
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:470
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:517
 msgid "delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:316
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:535
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:310
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:532
 msgid "leave"
 msgstr "verlassen"
 
 # As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation "Engel hinzufügen" for this button.
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:322
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:540
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:537
 msgid "join"
 msgstr "mitmachen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:359
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:353
 msgid "Angeltype doesn't exist . "
 msgstr "Engeltyp existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:114
 msgid "Event config"
 msgstr "Event Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:53
 msgid "Please enter buildup start date."
 msgstr "Bitte gib das Aufbau Start Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:57
 msgid "Please enter event start date."
 msgstr "Bitte gib das Event Start Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:61
 msgid "Please enter event end date."
 msgstr "Bitte gib das Event Ende Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:65
 msgid "Please enter teardown end date."
 msgstr "Bitte gib das Abbau Ende Datum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:71
 msgid "The buildup start date has to be before the event start date."
 msgstr "Das Aufbau Start Datum muss vor dem Event Start Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:76
 msgid "The event start date has to be before the event end date."
 msgstr "Das Event Start Datum muss vor dem Event End Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:81
 msgid "The event end date has to be before the teardown end date."
 msgstr "Das Event Ende Datum muss vor dem Abbau Ende Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:86
 msgid "The buildup start date has to be before the teardown end date."
 msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:89
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/public_dashboard_controller.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:275
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:55
 msgid "Public Dashboard"
 msgstr "Öffentliches Dashboard"
@@ -188,7 +188,7 @@ msgid "You need be accepted member of the angeltype."
 msgstr "Du musst bestätigtes Mitglied des Engeltyps sein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:208
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:125
 msgid "This shift collides with one of your shifts."
 msgstr "Diese Schicht kollidiert mit deinen Schichten."
 
@@ -201,19 +201,19 @@ msgid "You are not marked as arrived."
 msgstr "Du bist nicht als angekommen markiert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:129
 msgid "You are signed up for this shift."
 msgstr "Du bist für diese Schicht eingetragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:265
 msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:324
 msgid "Shift entry not found."
 msgstr "Schichteintrag nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:347
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:346
 msgid ""
 "You are not allowed to remove this shift entry. If necessary, ask your "
 "supporter or heaven to do so."
@@ -221,300 +221,294 @@ msgstr ""
 "Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage "
 "deinen Supporter oder im Himmel danach."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:352
 msgid "Shift entry removed."
 msgstr "Schichteintrag gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:95
 msgid "Please select a room."
 msgstr "Bitte einen Raum auswählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:102
 msgid "Please select a shifttype."
 msgstr "Bitte einen Schichttyp wählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:109
 msgid "Please enter a valid starting time for the shifts."
 msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:116
 msgid "Please enter a valid ending time for the shifts."
 msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:121
 msgid "The ending time has to be after the starting time."
 msgstr "Die Endzeit muss nach der Startzeit liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:134
 #, php-format
 msgid "Please check your input for needed angels of type %s."
 msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:164
 msgid "Shift updated."
 msgstr "Schicht aktualisiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:183
 msgid "This page is much more comfortable with javascript."
 msgstr "Diese Seite ist mit JavaScript viel komfortabler."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:382
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:403
 msgid "Shifttype"
 msgstr "Schichttyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:214
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:383
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:404
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:17
 msgid "Title"
 msgstr "Titel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:188
 msgid "Room:"
 msgstr "Raum:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:189
 msgid "Start:"
 msgstr "Start:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:190
 msgid "End:"
 msgstr "Ende:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:304
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:414
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:435
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:147
 msgid "Needed angels"
 msgstr "Benötigte Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:57
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:278
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:157
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:140
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:199
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:91
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:737
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:327
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:806
 msgid "Save"
 msgstr "Speichern"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:230
 msgid "Shift deleted."
 msgstr "Schicht gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:236
 #, php-format
 msgid "Do you want to delete the shift %s from %s to %s?"
 msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:266
 msgid "Shift could not be found."
 msgstr "Schicht konnte nicht gefunden werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:33
 #, php-format
 msgid "Shifttype %s deleted."
 msgstr "Schichttyp %s gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:21
 #, php-format
 msgid "Delete shifttype %s"
 msgstr "Lösche Schichttyp %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:61
 msgid "Shifttype not found."
 msgstr "Schichttyp nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:77
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:88
 msgid "Please enter a name."
 msgstr "Gib bitte einen Namen an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:95
 msgid "Updated shifttype."
 msgstr "Schichttyp geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:100
 msgid "Created shifttype."
 msgstr "Schichttyp erstellt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:108
 msgid "Shifttypes"
 msgstr "Schichttypen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:26
-#, php-format
-msgid "There is %d unconfirmed angeltype."
-msgid_plural "There are %d unconfirmed angeltypes."
-msgstr[0] "Es gibt %d nicht freigeschalteten Engeltypen!"
-msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:33
 msgid "Angel types which need approvals:"
 msgstr "Engeltypen die bestätigt werden müssen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:43
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:265
 msgid "Angeltype doesn't exist."
 msgstr "Engeltyp existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:58
 msgid "You are not allowed to delete all users for this angeltype."
 msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:66
 #, php-format
 msgid "Denied all users for angeltype %s."
 msgstr "Alle Benutzer mit Engeltyp %s abgelehnt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:45
 msgid "Deny all users"
 msgstr "Alle Benutzer ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:98
 msgid "You are not allowed to confirm all users for this angeltype."
 msgstr "Du darfst nicht alle Benutzer für diesen Engeltyp freischalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:106
 #, php-format
 msgid "Confirmed all users for angeltype %s."
 msgstr "Alle Benutzer für Engeltyp %s freigeschaltet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:69
 msgid "Confirm all users"
 msgstr "Alle Benutzer bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:123
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:243
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:259
 msgid "User angeltype doesn't exist."
 msgstr "Benutzer-Engeltype existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:144
 msgid "You are not allowed to confirm this users angeltype."
 msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:268
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:417
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:441
 msgid "User doesn't exist."
 msgstr "Benutzer existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:163
 #, php-format
 msgid "%s confirmed for angeltype %s."
 msgstr "%s für Engeltyp %s freigeschaltet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:89
 msgid "Confirm angeltype for user"
 msgstr "Engeltyp für Benutzer bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:210
 msgid "You are not allowed to delete this users angeltype."
 msgstr "Du darfst diesen Benutzer nicht von diesem Engeltyp entfernen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:217
 #, php-format
 msgid "User %s removed from %s."
 msgstr "Benutzer %s von %s entfernt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:113
 msgid "Remove angeltype"
 msgstr "Engeltyp löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:241
 msgid "You are not allowed to set supporter rights."
 msgstr "Du darfst keine Supporterrechte bearbeiten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:250
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:253
 msgid "No supporter update given."
 msgstr "Kein Update für Supporterrechte gegeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:280
 #, php-format
 msgid "Added supporter rights for %s to %s."
 msgstr "%s hat %s als Supporter bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:281
 #, php-format
 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:289
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:261
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:14
 msgid "Add supporter rights"
 msgstr "Supporterrechte geben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:289
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:244
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:14
 msgid "Remove supporter rights"
 msgstr "Supporterrechte entfernen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:329
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:331
 #, php-format
 msgid "User %s added to %s."
 msgstr "Benutzer %s zu %s hinzugefügt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:346
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:142
 msgid "Add user to angeltype"
 msgstr "Benutzer zu Engeltyp hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:363
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:365
 #, php-format
 msgid "You are already a %s."
 msgstr "Du bist bereits %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:370
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:372
 #, php-format
 msgid "You joined %s."
 msgstr "Du bist %s beigetreten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:391
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:393
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:166
 #, php-format
 msgid "Become a %s"
 msgstr "Werde ein %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:26
 #, php-format
 msgid ""
 "You joined an angeltype which requires a driving license. Please edit your "
@@ -523,241 +517,222 @@ msgstr ""
 "Du bist einem Engeltypen beigetreten, der Führerschein-Infos benötigt. Bitte "
 "trage Deine Führerschein-Infos hier ein: %s."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:27
 msgid "driving license information"
 msgstr "Führerschein-Infos"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:133
 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:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:136
 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:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:141
 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:145
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
 #, php-format
 msgid "Edit %s driving license information"
 msgstr "Bearbeite die Führerschein-Infos von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:22
 msgid "Work log entry deleted."
 msgstr "Arbeitseinsatz gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:52
 msgid "Work log entry updated."
 msgstr "Arbeitseinsatz geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:81
 msgid "Please enter work date."
 msgstr "Bitte Einsatzdatum angeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:87
 msgid "Please enter work hours in format ##[.##]."
 msgstr "Bitte Stunden im Format ##[.##| eingeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:93
 msgid "Please enter a comment."
 msgstr "Bitte Kommentar angeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:123
 msgid "Work log entry created."
 msgstr "Arbeitseinsatz angelegt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:64
 msgid "You cannot delete yourself."
 msgstr "Du kannst Dich nicht selber löschen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:438
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:398
 msgid "Your password is incorrect.  Please try it again."
 msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:87
 msgid "User deleted."
 msgstr "Engel gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:150
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:165
 msgid "Please enter a valid number of vouchers."
 msgstr "Bitte gib eine korrekte Anzahl von Gutscheinen ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:172
 msgid "Saved the number of vouchers."
 msgstr "Anzahl der Gutscheine gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
 #, php-format
 msgid "%s's vouchers"
 msgstr "Gutschein von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:198
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
 msgid "Enough"
 msgstr "Genug"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:323
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:314
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:142
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:318
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:340
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:110
 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:323
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:345
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:115
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:348
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:352
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:373
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:32
 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:356
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:381
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:363
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:399
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:388
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:424
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:365
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:390
 #, 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:369
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:394
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:20
-#, php-format
-msgid "Hi %s,"
-msgstr "Hallo %s,"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:21
-#, php-format
-msgid "here is a message for you from the %s:"
-msgstr "hier ist eine Nachricht aus dem %s für Dich:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:23
-#, php-format
-msgid ""
-"This email is autogenerated and has not been signed. You got this email "
-"because you are registered in the %s."
-msgstr ""
-"Diese E-Mail wurde automatisch generiert und muss daher nicht unterschrieben "
-"werden. Du hast diese E-Mail bekommen, weil Du im %s registriert "
-"bist."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:17
 msgid "A Shift you are registered on has changed:"
 msgstr "Eine deiner Schichten hat sich geändert:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:21
 #, php-format
 msgid "* Shift type changed from %s to %s"
 msgstr "* Schichttyp von %s in %s geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:26
 #, php-format
 msgid "* Shift title changed from %s to %s"
 msgstr "* Schicht Titel von %s nach %s geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:32
 #, php-format
 msgid "* Shift Start changed from %s to %s"
 msgstr "* Schicht Beginn von %s nach %s geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:41
 #, php-format
 msgid "* Shift End changed from %s to %s"
 msgstr "* Schicht Ende von %s nach %s geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:49
 #, php-format
 msgid "* Shift Location changed from %s to %s"
 msgstr "* Schicht Ort von %s to %s geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:59
 msgid "The updated Shift:"
 msgstr "Die aktualisierte Schicht:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:71
 msgid "Your Shift has changed"
 msgstr "Deine Schicht hat sich geändert"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:87
 msgid "A Shift you are registered on was deleted:"
 msgstr "Eine deiner Schichten wurde gelöscht:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:97
 msgid "Your Shift was deleted"
 msgstr "Deine Schicht wurde gelöscht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:114
 msgid "You have been assigned to a Shift:"
 msgstr "Du wurdest in eine Schicht eingetragen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:120
 msgid "Assigned to Shift"
 msgstr "In Schicht eingetragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:135
 msgid "You have been removed from a Shift:"
 msgstr "Du wurdest aus einer Schicht ausgetragen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:141
 msgid "Removed from Shift"
 msgstr "Von Schicht ausgetragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:13
 msgid "Your account has been deleted"
 msgstr "Dein Konto wurde gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:15
 #, php-format
 msgid ""
-"Your %s account has been deleted. If you have any questions "
-"regarding your account deletion, please contact heaven."
+"Your %s account has been deleted. If you have any questions regarding your "
+"account deletion, please contact heaven."
 msgstr ""
-"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere "
-"bitte den Himmel."
+"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere bitte "
+"den Himmel."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:104
 msgid "Active angels"
 msgstr "Aktive Engel"
 
@@ -769,386 +744,389 @@ msgstr ""
 "Mindestens %s Engel werden als aktiv gekennzeichnet. Die Nummer muss größer "
 "sein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:48
 msgid "Please enter a number of angels to be marked as active."
 msgstr ""
 "Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:95
 msgid "Marked angels."
 msgstr "Engel wurden markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:98
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:155
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:300
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
 msgid "back"
 msgstr "zurück"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:99
 msgid "apply"
 msgstr "anwenden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:112
 msgid "Angel has been marked as active."
 msgstr "Engel wurde als aktiv markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:109
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:62
 msgid "Angel not found."
 msgstr "Engel nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:123
 msgid "Angel has been marked as not active."
 msgstr "Engel wurde als nicht aktiv markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:134
 msgid "Angel has got a t-shirt."
 msgstr "Engel hat ein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:145
 msgid "Angel has got no t-shirt."
 msgstr "Engel hat kein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:235
 msgid "set active"
 msgstr "setze aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:248
 msgid "remove active"
 msgstr "entferne aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:220
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:261
 msgid "got t-shirt"
 msgstr "hat t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:274
 msgid "remove t-shirt"
 msgstr "entferne t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:268
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:210
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:225
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:422
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:430
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:419
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:427
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
 msgid "Sum"
 msgstr "Summe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:305
 msgid "Search angel:"
 msgstr "Suche Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:306
 msgid "Show all shifts"
 msgstr "Alle Schichten anzeigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:277
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:36
 msgid "Search"
 msgstr "Suche"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:280
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:310
 msgid "How much angels should be active?"
 msgstr "Wie viele Engel sollten aktiv sein?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:281
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:288
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:432
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:453
 msgid "Preview"
 msgstr "Vorschau"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:285
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:182
 msgid "Nickname"
 msgstr "Nick"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:286
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:296
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:326
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:261
 msgid "Size"
 msgstr "Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:287
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:317
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:11
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:355
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:352
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:595
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:655
 msgid "Shifts"
 msgstr "Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:288
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:394
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:318
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:415
 msgid "Length"
 msgstr "Länge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:319
 msgid "Active?"
 msgstr "Aktiv?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:290
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:320
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:259
 msgid "Forced"
 msgstr "Gezwungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:291
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:321
 msgid "T-shirt?"
 msgstr "T-Shirt?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:294
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:324
 msgid "Shirt statistics"
 msgstr "T-Shirt Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:297
-msgid "Needed shirts"
-msgstr "Benötigte T-Shirts"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:298
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:327
 msgid "Given shirts"
 msgstr "Ausgegebene T-Shirts"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:103
 msgid "Arrived angels"
 msgstr "Angekommene Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:41
 msgid "Reset done. Angel has not arrived."
 msgstr "Zurückgesetzt. Engel ist nicht angekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:59
 msgid "Angel has been marked as arrived."
 msgstr "Engel wurde als angekommen markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:33
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:112
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:123
 msgid "yes"
 msgstr "Ja"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:106
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:555
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:615
 msgid "arrived"
 msgstr "angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:183
 msgid "Planned arrival"
 msgstr "Geplanter Ankunftstag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
 msgid "Arrived?"
 msgstr "Angekommen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:185
 msgid "Arrival date"
 msgstr "Ankunftsdatum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
 msgid "Planned departure"
 msgstr "Geplante Abreise"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:191
 msgid "Planned arrival statistics"
 msgstr "Geplante Ankunfts-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:202
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:224
 msgid "arrived sum"
 msgstr "Summe angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:208
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:223
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:44
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
 msgid "Date"
 msgstr "Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:194
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:209
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:231
 msgid "Count"
 msgstr "Anzahl"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:206
 msgid "Arrival statistics"
 msgstr "Ankunfts-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:221
 msgid "Planned departure statistics"
 msgstr "Geplante Abreise-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:106
 msgid "Free angels"
 msgstr "Freie Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:108
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:29
+msgid "Alle"
+msgstr "All"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:152
 msgid "Angeltype"
 msgstr "Engeltyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:111
-msgid "Only confirmed"
-msgstr "Nur bestätigte"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:310
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:477
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:296
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:309
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:435
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:306
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
 msgid "Nick"
 msgstr "Nick"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:121
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:366
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:297
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:310
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:479
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:111
+msgid "Next shift"
+msgstr "Nächste Schicht"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:112
+msgid "Last shift"
+msgstr "Letzte Schicht"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:338
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:294
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:476
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254
 msgid "DECT"
 msgstr "DECT"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:122
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:375
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63
-msgid "Jabber"
-msgstr "Jabber"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:123
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:480
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:718
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:477
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:787
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:111
 msgid "Grouprights"
 msgstr "Gruppenrechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:188
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:161
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:211
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:478
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:502
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:141
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:475
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:499
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
 msgid "Name"
 msgstr "Name"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:53
 msgid "Privileges"
 msgstr "Privilegien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:102
 msgid "Edit group"
 msgstr "Gruppe bearbeiten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:8
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:112
 msgid "Frab import"
 msgstr "Frab Import"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:39
 msgid "Webserver has no write-permission on import directory."
 msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:142
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:242
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:58
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:64
 msgid "Please select a shift type."
 msgstr "Bitte einen Schichttyp wählen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:149
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:249
 msgid "Please enter an amount of minutes to add to a talk's begin."
 msgstr ""
 "Bitte gib eine Anzahl Minuten ein, die vor dem Talk-Beginn hinzugefügt "
 "werden sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:256
 msgid "Please enter an amount of minutes to add to a talk's end."
 msgstr ""
 "Bitte gib eine Anzahl Minuten ein, die nach dem Talk-Ende hinzugefügt werden "
 "sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:87
 msgid "No valid xml/xcal file provided."
 msgstr "Keine valide xml/xcal Datei hochgeladen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
 msgid "File upload went wrong."
 msgstr "Das Hochladen der Datei ist schiefgegangen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
 msgid "Please provide some data."
 msgstr "Bitte lade eine Datei hoch."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:291
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:292
 msgid "File Upload"
 msgstr "Datei hochladen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:112
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:294
 msgid "Validation"
 msgstr "Überprüfen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:126
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:217
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:295
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:296
 msgid "Import"
 msgstr "Importieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121
 msgid ""
 "This import will create/update/delete rooms and shifts by given FRAB-export "
 "file. The needed file format is xcal."
@@ -1156,91 +1134,92 @@ msgstr ""
 "Dieser Import erzeugt, ändert und löscht Räume und Schichten anhand einer "
 "FRAB-Export Datei. Das benötigte Format ist xcal."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124
 msgid "Add minutes to start"
 msgstr "Minuten vor Talk-Beginn hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125
 msgid "Add minutes to end"
 msgstr "Minuten nach Talk-Ende hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:126
 msgid "xcal-File (.xcal)"
 msgstr "xcal-Datei (.xcal)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:231
 msgid "Missing import file."
 msgstr "Import-Datei nicht vorhanden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:183
 msgid "Rooms to create"
 msgstr "Anzulegende Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:187
 msgid "Rooms to delete"
 msgstr "Zu löschende Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:191
 msgid "Shifts to create"
 msgstr "Anzulegende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:210
-msgid "Day"
-msgstr "Tag"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:193
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:202
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:211
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:387
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24
-msgid "Start"
-msgstr "Beginn"
+msgid "Day"
+msgstr "Tag"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:194
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:203
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:388
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:32
-msgid "End"
-msgstr "Ende"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:408
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:25
+msgid "Start"
+msgstr "Beginn"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:204
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:409
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:33
+msgid "End"
+msgstr "Ende"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:214
 msgid "Shift type"
 msgstr "Schichttyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:206
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:215
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:384
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:405
 msgid "Room"
 msgstr "Raum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:200
 msgid "Shifts to update"
 msgstr "Zu aktualisierende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:209
 msgid "Shifts to delete"
 msgstr "Zu löschende Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:296
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:297
 msgid "It's done!"
 msgstr "Erledigt!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:113
 msgid "Log"
 msgstr "Log"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:18
 msgid "Edit news entry"
 msgstr "News-Eintrag bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
 msgid ""
 "This message contains HTML. After saving the post some formatting will be "
 "lost!"
@@ -1248,84 +1227,86 @@ msgstr ""
 "Diese Nachricht beinhaltet HTML. Wenn du sie speicherst gehen diese "
 "Formatierungen verloren!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:46
 msgid "Author"
 msgstr "Autor"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:46
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:271
 msgid "Subject"
 msgstr "Betreff"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:272
 msgid "Message"
 msgstr "Nachricht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:273
 msgid "Meeting"
 msgstr "Treffen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:197
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:161
 msgid "Delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:88
 msgid "News entry updated."
 msgstr "News-Eintrag gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:95
 msgid "News entry deleted."
 msgstr "News-Eintrag gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:107
 msgid "Answer questions"
 msgstr "Fragen beantworten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:29
 msgid "There are unanswered questions!"
 msgstr "Es gibt unbeantwortete Fragen!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:82
 msgid "Unanswered questions"
 msgstr "Unbeantwortete Fragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:87
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:91
 msgid "From"
 msgstr "Von"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:35
 msgid "Question"
 msgstr "Frage"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:37
 msgid "Answer"
 msgstr "Antwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:33
 msgid "Answered questions"
 msgstr "Beantwortete Fragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:36
 msgid "Answered by"
 msgstr "Antwort von"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:228
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:160
 msgid "Rooms"
 msgstr "Räume"
 
@@ -1352,18 +1333,18 @@ msgstr ""
 "Die Karten URL wird benutzt um auf der Raum-Seite ein iframe anzuzeigen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:109
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:401
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:398
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:24
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:151
 msgid "Description"
 msgstr "Beschreibung"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:166
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
 msgid "Please use markdown for the description."
 msgstr "Bitte benutze Markdown für die Beschreibung."
 
@@ -1382,16 +1363,17 @@ msgstr "Raum %s gelöscht."
 msgid "Do you want to delete room %s?"
 msgstr "Möchest Du den Raum %s wirklich löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:203
 msgid "add"
 msgstr "Neu"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:209
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:31
 msgid "Map"
 msgstr "Karte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:109
 msgid "Create shifts"
 msgstr "Schichten erstellen"
 
@@ -1440,134 +1422,139 @@ msgstr "Bitte wähle einen Modus für benötigte Engel."
 msgid "Please select needed angels."
 msgstr "Bitte wähle benötigte Engel."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:323
 msgid "Time and location"
 msgstr "Zeit und Ort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324
 msgid "Type and title"
 msgstr "Typ und Titel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:389
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:410
 msgid "Mode"
 msgstr "Modus"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:390
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:411
 msgid "Create one shift"
 msgstr "Eine Schicht erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:391
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:412
 msgid "Create multiple shifts"
 msgstr "Mehrere Schichten erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:401
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:422
 msgid "Create multiple shifts with variable length"
 msgstr "Erstelle mehrere Schichten mit unterschiedlicher Länge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:407
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:428
 msgid "Shift change hours"
 msgstr "Schichtwechsel-Stunden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:417
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:438
 msgid "Take needed angels from room settings"
 msgstr "Übernehme benötigte Engel von den Raum-Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:423
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:444
 msgid "The following angels are needed"
 msgstr "Die folgenden Engel werden benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:105
 msgid "All Angels"
 msgstr "Engelliste"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:32
 msgid "This user does not exist."
 msgstr "Benutzer existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
+msgid "Please select..."
+msgstr "Bitte auswählen..."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
 msgid "Yes"
 msgstr "Ja"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
 msgid "No"
 msgstr "Nein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:91
 msgid "Force active"
 msgstr "Aktiv erzwingen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:108
 msgid ""
 "Please visit the angeltypes page or the users profile to manage users "
 "angeltypes."
 msgstr ""
 "Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:322
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:303
 msgid "Edit user"
 msgstr "User bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:8
-msgid "Credits"
-msgstr "Credits"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:472
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:479
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:430
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:437
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
 msgid "Login"
 msgstr "Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:395
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:355
 msgid "Register"
 msgstr "Registrieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:69
 msgid "Logout"
 msgstr "Logout"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:527
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:483
 msgid "Registration is disabled."
 msgstr "Registrierung ist abgeschaltet."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:88
 #, 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:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
 #, 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:126
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:46
-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:106
+msgid "E-mail address is already used by another user."
+msgstr "Die E-Mail Adresse wurde bereits von einem anderen User benutzt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:126
 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:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:138
 #, 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:158
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:54
 msgid ""
 "Please enter your planned date of arrival. It should be after the buildup "
 "start date and before teardown end date."
@@ -1575,16 +1562,16 @@ msgstr ""
 "Bitte gib Dein geplantes Ankunftsdatum an. Es sollte nach dem Aufbaubeginn "
 "und vor dem Abbauende liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:79
 msgid "For dect numbers are only 40 digits allowed."
 msgstr "Die DECT Nummer darf nur 40 Zeichen lang sein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:242
 msgid "Angel registration successful!"
 msgstr "Engel-Registrierung erfolgreich!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271
 msgid ""
 "By completing this form you're registering as a Chaos-Angel. This script "
 "will create you an account in the angel task scheduler."
@@ -1592,51 +1579,48 @@ 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:316
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:58
 #, php-format
-msgid ""
-"The %s is allowed to send me an email (e.g. when my shifts change)"
-msgstr ""
-"Das %s darf mir E-Mails senden (z.B. wenn sich meine Schichten "
-"ändern)"
+msgid "The %s is allowed to send me an email (e.g. when my shifts change)"
+msgstr "Das %s darf mir E-Mails senden (z.B. wenn sich meine Schichten ändern)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65
 msgid "Humans are allowed to send me an email (e.g. for ticket vouchers)"
 msgstr "Menschen dürfen mir eine E-Mail senden (z.B. für Ticket Gutscheine)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:330
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40
 msgid "Planned date of arrival"
 msgstr "Geplanter Ankunftstag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:308
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
 msgid "Shirt size"
 msgstr "T-Shirt Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:478
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:735
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:314
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:436
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:804
 msgid "Password"
 msgstr "Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:345
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:736
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:805
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:322
 msgid "What do you want to do?"
 msgstr "Was möchtest Du machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:325
 msgid "Description of job types"
 msgstr "Beschreibung der Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:360
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:332
 msgid ""
 "Restricted angel types need will be confirmed later by a supporter. You can "
 "change your selection in the options section."
@@ -1644,46 +1628,31 @@ msgstr ""
 "Beschränkte Engeltypen müssen später von einem Supporter freigeschaltet "
 "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:369
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:341
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
 msgid "Mobile"
 msgstr "Handy"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:372
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
-msgid "Phone"
-msgstr "Telefon"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:378
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:37
 msgid "First name"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:381
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
 msgid "Last name"
 msgstr "Nachname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:386
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
-msgid "Age"
-msgstr "Alter"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:389
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
-msgid "Hometown"
-msgstr "Wohnort"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:392
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:352
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:442
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:402
 msgid "Please enter a password."
 msgstr "Gib bitte ein Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:446
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:406
 msgid ""
 "No user was found with that Nickname. Please try again. If you are still "
 "having problems, ask a Dispatcher."
@@ -1691,88 +1660,88 @@ 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:450
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:410
 msgid "Please enter a nickname."
 msgstr "Gib bitte einen Nick an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:481
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:439
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
 msgid "I forgot my password"
 msgstr "Passwort vergessen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:486
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:444
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
 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:497
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:455
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:132
 msgid "What can I do?"
 msgstr "Was kann ich machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:498
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:456
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133
 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:520
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:476
 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/user_messages.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:11
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:49
 msgid "Select recipient..."
 msgstr "Empfänger auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:98
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:105
 msgid "delete message"
 msgstr "Nachricht löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:114
 #, php-format
 msgid "Hello %s, here can you leave messages for other angels"
 msgstr "Hallo %s, hier kannst Du anderen Engeln Nachrichten schreiben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:117
 msgid "New"
 msgstr "Neu"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:119
 msgid "Transmitted"
 msgstr "Gesendet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:120
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:154
 msgid "Incomplete call, missing Message ID."
 msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:144
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:165
 msgid "No Message found."
 msgstr "Keine Nachricht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:173
 msgid "Transmitting was terminated with an Error."
 msgstr "Übertragung wurde mit einem Fehler abgebrochen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:178
 msgid "Wrong action."
 msgstr "Falsche Aktion."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:141
 msgid "My shifts"
 msgstr "Meine Schichten"
 
@@ -1781,7 +1750,7 @@ msgid "Key changed."
 msgstr "Key geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:582
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:642
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1806,66 +1775,70 @@ msgstr "Gib bitte einen Schwänz-Kommentar ein!"
 msgid "Shift saved."
 msgstr "Schicht gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:11
 msgid "News comments"
 msgstr "News Kommentare"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:86
 msgid "News"
 msgstr "News"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:87
 msgid "Meetings"
 msgstr "Treffen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:119
 msgid "Comments"
 msgstr "Kommentare"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:229
 msgid "Entry saved."
 msgstr "Eintrag gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:181
 msgid "New Comment:"
 msgstr "Neuer Kommentar:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:187
 msgid "Invalid request."
 msgstr "Ungültige Abfrage."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:268
 msgid "Create news:"
 msgstr "News anlegen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:40
 msgid "Ask the Heaven"
 msgstr "Frag den Himmel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:55
 msgid "You question was saved."
 msgstr "Frage gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:59
 msgid "Please enter a question!"
 msgstr "Gib eine Frage ein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:71
 msgid "Incomplete call, missing Question ID."
 msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:86
 msgid "No question found."
 msgstr "Keine Frage gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:570
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:630
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:68
 msgid ""
 "Please enter your planned date of departure. It should be after your planned "
 "arrival date and after buildup start date and before teardown end date."
@@ -1873,23 +1846,23 @@ msgstr ""
 "Bitte gibt dein geplantes Abreisedatum an. Es sollte nach Deinem "
 "Anreisedatum, nach dem Aufbaubeginn und vor dem Abbauende liegen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:108
 msgid "-> not OK. Please try again."
 msgstr "-> Nicht OK. Bitte erneut versuchen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:141
 msgid "Theme changed."
 msgstr "Aussehen geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:101
 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:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:120
 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:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:134
 msgid ""
 "The administration has not configured any angeltypes yet - or you are not "
 "subscribed to any angeltype."
@@ -1897,70 +1870,70 @@ 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:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:203
 msgid "occupied"
 msgstr "belegt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:207
 msgid "free"
 msgstr "frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:252
 msgid "Own"
 msgstr "Eigene"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:256
 msgid "Occupancy"
 msgstr "Belegung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:259
 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:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:261
 msgid "Description of the jobs."
 msgstr "Beschreibung der Aufgaben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:265
 msgid "Filter"
 msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:265
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:266
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:267
 msgid "Today"
 msgstr "Heute"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:268
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:269
 msgid "last 8h"
 msgstr "letzte 8h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:270
 msgid "last 4h"
 msgstr "letzte 4h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:271
 msgid "next 4h"
 msgstr "nächste 4h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:272
 msgid "next 8h"
 msgstr "nächste 8h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:288
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:289
 msgid "iCal export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:291
 #, php-format
 msgid ""
 "Export your own shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1971,68 +1944,68 @@ 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:323
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:324
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:48
 msgid "All"
 msgstr "Alle"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:324
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:325
 msgid "None"
 msgstr "Keine"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:129
 msgid "Admin"
 msgstr "Admin"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:151
 msgid "Manage rooms"
 msgstr "Verwalte Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:326
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:316
 msgid "No data found."
 msgstr "Nichts gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:452
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:449
 msgid "Unconfirmed"
 msgstr "Unbestätigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:36
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41
 msgid "Supporter"
 msgstr "Supporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:38
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:43
 msgid "Member"
 msgstr "Mitglied"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:55
 #, php-format
 msgid "Do you want to delete angeltype %s?"
 msgstr "Möchtest Du den Engeltypen %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:25
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:25
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:27
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:106
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:20
 msgid "cancel"
 msgstr "abbrechen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:503
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:500
 msgid "Restricted"
 msgstr "Beschränkt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
 msgid ""
 "Restricted angel types can only be used by an angel if enabled by a "
 "supporter (double opt-in)."
@@ -2040,35 +2013,35 @@ msgstr ""
 "Beschränkte Engeltypen müssen von einem Supporter freigeschaltet werden "
 "(double-opt-in)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:92
 msgid "No Self Sign Up"
 msgstr "Kein Selbst-Eintragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:100
 msgid "Requires driver license"
 msgstr "Benötigt Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:104
 msgid "Show on dashboard"
 msgstr "Auf dem Dashboard anzeigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:477
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:474
 msgid "Contact"
 msgstr "Kontakt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:110
 msgid "Primary contact person/desk for user questions."
 msgstr "Ansprechpartner für Fragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:140
 msgid "my driving license"
 msgstr "Meine Führerschein-Infos"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
 msgid ""
 "This angeltype requires a driver license. Please enter your driver license "
 "information!"
@@ -2076,7 +2049,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:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
 #, php-format
 msgid ""
 "You are unconfirmed for this angeltype. Please go to the introduction for %s "
@@ -2085,86 +2058,86 @@ 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:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219
 msgid "confirm"
 msgstr "bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:227
 msgid "deny"
 msgstr "ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:265
 msgid "remove"
 msgstr "entfernen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:298
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:295
 msgid "Driver"
 msgstr "Fahrer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:296
 msgid "Has car"
 msgstr "Hat Auto"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:300
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:297
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31
 msgid "Car"
 msgstr "Auto"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:298
 msgid "3,5t Transporter"
 msgstr "3,5t Transporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:299
 msgid "7,5t Truck"
 msgstr "7,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:300
 msgid "12,5t Truck"
 msgstr "12,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:304
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:49
 msgid "Forklift"
 msgstr "Gabelstapler"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:345
 msgid "Info"
 msgstr "Info"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:416
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:413
 msgid "Supporters"
 msgstr "Supporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:436
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:433
 msgid "Members"
 msgstr "Mitglieder"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:444
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:441
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:154
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:456
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:453
 msgid "confirm all"
 msgstr "Alle bestätigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:460
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:457
 msgid "deny all"
 msgstr "Alle ablehnen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:497
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:494
 msgid "New angeltype"
 msgstr "Neuer Engeltyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:504
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:501
 msgid "Self Sign Up Allowed"
 msgstr "Selbst-Eintragen erlaubt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:505
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:502
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:549
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:546
 msgid ""
 "This angeltype is restricted by double-opt-in by a team supporter. Please "
 "show up at the according introduction meetings."
@@ -2172,11 +2145,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:586
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:581
 msgid "FAQ"
 msgstr "FAQ"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:591
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:586
 msgid ""
 "Here is the list of teams and their tasks. If you have questions, read the "
 "FAQ."
@@ -2184,89 +2157,68 @@ 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:13
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:27
 #, php-format
 msgid "Welcome to the %s!"
 msgstr "Willkommen beim %s!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:34
 msgid "Buildup starts"
 msgstr "Aufbau startet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:48
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:84
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:35
 msgid "Y-m-d"
 msgstr "d.m.Y"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:42
 msgid "Event starts"
 msgstr "Event startet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:50
 msgid "Event ends"
 msgstr "Event endet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:58
 msgid "Teardown ends"
 msgstr "Abbau endet"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:82
-#, php-format
-msgid "%s, from %s to %s"
-msgstr "%s, vom %s bis %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92
-#, php-format
-msgid "%s, starting %s"
-msgstr "%s, ab dem %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100
-#, php-format
-msgid "Event from %s to %s"
-msgstr "Event von %s bis %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:91
 msgid "Event Name"
 msgstr "Event Name"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92
 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:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93
 msgid "Event Welcome Message"
 msgstr "Event Willkommens-Nachricht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96
 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:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100
 msgid "Buildup date"
 msgstr "Aufbau Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101
 msgid "Event start date"
 msgstr "Event Start Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:104
 msgid "Teardown end date"
 msgstr "Abbau Ende Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:105
 msgid "Event end date"
 msgstr "Event Ende Datum"
 
@@ -2290,11 +2242,11 @@ msgstr "Noch zu schaffende Stunden"
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:28
 msgid "Open questions"
 msgstr "Offene Fragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:42
 msgid "Your Question:"
 msgstr "Deine Frage:"
 
@@ -2302,27 +2254,27 @@ msgstr "Deine Frage:"
 msgid "No shifts found."
 msgstr "Keine Schichten gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:246
 msgid "Time"
 msgstr "Zeit"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:314
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:312
 msgid "Your shift"
 msgstr "Meine Schicht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:313
 msgid "Help needed"
 msgstr "Hilfe benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:314
 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:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:315
 msgid "Shift is full"
 msgstr "Schicht ist voll"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:318
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:316
 msgid "Shift running/ended or user not arrived"
 msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen"
 
@@ -2330,34 +2282,27 @@ msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen"
 msgid "Add more angels"
 msgstr "Neue Engel hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:179
-#, php-format
-msgid "%d helper needed"
-msgid_plural "%d helpers needed"
-msgstr[0] "%d Helfer benötigt"
-msgstr[1] "%d Helfer benötigt"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:194
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84
 msgid "Sign up"
 msgstr "Eintragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:198
 msgid "ended"
 msgstr "vorbei"
 
 # Wie ist dies zu verstehen bitte?
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:203
 msgid "please arrive for signup"
 msgstr "Ankommen zum Eintragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:220
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88
 #, php-format
 msgid "Become %s"
 msgstr "Werde ein %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18
 #, php-format
 msgid "Do you want to sign off %s from shift %s from %s to %s as %s?"
 msgstr "Möchtest Du %s von der Schicht %s von %s bis %s als %s austragen?"
@@ -2367,168 +2312,168 @@ msgstr "Möchtest Du %s von der Schicht %s von %s bis %s als %s austragen?"
 msgid "Do you want to sign off from your shift %s from %s to %s as %s?"
 msgstr "Möchtest du dich von deiner Schicht %s von %s bis %s als %s austragen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:68
 msgid "Shift sign off"
 msgstr "Von Schicht austragen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:89
 msgid "Do you want to sign up the following user for this shift?"
 msgstr "Möchtest du den folgenden User für die Schicht eintragen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:91
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:45
 msgid "User"
 msgstr "Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:114
 #, php-format
 msgid "Do you want to sign up the following user for this shift as %s?"
 msgstr "Möchtest du den folgenden User als %s in die Schicht eintragen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:138
 #, php-format
 msgid "Do you want to sign up for this shift as %s?"
 msgstr "Möchtest du dich für diese Schicht als %s eintragen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:198
 msgid "Comment (for your eyes only):"
 msgstr "Kommentar (nur für Dich):"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:151
 msgid "Shift signup"
 msgstr "Schicht Anmeldung"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:402
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:404
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:185
 msgid "Freeload comment (Only for shift coordination):"
 msgstr "Schwänzer Kommentar (Nur für die Schicht-Koordination):"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:190
 msgid "Edit shift entry"
 msgstr "Schichteintrag bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:193
 msgid "Angel:"
 msgstr "Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:194
 msgid "Date, Duration:"
 msgstr "Termin, Dauer:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:195
 msgid "Location:"
 msgstr "Ort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:196
 msgid "Title:"
 msgstr "Titel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:197
 msgid "Type:"
 msgstr "Typ:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
 #, php-format
 msgid "Do you want to delete shifttype %s?"
 msgstr "Möchtest Du den Schichttypen %s löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:54
 msgid "Edit shifttype"
 msgstr "Schichttyp bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:54
 msgid "Create shifttype"
 msgstr "Schichttyp erstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:79
 #, php-format
 msgid "for team %s"
 msgstr "für Team %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:137
 msgid "New shifttype"
 msgstr "Neuer Schichttyp"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:526
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:586
 msgid "Location"
 msgstr "Ort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:56
 #, php-format
 msgid "created at %s by %s"
 msgstr "erstellt am %s von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:63
 #, php-format
 msgid "edited at %s by %s"
 msgstr "bearbeitet am %s von %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:18
 #, php-format
 msgid "Do you really want to add supporter rights for %s to %s?"
 msgstr "Sollen %s %s als neuen Supporter bekommen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
 #, php-format
 msgid "Do you really want to remove supporter rights for %s from %s?"
 msgstr "Möchtest Du wirklich %s von %s als Supporter befreien?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:47
 #, php-format
 msgid "Do you really want to deny all users for %s?"
 msgstr "Möchtest Du wirklich alle Benutzer als %s ablehnen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:71
 #, php-format
 msgid "Do you really want to confirm all users for %s?"
 msgstr "Möchtest Du wirklich alle Benutzer als %s bestätigen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:92
 #, php-format
 msgid "Do you really want to confirm %s for %s?"
 msgstr "Möchtest Du wirklich %s für %s bestätigen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:116
 #, php-format
 msgid "Do you really want to delete %s from %s?"
 msgstr "Möchtest Du wirklich %s von %s entfernen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:169
 #, php-format
 msgid "Do you really want to add %s to %s?"
 msgstr "Möchtest Du wirklich %s zu %s hinzufügen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:176
 msgid "save"
 msgstr "Speichern"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:17
 msgid "Back to profile"
 msgstr "Zurück zum Profil"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21
 msgid ""
 "Your driving license information is only visible for supporters and admins."
 msgstr "Deine Führerschein-Infos sind nur für Supporter und Admins sichtbar."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:22
 msgid "I am willing to drive a car for the event"
 msgstr "Ich möchte für das Event Auto fahren"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27
 msgid ""
 "I have my own car with me and am willing to use it for the event (You'll get "
 "reimbursed for fuel)"
@@ -2536,101 +2481,101 @@ msgstr ""
 "Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für das "
 "Event verwenden (Du wirst für Spritkosten entschädigt)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:30
 msgid "Driver license"
 msgstr "Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34
 msgid "Transporter 3,5t"
 msgstr "3,5t Transporter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:39
 msgid "Truck 7,5t"
 msgstr "7,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:44
 msgid "Truck 12,5t"
 msgstr "12,5t LKW"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:15
 #, php-format
 msgid "Do you want to delete the worklog entry for %s?"
 msgstr "Möchtest du den Arbeitseinsatz von %s wirklich löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:32
 msgid "Delete work log entry"
 msgstr "Arbeitseinsatz gelöscht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:46
 msgid "Work date"
 msgstr "Einsatzdatum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:47
 msgid "Work hours"
 msgstr "Arbeitsstunden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:41
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:528
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:588
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:94
 msgid "Edit work log entry"
 msgstr "Arbeitseinsatz bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:102
 msgid "Add work log entry"
 msgstr "Arbeitseinsatz hinzufügen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
 msgid "Here you can change your user details."
 msgstr "Hier kannst Du Deine Details ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
 msgid "Planned date of departure"
 msgstr "Geplanter Abreisetag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
 msgid "Please visit the angeltypes page to manage your angeltypes."
 msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
 msgid "Here you can change your password."
 msgstr "Hier kannst Du Dein Passwort ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:82
 msgid "Old password:"
 msgstr "Altes Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
 msgid "New password:"
 msgstr "Neues Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:84
 msgid "Password confirmation:"
 msgstr "Passwort wiederholen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
 msgid "Here you can choose your color settings:"
 msgstr "Hier kannst Du das Aussehen auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
 msgid "Color settings:"
 msgstr "Aussehen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:93
 msgid "Here you can choose your language:"
 msgstr "Hier kannst Du Deine Sprache auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:94
 msgid "Language:"
 msgstr "Sprache:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:113
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
 msgid ""
 "Do you really want to delete the user including all his shifts and every "
 "other piece of his data?"
@@ -2638,145 +2583,150 @@ msgstr ""
 "Möchtest Du wirklich den Engel inklusive aller seiner Schichten und allen "
 "anderen seiner Daten löschen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:160
 msgid "Your password"
 msgstr "Dein Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
 #, php-format
 msgid "Angel should receive at least  %d vouchers."
 msgstr "Engel sollte mindestens %d Gutscheine bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185
 msgid "Number of vouchers given out"
 msgstr "Anzahl Gutscheine bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:228
 msgid "m/d/Y h:i a"
 msgstr "d.m.Y H:i"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:248
 msgid "New user"
 msgstr "Neuer User"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:252
 msgid "Prename"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:647
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:711
 msgid "Arrived"
 msgstr "Angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:256
 msgid "Voucher"
 msgstr "Gutschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:257
 msgid "Freeloads"
 msgstr "Schwänzereien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:681
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:748
 msgid "Active"
 msgstr "Aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:247
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:684
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:751
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:262
 msgid "Last login"
 msgstr "Letzter Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:283
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:295
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:291
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:295
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:307
 #, php-format
 msgid "Next shift %c"
 msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:314
 #, php-format
 msgid "Shift started %c"
 msgstr "Schicht startete %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:319
 #, php-format
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:394
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:336
+#, php-format
+msgid "Shift ended %c"
+msgstr "Schicht endete %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:421
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:433
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:477
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:442
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:486
 msgid "Your t-shirt score"
 msgstr "Dein T-Shirt Score"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:480
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:527
 msgid "Work log entry"
 msgstr "Arbeitseinsatz"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:483
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:530
 #, php-format
 msgid "Added by %s at %s"
 msgstr "Erstellt von %s am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:524
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:584
 msgid "Day &amp; time"
 msgstr "Tag &amp; Zeit"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:525
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:585
 msgid "Duration"
 msgstr "Dauer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:527
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:587
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:529
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:589
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:532
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:592
 msgid "You have done enough to get a t-shirt."
 msgstr "Du hast genug für ein T-Shirt gemacht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:551
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:611
 msgid "driving license"
 msgstr "Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:562
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:622
 msgid "Edit vouchers"
 msgstr "Gutschein bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:566
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:626
 msgid "Add work log"
 msgstr "Neuer Arbeitseinsatz"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:574
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:634
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:578
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:638
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:598
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:659
 #, php-format
 msgid "Your night shifts between %d and %d am count twice."
 msgstr "Deine Nachtschichten zwischen %d und %d Uhr zählen doppelt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:603
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:667
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2785,44 +2735,37 @@ 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:629
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:693
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:649
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:713
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:668
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:732
 msgid "Freeloader"
 msgstr "Schwänzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:675
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:740
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:679
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:746
 msgid "Active (forced)"
 msgstr "Aktiv (gezwungen)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:688
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:757
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:696
-#, php-format
-msgid "Got %s voucher"
-msgid_plural "Got %s vouchers"
-msgstr[0] "Einen Gutschein bekommen"
-msgstr[1] "%s Gutscheine bekommen"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:701
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:770
 msgid "Got no vouchers"
 msgstr "Gutschein nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:716
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:785
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2831,19 +2774,19 @@ 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:719
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:788
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:733
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:802
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:776
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:846
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:825
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:897
 msgid ""
 "Please enter your planned date of departure on your settings page to give us "
 "a feeling for teardown capacities."
@@ -2851,7 +2794,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:841
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:911
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2860,7 +2803,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:863
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:930
 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."
@@ -2868,11 +2811,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:878
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:943
 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:893
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:957
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter '-'."
@@ -2880,14 +2823,74 @@ 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:218
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
+#~ msgid "There is %d unconfirmed angeltype."
+#~ msgid_plural "There are %d unconfirmed angeltypes."
+#~ msgstr[0] "Es gibt %d nicht freigeschalteten Engeltypen!"
+#~ msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:219
-msgid ""
-"This page could not be found or you don't have permission to view it. You "
-"probably have to sign in or register in order to gain access!"
-msgstr ""
-"Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um Zugriff "
-"zu erhalten!"
+#~ msgid "Hi %s,"
+#~ msgstr "Hallo %s,"
+
+#~ msgid "here is a message for you from the %s:"
+#~ msgstr "hier ist eine Nachricht aus dem %s für Dich:"
+
+#~ msgid ""
+#~ "This email is autogenerated and has not been signed. You got this email "
+#~ "because you are registered in the %s."
+#~ msgstr ""
+#~ "Diese E-Mail wurde automatisch generiert und muss daher nicht "
+#~ "unterschrieben werden. Du hast diese E-Mail bekommen, weil Du im %s "
+#~ "registriert bist."
+
+#~ msgid "Needed shirts"
+#~ msgstr "Benötigte T-Shirts"
+
+#~ msgid "Only confirmed"
+#~ msgstr "Nur bestätigte"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Credits"
+#~ msgstr "Credits"
+
+#~ msgid "Please check your jabber account information."
+#~ msgstr "Bitte überprüfe deine Jabber Account Eingabe."
+
+#~ msgid "Phone"
+#~ msgstr "Telefon"
+
+#~ msgid "Age"
+#~ msgstr "Alter"
+
+#~ msgid "Hometown"
+#~ msgstr "Wohnort"
+
+#~ msgid "%s, from %s to %s"
+#~ msgstr "%s, vom %s bis %s"
+
+#~ msgid "%s, starting %s"
+#~ msgstr "%s, ab dem %s"
+
+#~ msgid "Event from %s to %s"
+#~ msgstr "Event von %s bis %s"
+
+#~ msgid "%d helper needed"
+#~ msgid_plural "%d helpers needed"
+#~ msgstr[0] "%d Helfer benötigt"
+#~ msgstr[1] "%d Helfer benötigt"
+
+#~ msgid "Got %s voucher"
+#~ msgid_plural "Got %s vouchers"
+#~ msgstr[0] "Einen Gutschein bekommen"
+#~ msgstr[1] "%s Gutscheine bekommen"
+
+#~ msgid "Page not found"
+#~ msgstr "Seite nicht gefunden"
+
+#~ msgid ""
+#~ "This page could not be found or you don't have permission to view it. You "
+#~ "probably have to sign in or register in order to gain access!"
+#~ msgstr ""
+#~ "Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um "
+#~ "Zugriff zu erhalten!"