From ade473f3e16e2051014164a34426da9027fb534f Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 11 Nov 2016 16:36:03 +0100
Subject: [PATCH] update translation

---
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 40001 -> 40627 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 471 +++++++++++-----------
 2 files changed, 246 insertions(+), 225 deletions(-)

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 51382046a51031a1b1b34da28e9e45f09ed0da88..95e0e8214d1f71fb4e0daf02222b88a6125e36f6 100644
GIT binary patch
delta 11494
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

delta 10981
zcmYk?3w%%YAII^t3ud#;?nW3hj160E8|Hq$Uy@rGHk-D&lj{$;<Q{VkiIj5Bx==15
zm)s>H6#XS~iAuTV|9bzvUp+dH$EWA_a?bhQ&u{hr=k4^|v(3}>L$LQkhwG__<Gg_0
zg&k+Tr{mlzsZz&TQo(Ub<5DbvJJ265U=ZHGKzxj)(66H7l*M?A#!lAPQ14leYG*h4
zIgZP@NP;$<>*$LQk#{-XamLD+pL{oKDyjn+SO7<$7mmkZoP?pc5Y@4DHvc(>kw1ZD
z@Mp|N`;KqCc|l=oD5@hxupmZb6vm@Q*ar22L0AMAVkB-t4df7Nrp_Z{aUP(aD^tk~
zqzUT1tuc)DotH`IMcJr^r=mtY5B0(&=!YMoM)(O9!b3KH1~n7cF#zwPKR!br^sj8*
z6OLN4a@ZV`(4~f6ClQD<P(6DK)!-UbLt9W&x)asmZ%|X-p^AB~GpYmWSR8Xu4bMU~
zxDbotS}crvF$Pap;dQ$4AqDx+Gr@7f(FZkkB~cw{iF&XLYGj!<KN2+~Z=gD`488GP
z>jxM}ej}>GJ5dAPgBs|e1cnnr;u{L&HPkMBgqq6YiDo9^P)k(P+8(vL2VhN{gXQrc
zGC9s&n~!?YaZ<@QNA{bu9_!#a)bru4s%En!qYAnrZ9C&oJ>87z$fq{HAGNuTqDFiZ
z_1qt*y%SN*jJPyv#u8D_H$;uN18N3)pclFZkkFLnpdJ{CnzG5Lsb7G4@hU8f8!!w{
zqv~&<8u$zKe7@>tCc{zr3K)#Fa5c6;HGB`5QI~U{gf?414SJ77Q6o=8HJpTMsF5vi
zkJ>X`P|u~J29Ry@Lr_aF9`*bt>vq%(e1*FII2O`&K24$(1(#7%8_$Aj23nyS=z*H*
z45Y8lAZ&|kQG4ZY)XWr3GJBvts(b)yAhS^&UV!=ztiW=(8$)%Rej(8lpWxfrJ=r|?
z2+NT7sAY~zS=5xaLXGSd?1~wvj_yS@cpNojXHX;l33dN1oBtbipGR%xUp@07p&Nrx
zYf}t$9802Zj6uCH4z<=vs2OR7dcGa%zOJ^sH>$x5n;(k0Zw!XwWYqmjYcu~^i+3nc
z2i`;FH`^OOM(x(GQ4N1*^Vd)v{S(!(2ev#PXG`~oSWBTAu8ewbO<P_EL&&$RW6yst
zTQSt$I1%;WRP@BTs1DA@AY6{>&?eOG-ii9coy07>iBZ@k#WXw$wM64F5@+BGxW+|7
zFW!Ud`4QBM&s(pfI`TJ$qf^&x(g;*Xs-re*Gt`oGvH6~;4&`73PDeGo3iaF<s1CS}
zk<fAZ6)R%VdXB?UcA8*3j>RZkhg!QMs0S}&5qydq94EZK$+xlg$5_fIU=>`4<?#aY
zadf;J@J-P9uR(&1?+nE#+=y!6IF`VhsN>?>kPV56sF8HQ3YdihaWTeWfkvjhD(b#o
zs4wa$n_rK5-+m0!`M>Q>u%Q~W^QnkLO<gscZ)fvas2Q4u>R=wKgC|kP@;6)WG%*dt
zVI|5tp+^2XYDP9-dpwJ^Xx}N{)EuXN)-3BV)G->1`EeR*FU&#hnZ;NDSK0CpQ6t`p
zTJxi*j$O6+`>4(8-^_F<3SGLfISFmPR4k1HQ4P<>Ubq5B<5N^eUTbc4wF}k2WYq3n
zXkCT*$Zxdfp*HDu>(}T_{(N)hzc`5>DA0?apgQ8!!ko__^dTREdO;;?3Th;6P$N!7
zotiPI=Vzcc>k`!WVI%7K&(RkTqwYV`g85g&S1Hg)Zd#vM{ac!;E`edxmq)!g1%0uj
zwI}NNOjJXou>j6MjdVV0Mi!&mTVd<hxJY<WumN@B7F+QNYUDdH1`pWsTd0owi8{x=
zt;|flfa&C`U{zd<I>twlZ;|8KnoeUq)bVp+vfN4{iNtLziRIduUD^~i#e-2(H5u99
zPA=-c^T>X39^xph-<CgQ@e3S@A?<h;XQEEaQ{;~xrzl%L4%;A0=W@o7(8w2J5Wa<)
zstu^A+KL+ScJ#v&SOG7fraXTKQyzg@l4uOTN~rhLL4BwiqL!`)>OF%oSm%En33cF2
zd&5H11M5(mb07NS71WQ$Z>Tl)>S!7av6eusc`R1J1gwdDa4;@I{r%wIiNF1^5eCq{
zGoOTx;VM)^+fjSsAZp}Cur^-7s#xMB_ovh8h%b_#i<;7X*ctDlj%!mgrEo9mLv<B<
zq8IC=4_zO0<&YRpVgTMoo&PRf%pa9wP*b@Q2jM2n#FAZ2!_zT>{7%$;XD}SES|6ik
zFt{5ZF|2|KxDhMkkKLGmHnJ1g-F%U{V>0>4s2g{qX5^mDKSS;2gdXl6LT4ZrBfl9n
zV@FVHegd@=XHaW>3AMyGP<!f*t-s%c`PU6kDG0%Wub3N(qefH)_27%B<5&~5_VrN>
zx3~4#7)*W$ssmF{@11Gu7o!HU+?KCH&A_KFTX4<#JF3BdP%rXg!StenSO~*V4V6Z9
zs2XZSDX0b-qdMLZ^?V=H`!Z0cBOCSHYgiCn6K%yz)QyWU2$!LzbR))iI?hK}j{JAM
z&E9y1YA8C@+@FYgVI$OiZLkcEz*t;{<#9ho;~i7)a)SGq2Wz0tbA40~JD?uyj%9HQ
zYNQ)bBg;e0$aY(P05wy`ur!`WHS`3vDWm$D(^Lba$hXE)I{!H&^ujl-i%>JM95rRD
zP*b}BOXBCKk$sOb_{^5a^fNDRjA4|g+x%G6@mzr#&|%a-{zM<0|HmZML+>>6YgP=^
za5dB}u7_IlW~dQ%M{U;rsE&=X_0v($Ek`ZkTGWhgM?H5KL-8!Cy_@LbqvUv|n;Gbg
zYN!WlY6n`!TBoC4um}g>di2Kd{$>e_S!1v$<&{w#YJrjX5^8A%qTVyVKl5LS#9Djf
zS<FxV3hH=W#~SFJVMbaT)$<mp8AwIFXt;F-79hV8)v>jh4>zDT>sIu_J?Mk`Gwk_4
zPJv$dJ!<XlV0rY;G!4e1W~32nB<)cnd=)F=RIGqoF&;0WI_}3bsk|Xl<m6ygJcp|H
zcfD#FYK*!u$GQ|>B>xp^MjoKn`kBr9XPM_hQRQ`Pz9nkyhoL^rQ&Am$8#S<Ps1Mk2
z)Ka^CAfc(chnlLtP!B%ALKvEDrnnUPlCO^OSRb`S15q<K6Sdh^qB^j}mhZLsvo?Pn
zH&OotSqhi4KF1uJ&8VK8#EN(sHS$6O&6<Xw>Wg7PtcdDhHT1&<sDZSx`Hq-GzL(7}
zMGfFR48SeurSrd=gf`JWY=h@eOHq!WJZ-iP=#QD`gCj8oCtz3HjWHNG*jN|KkxxVI
zq1mVoe~Q|iUt%;Kk~;slNN6nz58<U4jmvQjYGn0?nqR}#7)RcPn(_^(7k`O-gPg;t
z`zsAIGnb4SX?;}3+o1;1)#m%7`@jDUBB5h35;cWmY<>c2PfSKF#S9F@d8nCLg&NT|
z>zAm84xy&{6siLkQ60UB>fn7Wjvm9Ae>G5YxM?T`)j&m5M{1!)S`Q0jCk(<gTRsxi
z@tL-ME~>$IQ197n%XgzXbQ1O63%369aOPjT{VoMMCO#ufgQZb7R=3u&)<bQ&#;E%{
zpgNX?VK@$BF&C%fPShS~I?@bq5bFLBSOTZHNJNl$A2oHmP(43r{SLKezu5ZwsD}PQ
zZL-kUOh;;?$~&W$B+KT9p^oVcn|~ie$?rgQ#C3{<zGOdPJ$#D#6D(zv`BQ5YRwn-$
zs=;3{5(7t@KQ3dj2>F)S0{fvF+>BbfBdAULBi6t|W6WR2jW9{)e>jQGdH`R-{A10}
zYY)_q#YEI`S%W;_9J1w}<4k!B>bN$?-Z%`k1ZPlF{|t*^`SIpI^EE={=V4`?|BWPy
zQ*a4iz{gk;i%=(PVib145;zL0;}V-cf$HEL)QE#8n3*h#3FP}*mts8mBbbN}u@%oa
zaTEDr!BMES+lAT-2T*H&0(ERIS#O|D&3)9aevDen{FBV)jKGrQ%b=F35$e?RwE008
zL4F3hG*zo@!BNyEx{4L?5vt*`uk)S9M4XGOQQw2a$>x+KVKDg=REOH58tj4UXb$TB
zVW|7Ypf=&0$;^L267N!=9&bcFa13?KPNO#0Wz<YO#G+VWiWymH3@2Y3W3VHtfl;U#
znT5K41**Yqw*DBZqnD>J{~Ga43e*vgsV47-nxayuJ&}ZZpfjpNsi+r^Ms;){2I6Ye
z$hV@N{|fcqi>Rf&hWYW1^}fqiJi&ZacuzAo_@W*NLhXe})TS$K%e$gFkct}VSX9Ha
zF$Y&-O$>O$*c9uKpMbS-7ix)Jk4YqxC^y~M2g{IOfx2NYs-Zim-Cb~o`5qKUorc!f
z4YQCoorBmF+s-sUVjrS5d6QY@dvO30$X~}wswz6$tYvfbrlK!uN;6P1G8{E!V^Di!
z68hk3tb*%NGjI_L;%!_1H~N!z=9u>eppJP6YRMDO{onta+Ja7~7Y{%+G!(V=xfqRG
zPz`;HI#xfU_QEq%hl_ADWDFL-MAVWcV{;sgYw!zffW6=3U&k~x?~>5&44P+NSQZ1x
z*F{fki<<flSP#=tFIbCO%U>}C%gr}SmX5EIpN|XiA1sFpa?O`-2M#2E4qY)Mnk_JY
z&*vcbI_FUjWbt$?E<o+(T{src;z;bc$Q-*P7)<^iY6iR)n=fV%YRVH)pWJrX3$svr
z>*!+EKc2(`3YuWqCFYx*jkU-xLT%1(P;2SG)J$nH)QCG^U7UyN=qdEV$Ec-zhQ8?Y
zmRY(G)Y6ne?UlH<n14SK)$I)pFpPXh)C)3EBO7A#Q&1h5V_l9~nsum#c3}j5joP$V
zP&0BJwYl%3o_~aD*T=QYj3^XU(9-%cs)v28+18P$4o<{KT#RbyBU`@>1IX`1ZPrt$
z27j{kcTw#;LJiQBf4ONW&>D%FqG;5}E21`G3VPr@;sSA-_=|`qJ|tdMC08rrBI$it
z8A}rUT)3|;{PP6yB4tc~Gs46DCj<ZM1_k;*AoM15vA^8cmsT;+*8M>`fOJXhY|DPf
zJGmawA+FMtzD#a3MiCF}9qdf^7HneklgR6;PjsW~CtH3Wb+%@!k}HRNP27d^i9V#S
ztAZ;+b%d^O@Q#Q3OUG%qg+G}(r$700(iQM?q5<(bp-YRb%irdeZbRtY_)xZpSW0vu
zP7*qo@8WSBgSs+^NYZEZuZ%-T=nQPd9e9)YjdX8h4V?|7`w&BkLPY)C+od90=SgiL
z^yyE>j>Id(31Te4IdLEP<)rmHqU&eknLB0vF^{?tBzxlXE15(U@{j&grmy-@;zP>*
zXUZ!%Us2G4OncO|i|9+VBTD?|;ds)Oaz82^Qs>A2l=8uHT9fZZG$WmcNmw0=6S~52
zGvP(tXR{P@ZKm`RQBl=g9f<PwZsiA%-h*?A!KAO?`&br_qaX47`o$(D;w!|r)a@jG
zCEcH>N7N-Y5H-wmF6VtRD~WfBwx-b8P5M*P)rdo+k7BB=drDr{RN`e~809|`?-8|#
zY~p{EzlqPUw{7B)H4FE;>%BO^xy8#A%e?yhUMxk`G5a__Z2w-{Ne!~)%kUlIV<PC^
zJNRX@_3Nyu)ZHWfG44Qr_Yu8epIAW2G(uM*zG2hD$$#N4HUG#*c~O!rY*{Y(XreFC
znD~UaNZnUh3H6;_Px>LDs~G0DX|gVN;hz+IP3li~j(?TK{lt63Ch9)Iro>%>A0PKs
zi+?^O@~BV1B%DGtC8`n^h^_8BIg+F++w^nxQ1*^~*AgjdPCT$RpW-#5D>0Rudf4(n
z{Eob?Nmw`cc1(op5~;JqVnV+?H*f_OAoR(9iF_>agwU0udSW**iu^p{JTaDd+ulRc
z{V!jcHa{9aA_@|35#xy;xM!N?FOtMy;uJBTh$ZfFgMJ?-Lm0Lvz9+p9FB208T`h4V
z{zi-<{U%n##yExefH<I_Y#ZwOod|HJ`0v(QzqwQ%v<0h4Pbb!sUuw(5mz41}bpHjX
ze6Ie%^#|ppiM6Dgp{~=ojmRN=2G?M=D!AI%d#+f!YyYex5-1pmg|UpS9F9e8dL>Sv
z{tVHbv=5%Lb+<_C$|F9YY$P#`C`VMMtR3DWbREXmh+(8ZC*1otm;(N0a>f(7;_S^P
z$1lV41cp*~(AJ+L?@9VPv6cw6_nrRF{d-CONVur)iJn9jX<bqJi7Ri??tk{<pZjd3
zuk|qwpghp#b>mFZYlwct_rzlr+N&P<C!~)MzQkulOG1C=G@|bLRf9ybM@N3TNHioi
z5k-i@M2x+0HR(=7IN?p1ANC@29U|Y5I7b8#&#&)t+s8&^ZXr99_?ntJwst?>CTP_C
z|M}TSx(Vr3xSe=@^&nlFc)^y<!C!1z_juU!Z2TejRBTA=la!Vq%G#P4)?aZa<^K=`
zNO!{`c$Mf%+$63Mag<LdJ|PC?CR7NC|C>}NY6_vQV4@XyT{DOjVlw#-L`d%73dLfV
zkQzkkG2$EIGVv|(nSH7h=~<+Y<b6`1LSSC0<VOW_=QJ9fH>mL$kLa|Veo@(JQK>mm
zY1yfnSy7qkQQ4!ShGt}@4;vcQHzPHte_CGcrn3s<g|@8|<XttnT8-S7dY4fmDQ{fw
zqrrKzhOYL@edr3veb3b(x40{abYNcZ3FSTOHP1;OI3znWZAe;Fc4ps<s6lB%q8i7y
vRxA5<^dYlva!$XrA;W1RM;*vc%giCwv2O-<4@=9*n>OiyPu|-z!$STKgKcMb

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index ea1964e1..545b3945 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2016-11-11 14:57+0100\n"
-"PO-Revision-Date: 2016-11-11 14:59+0100\n"
+"POT-Creation-Date: 2016-11-11 16:34+0100\n"
+"PO-Revision-Date: 2016-11-11 16:35+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -68,7 +68,7 @@ msgstr "Verwalte Räume"
 msgid "Rooms"
 msgstr "Räume"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:371
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:373
 msgid "No data found."
 msgstr "Nichts gefunden."
 
@@ -76,15 +76,15 @@ msgstr "Nichts gefunden."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:171
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:257
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:317
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:351
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:252
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:312
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:110
 msgid "Teams/Job description"
 msgstr "Team-/Aufgabenbeschreibung"
 
@@ -116,7 +116,7 @@ msgid "Team %s"
 msgstr "Team %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270
 msgid "view"
 msgstr "ansehen"
 
@@ -128,8 +128,8 @@ msgstr "ansehen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:80
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:213
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:328
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -138,7 +138,7 @@ msgstr "bearbeiten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:51
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:120
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
@@ -177,40 +177,40 @@ msgstr "Engeltyp existiert nicht."
 msgid "Event config"
 msgstr "Event Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:48
 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:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:52
 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:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:56
 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:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:60
 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:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:66
 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:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:71
 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:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:76
 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:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:81
 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:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:87
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
@@ -232,7 +232,7 @@ msgid "My shifts"
 msgstr "Meine Schichten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:109
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:309
 msgid "Freeloader"
 msgstr "Schwänzer"
 
@@ -320,17 +320,17 @@ msgstr "Benötigte Engel"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:44
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:107
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:202
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:212
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:377
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34
 msgid "Save"
 msgstr "Speichern"
@@ -556,7 +556,7 @@ msgid "You cannot delete yourself."
 msgstr "Du kannst Dich nicht selber löschen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:59
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:297
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:301
 msgid "Your password is incorrect.  Please try it again."
 msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
 
@@ -565,7 +565,7 @@ msgid "User deleted."
 msgstr "Engel gelöscht."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
@@ -579,7 +579,7 @@ msgid "Saved the number of vouchers."
 msgstr "Anzahl der Voucher gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138
 #, php-format
 msgid "%s's vouchers"
 msgstr "Voucher von %s"
@@ -589,7 +589,7 @@ msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:203
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
 msgid "All users"
 msgstr "Alle Benutzer"
 
@@ -598,13 +598,13 @@ msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:106
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:104
 msgid "Your password is to short (please use at least 6 characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
 
@@ -613,20 +613,20 @@ msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:242
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:108
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:261
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:265
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:20
 msgid "E-mail address is not correct."
 msgstr "Die E-Mail Adresse ist nicht in Ordnung."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:269
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:24
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
@@ -761,8 +761,8 @@ msgstr "Engel wurden markiert."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:173
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:266
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:141
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:67
 msgid "back"
 msgstr "zurück"
@@ -817,7 +817,7 @@ msgstr "entferne t-shirt"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:208
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165
 msgid "Sum"
 msgstr "Summe"
 
@@ -856,13 +856,13 @@ msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:198
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
 msgid "Size"
 msgstr "Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:6
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:339
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -876,7 +876,7 @@ msgid "Active?"
 msgstr "Aktiv?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:189
 msgid "Forced"
 msgstr "Gezwungen"
 
@@ -925,7 +925,7 @@ msgstr "zurücksetzen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:156
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:330
 msgid "arrived"
 msgstr "angekommen"
 
@@ -992,35 +992,35 @@ msgid "Only confirmed"
 msgstr "Nur bestätigte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:208
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:335
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
 msgid "Nick"
 msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:94
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:237
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:241
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184
 msgid "DECT"
 msgstr "DECT"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:246
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:250
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
 msgid "Jabber"
 msgstr "Jabber"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:211
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:361
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -1037,7 +1037,7 @@ msgstr "Gruppenrechte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:255
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
 msgid "Name"
 msgstr "Name"
 
@@ -1155,7 +1155,7 @@ msgstr "Anzulegende Schichten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:281
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:341
 msgid "Day"
 msgstr "Tag"
 
@@ -1231,7 +1231,7 @@ msgstr "Treffen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129
 msgid "Delete"
 msgstr "löschen"
 
@@ -1416,29 +1416,23 @@ msgstr "Engelliste"
 msgid "This user does not exist."
 msgstr "Benutzer existiert nicht."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
-msgid "Please send me an email if my shifts change"
-msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:46
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
 msgid "Yes"
 msgstr "Ja"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:47
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
 msgid "No"
 msgstr "Nein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:60
 msgid "Force active"
 msgstr "Aktiv erzwingen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:79
 msgid ""
 "Please visit the angeltypes page or the users profile to manage users "
 "angeltypes."
@@ -1454,14 +1448,14 @@ msgid "Credits"
 msgstr "Credits"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:337
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:338
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
 msgid "Login"
 msgstr "Login"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271
 msgid "Register"
 msgstr "Registrieren"
 
@@ -1469,40 +1463,39 @@ msgstr "Registrieren"
 msgid "Logout"
 msgstr "Logout"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:56
 #, 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:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:60
 #, 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:84
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:34
 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:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:95
 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:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:106
 #, 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:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:113
 msgid "Please enter your planned date of arrival."
 msgstr "Bitte gib Dein geplantes Ankunftsdatum an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186
 msgid "Angel registration successful!"
 msgstr "Engel-Registrierung erfolgreich!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203
 msgid ""
 "By completing this form you're registering as a Chaos-Angel. This script "
 "will create you an account in the angel task sheduler."
@@ -1510,37 +1503,50 @@ 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:217
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
+msgid ""
+"The engelsystem is allowed to send me an email (e.g. when my shifts change)"
+msgstr ""
+"Das Engelsystem darf mir E-Mails senden (z.B. wenn sich meine Schichten "
+"ändern)"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
+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 Voucher)"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
 msgid "Planned date of arrival"
 msgstr "Geplanter Ankunftstag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:220
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
 msgid "Shirt size"
 msgstr "T-Shirt Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:225
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:38
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:337
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375
 msgid "Password"
 msgstr "Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:228
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:376
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
 msgid "What do you want to do?"
 msgstr "Was möchtest Du machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:231
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
 msgid "Description of job types"
 msgstr "Beschreibung der Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:236
 msgid ""
 "Restricted angel types need will be confirmed later by an archangel. You can "
 "change your selection in the options section."
@@ -1548,46 +1554,46 @@ msgstr ""
 "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet "
 "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:240
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
 msgid "Mobile"
 msgstr "Handy"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:243
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:247
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
 msgid "Phone"
 msgstr "Telefon"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:249
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:253
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:42
 msgid "First name"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:252
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:256
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
 msgid "Last name"
 msgstr "Nachname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:257
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:261
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:45
 msgid "Age"
 msgstr "Alter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:260
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
 msgid "Hometown"
 msgstr "Wohnort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:263
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:305
 msgid "Please enter a password."
 msgstr "Gib bitte ein Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:305
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:309
 msgid ""
 "No user was found with that Nickname. Please try again. If you are still "
 "having problems, ask an Dispatcher."
@@ -1595,36 +1601,36 @@ 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:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313
 msgid "Please enter a nickname."
 msgstr "Gib bitte einen Nick an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:339
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:340
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101
 msgid "I forgot my password"
 msgstr "Passwort vergessen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:341
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:103
 msgid "Please note: You have to activate cookies!"
 msgstr "Hinweis: Cookies müssen aktiviert sein!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:347
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:107
 msgid "What can I do?"
 msgstr "Was kann ich machen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:348
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108
 msgid "Please read about the jobs you can do to help us."
 msgstr ""
 "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:363
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:364
 msgid "Please sign up, if you want to help us!"
 msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:370
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:371
 msgid "Registration is disabled."
 msgstr "Registrierung ist abgeschaltet."
 
@@ -1684,7 +1690,7 @@ msgid "Key changed."
 msgstr "Key geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:335
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1780,70 +1786,38 @@ msgid "No question found."
 msgstr "Keine Frage gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:332
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:71
-msgid "Please enter your planned date of departure."
-msgstr "Bitte gib Dein geplantes Abreisedatum an."
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:49
+msgid ""
+"Please enter your planned date of arrival. It should be after the buildup "
+"start date and before teardown end date."
+msgstr ""
+"Bitte gib Dein geplantes Ankunftsdatum an. Es sollte nach dem Aufbaubeginn "
+"und vor dem Abbauende liegen."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:58
+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."
+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:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:102
 msgid "-> not OK. Please try again."
 msgstr "-> Nicht OK. Bitte erneut versuchen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:110
 msgid "Failed setting password."
 msgstr "Konnte Passwort nicht speichern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:135
 msgid "Theme changed."
 msgstr "Aussehen geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
-msgid "Here you can change your user details."
-msgstr "Hier kannst Du Deine Details ändern."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
-msgid "Planned date of departure"
-msgstr "Geplanter Abreisetag"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192
-msgid "Please visit the angeltypes page to manage your angeltypes."
-msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:198
-msgid "Here you can change your password."
-msgstr "Hier kannst Du Dein Passwort ändern."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:199
-msgid "Old password:"
-msgstr "Altes Passwort:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200
-msgid "New password:"
-msgstr "Neues Passwort:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201
-msgid "Password confirmation:"
-msgstr "Passwort wiederholen:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:205
-msgid "Here you can choose your color settings:"
-msgstr "Hier kannst Du das Aussehen auswählen:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:206
-msgid "Color settings:"
-msgstr "Aussehen:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:210
-msgid "Here you can choose your language:"
-msgstr "Hier kannst Du Deine Sprache auswählen:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:211
-msgid "Language:"
-msgstr "Sprache:"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:77
 msgid "The administration has not configured any rooms yet."
 msgstr "Die Administratoren habe noch keine Räume eingerichtet."
@@ -2172,7 +2146,7 @@ msgid "Your Question:"
 msgstr "Deine Frage:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:342
 msgid "Time"
 msgstr "Zeit"
 
@@ -2203,8 +2177,8 @@ msgid "Become %s"
 msgstr "Werde ein %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:203
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:263
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:265
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -2259,7 +2233,7 @@ msgid "You are signed up for this shift."
 msgstr "Du bist für diese Schicht eingetragen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:283
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:343
 msgid "Location"
 msgstr "Ort"
 
@@ -2289,11 +2263,55 @@ msgstr "Neuer Schichttyp"
 msgid "Please select..."
 msgstr "Bitte auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:38
+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:44
+msgid "Planned date of departure"
+msgstr "Geplanter Abreisetag"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
+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:61
+msgid "Here you can change your password."
+msgstr "Hier kannst Du Dein Passwort ändern."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
+msgid "Old password:"
+msgstr "Altes Passwort:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63
+msgid "New password:"
+msgstr "Neues Passwort:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
+msgid "Password confirmation:"
+msgstr "Passwort wiederholen:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68
+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:69
+msgid "Color settings:"
+msgstr "Aussehen:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
+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:74
+msgid "Language:"
+msgstr "Sprache:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
 msgid ""
 "Do you really want to delete the user including all his shifts and every "
 "other piece of his data?"
@@ -2301,152 +2319,152 @@ 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:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
 msgid "Your password"
 msgstr "Dein Passwort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143
 #, php-format
 msgid "Angel should receive at least  %d vouchers."
 msgstr "Engel sollte mindestens %d Voucher bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
 msgid "Number of vouchers given out"
 msgstr "Anzahl Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:159
 msgid "m/d/Y h:i a"
 msgstr "d.m.Y H:i"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
 msgid "New user"
 msgstr "Neuer User"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
 msgid "Prename"
 msgstr "Vorname"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:125
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
 msgid "Arrived"
 msgstr "Angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:186
 msgid "Voucher"
 msgstr "Voucher"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
 msgid "Freeloads"
 msgstr "Schwänzereien"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:313
 msgid "Active"
 msgstr "Aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:314
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192
 msgid "Last login"
 msgstr "Letzter Login"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:154
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216
 #, php-format
 msgid "Next shift %c"
 msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
 #, php-format
 msgid "Shift starts %c"
 msgstr "Schicht startet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223
 #, php-format
 msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:276
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:289
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:308
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312
 #, php-format
 msgid "Got %s voucher"
 msgid_plural "Got %s vouchers"
 msgstr[0] "Einen Voucher bekommen"
 msgstr[1] "%s Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:261
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:321
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329
 msgid "driving license"
 msgstr "Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331
 msgid "Edit vouchers"
 msgstr "Voucher bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:284
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:344
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:285
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:345
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:346
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:288
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348
 msgid "Your night shifts between 2 and 8 am count twice."
 msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:349
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2455,7 +2473,7 @@ msgstr ""
 "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
 "einzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:359
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2464,11 +2482,11 @@ msgstr ""
 "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
 "verwendet hast."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:362
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:313
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -2568,6 +2586,9 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "Please enter your planned date of departure."
+#~ msgstr "Bitte gib Dein geplantes Abreisedatum an."
+
 #~ msgid "Please select a user."
 #~ msgstr "Bitte einen Benutzer auswählen."