From 7033d974a34879c20d6f6633f839feece386b8b6 Mon Sep 17 00:00:00 2001 From: GAINS-Projects Date: Sun, 26 Apr 2020 22:48:23 +0200 Subject: [PATCH 01/10] German Translation Updatet Version of the German Translation --- locale/de/LC_MESSAGES/django.mo | Bin 88735 -> 93372 bytes locale/de/LC_MESSAGES/django.po | 178 +++++++++++--------------------- 2 files changed, 60 insertions(+), 118 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 4fb5a2f4c84ca42a60f41cdad324b41e53bb154c..273cf450a68a0d13c0536adf70af0bfb4fe1ad0a 100644 GIT binary patch delta 29967 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 delta 26015 zcmZA82Yila!}sy?%0R?S><}?SBKBUf_uhNdh#*GndD)xNAV$@uR+S*A)~s1-E2^|M zMNy+hy}$o;9C@BT@A>&0zQ^9@nQ-^schz_KPG9$L0X_>Ho)tchlO40?bDZ#GSWmf* zbNn;M3C0tc8XsUre2tkfRX4}Uf_acGoQjwgt6JM*Hqt{d1J1=jTx)bYdx-dwaoTzT z)04i6Y4I_-@I7|GkEr_Xx;qZ@bh@C@QRs~^=#K+21&+a#I0Zv+9;)4TPrlo6_7G8n zBdC>}#SnamX)t9EQ=Szyp?s*FDuvpCW>^fPQ5`SE9JmSt@Bk*q3#bWRM@{Ue${F8z zpa{N44Und%888^tFbtJn+~!w94baGz_r-Li2ctTkjD9%B<}bq3Y~cpfP9#Q|i626D zW-_i4(V0C*O~k*K=`a}ckS>Bcv*y+)R7az1dJ3i>y##%6HKxK1SOIroIKDvLf#7IU zzeKd-cGzX7A{ohXCF*i*z}&bWb?N@F{)HO&U(^ox^)~5H)R7cNO|&ukU^i61y-*7r zfSTA0)Q-mYX8(0N*OQ?;a0qqz&R|}=g_^l(#%nqx9-kDBmjZX)VHs^iI+0zXG}un5&~1L`tvL)ANgsqiG~QeDAPcpVF3 z`WUm56|g+%rkE0Ep^hLPH4*n_BHFS9)Yc!v+IRyaFke3cHb*rWfvIsEs>3;$9~YyJ z>;US{+{PeG-rsQ=Vjfhzfv5>CGHJJSh)6gY4^abU9AG-CfJ%2ll~1ziZ&62c88zU0 zRL8*s9VZlPq9zc79dRD2{xd9u8DdSkDi-4YIX#JlP!MMecAz@GikiR&EP%NOnTGXI z0}Vi}a1p9}2Wp3IpmydCYNwu|cJ?Ex-@w79yfmiK`(KraDmJkNoiKoOG^WMTHa*L_ z+~#jbU7|x+3~!>|iu6N_MNkuLi2ATaV>+CG8ZQprx?C%XXvQ0C!4C8#eaNPd+w#k( z`oG)!hnSJ{8=Iecs7Yr;tu!39fJUfG-3c>b6lx-)hqC{=&9lkS8OCE8`~lVRX;k@b z)WAp)TPZ)WjB`R=xtYvs*A5?!!=YU$GgV zP&<)rv^leI)J!YbbQ{#x_Cj?y6m^ypF&8dEZTVi**8YT=z+=?WyvCg9H^%f|5ZOt$ zQ;vu_u4!#<3Y@N}fnrb{k3@Am3$>C>s0r-F5d0Z~@GsP*OEuOkAUkT{a;SD~QT2ME zzux~zwqP#max6!EKz3qPyozcNMBQds1~u>u)Q&Ajt?*kcfrqgOzOjamGasm=zbGH*Q6}#|fw-+lRVLCs7l=i<-dSsDAt=nsgv) zhYDa$tbm$8`-$woI_gh`Rx}2co{hn{)Vded;Z@XYcN;aq2i8}p*V1c}$xnky2cg=9 zqTY&Ps2wSbnX&pL_Fn_HCqrA`2bG>?(~D38?L@8Y5az-ws1^N#T2ZRWrd=V_PE4#Vd1E-h{s-TXbC8}K~REIIv5vYkx zw&_Kv57!#ZftyhiI*HmD_jOz0E^2F@Sl^-s@SbXpBmmVQ1a;}cFd4Q)O}qo@r{HkZ z4y{DBKa8K@c~t#U)69-mM9SSxT_WnB4eGKDMy+TL>UCU#HSk+Zj;~N#`4LlKz;tsb zf>1{hg5FpKy|4x@$J*$F_fb3WCuY|B|B*;uGBVCEZ$Wv~nRh{5!Wh(RGYcc}dsGJ> z(HGOqG%L-3%FlypUlRSWDyGExs0p@0)fbz}H|fGQ-4siZjzw+# zI@AQdvE}Dc9lk_eF8?{EbW@q8sM0|JsT@Hsd5}%dVkjcn4GA zGt@*s*!&cqoAN-^#DXym=C|omw!D(H4(d)cM}4qbqxy~goc&Kt#BB>^qb}9gsLQtv zwX$QV0q&w2{*Ag!uDNE5lVKs!sj)nk#|k(EweoGK_BT=Oo}&7B=_aBxcjlRuXG6^} zFM2-Bn2vNCY>&~X3I2$>d}nO>B5J}nPz!pA+CkSB=7&xyR6o@)EjCA$ySow5#mNvMfTLwy(Kq37rS zd{2a5k!-rci249sK;8Zqs0sXwnb3csc^z}3&bAh6Yg?mUyWTcE1GQ7jQ2lMS zWE4%GCNZZOOdXFsy`Mp z;WSi#%NKF}S%@4aBOm^X)zE9P*|M6bGi!+2;#Ss0_vgT*8ugb1_$4Tbf~sIh$Mnp~O~Dqp3bmp)SPLVTnzv&x>TD;W?nE30 z;$qB-ThQ|z!8)YxqWUT9{?fdD-BA-6kJ^zrsP}X|s^dh=jz_T|-bU3=z03@h4MRv5 zM%|UhSP|Q!j%X3;s5fFEJb~H?_iG~BD(5S+(ln@B9EQ5}O;Ho-U>$-Qcn+%FQq&f2 zK%MP=)XrVTNc355zKAtYJK{!N);P?e_kRr$&G3*dxM&KTyEg5;!mKC*YDYp)6Do?@ znYz|C)+p4(hobJxc+~4W4K?xEsJpWS)96#Tg-8$?`%o+T1=aCARKr)OhVM`vCtqng z4!~@rv!d=yNz}?ZpcWK^ny4G~HZ4L8yajXO0Sse&=N6G*^j~EL2*WVarBL}@P!n^b zX9cK^m!RI71k{ADqIT#3>aM&+O(^4Plb;_ovC^o1>!4dJiXxI3V^JNHPJ|$?uMGsNYoL{L@j6?Y9fbFJ8*F=`>%qRWM~J{t~0+2 zhN999(DR|e!lZ{Gx7JyQ)$j=VVDk0m=u%lTqmCpus{dlB1vEq*U0Yio>$VlfqqcGx zYQ~!|9FJlFd|}IjzBc6rQ7fo{x=h{B7bl|nnU0!RJnD$Q#N@c%rnjOuY4=_tYWM@H z!4cFBb;cE=R zEZ>?hWjWLiHb!5@ciIrqS#&~Ow$H3XFeT|}sLL2<-Gu7kFlr({q3S(G_469F)$dSS z{|VD#@@?jFXGV=v5#6bXG$x`BJD|ShJ+L#5via9hU$8rM#P!9dE zE~dwpsQ#i*6B&caaI$sQcJ^O0jUz*sa1m-HU!exvfa>4}RL2)>`7Kn3k1-v-L@mH4 z!I;{b3Dqtq24Fa<|H?L9H-Y{4BclTu>Y%5!KPrDXs=)-*L}#NW^aZBIuTd-Ch1&X~ zsCFk&^)I3(cop?pKSJFV-yP;o^B9@kEj98qGtLCHKCU_?VV`y zQ=zsrBWmDcsH2Fq<<)I|1Jn_;LoIj+meBh@iAV$)yHQ(s&sKPWnyG8IIZJxTF*CNqycmnxv3SggD^L^Mg{pr7HGzxh`T2j_W;{g=_z~40^zI1$j^HS2%P*h?`osDGHStUb%UGE*O=fEZ>TRixT2O0L`!1-J_d-p0IA+!R zKZ8hqGS;95K7|GGJZeH8P%HL2Z0<@hYDdbTCR78xv6;1%&2NXQ*9&z-L$D-{#A&z{ zOEJDv_6R>}u^$%3M_3NC{%CG-bL>lcI5xt&SOrTSHQ)9j$XD1ofhEv=%-od(Y)ASj zX2ZJ2%|yDRCLWD$6$~SynSO!Aa5<*HbEqx5hT54&sH1w0+EV9)nP>{s3ag>|sf`+- z1?oHSnaz*EP|_o@8Lm3P{`(PmMTXAo6KbHqlji-*hUzFks-u#q0V2^C8=yBfL#@0O zY9ceNpQGx{N3~mmTEKeLk?uOl{%eKj$Sy|w|TO*?lHBFZR>+M1SF1G{4?+<*me7Z${us7vK{ z#{AUmj{0DIfoi`2wR5|zKVTlxM^I<~0QDtI_cPxV?w?bYNK-Pt!`7Jkthv2CP^N#mub~FGi)qmBoS8rt%uPBNwUDZ)PkkfQPs=Fu{QcieL|Ze*lfhp! zPz}DdevfK!()tIcCjAa|6e-U0ZNLnu%a|E;H-bXP2_jf#2#Tfe2v|t@tK>66K=4j$j{cJ-`_#&#G zcc>3d=4)nQB~Uxl4Rhc`HxaF5C2EFSP#>ZrsG~T8x{MdGI{uE4nD4qdf*z>$vyino zi%{Q%EWeumLQro<8O(_7Q41Ytb&n^Ki;Q`wvr9nD@JG~y?xH&UfSQ=k4YQ&&s51;h z?NnLRho>&;HSCAlp)siM#}`-%zeDZRbL8!CI~jg66?38nD2WrXGLFJSsF_#3X8V&2_t^9cbQdQh?_JYT zYt$LdvK~S;e2X(M?4Fs}POL!sPgMN^_sv8*q3VBy8t5#l-0y+;wLKEG1F_c44>*6# z_#PSB>fnd`@_=%}AWaPqm*a#C)19&|)w>1=%u7_E%KWZY=QD?mpQ{ryafQL~NzGCz5p(gs= zrhWc2cP6cyh(86HP#xt)KP-p3bk#8wJE1zBf~jx`X2JESl^sCs*f}hKS5ddz>xt&ci(qc7gud7Xb?JIyb6kbGOs}yb7X8co z^IZ&F*im6=!ss^dzidW~%UXEr|;Gmt+Kb=eo8TOIEuqRVs~^WpEP87F^j@@)#zED`56^i-}M54}o zDptb7sIztbV}2S|L|w9R))}aY%|}ga4Qj;)Q9E)OwL_1P%jdlRhy7PZ%6H}y8-ztj z*TzgZ49nmgOo2yH@A=O*{~Bf`9q`_~W`!`EbZykc2BF@TF{pYo&>PpF`uo~VL^Iij zL3qHXe?{%cV^l}34`xFCs1@Z#onaZ&%G#oiG6vJ*DAbY6Mjhn}48a4a_y2d)TjhR2 zL_6>j)q&4PV}LcpS{SwRil~{_My;#~YGoZ!0}sPsoQ|5n*Qg16hdP?;=vf%@db=Ih zzouedRK+qj-5Rwsy-_D;s20Vnpc+sX`+O+Q{vyi-4it^&9qwIy*aRsK- z`~N)=b#xrHqHCy6>3!5ppP{zQmtUThpB^<}R@4g1qRQ)ATcdWen=K!Rx=WL+OKtgf z40ls-fQUYcf1+0U67@kz>vDNsx3Z|6=!he*FRK1M)P$ed@^`4C@bfYg%!8U(HOzvI zun9(?7P1@N+R_6=bf%Y39sh>;@hXHt(>FF3odZ|qxwdKEH z4)PyblP5Dfnh&)zRZ$CTk7_?5ncL<0LTw>KTl6bxt6y1tlDnKLqyte~)&li9c0di( z6E(3(sEIB>9o>4=PMk#z^a1N(XbQ8_u~>ujC^wOkL=K>~=oM;9v-p_~%b*6Tiv=+X z%i%oKL{Fh6a1Hf(J+}GpQ4>v>(%gXz)(~qUOi8)Btc_H+HbUKrwx|yJp#~am(^FA* zVjk+UEs3Y)BXI377T3BIJyV9uFyDI9#RR`Ug zNqZt%Q5RG?7Bzuks17EfRyqqc&}vkN>(L9hqd)FMwL56@&!GA{XVaHa?XIHg-ATv$ zugG&Ube8|3X6TdN<@pIKq0TZ98{kiX;zy|0$TzdOv>7p!bTI1j z)vs$L%~srP?25v}kL>WnX-&i0YbPZMOeJ}2tZ zw8s$ak6Phe)Da#*?aW!!(cD6P$UdTuvPgEb165Hw)&Sx3$)Ibky{(ICVOBHMuRs=mqgu0Y1(DUE__a>sVnTR=Y z73wGsp&Fb+U7DMyJ8}=T6VFi-@y%&go&~k?0;v3&sD9d@UhgQ>>l=fb_{f~R|2pHD zWO#mBN&0_QD^StG6UzfmdNEc zGp<2~UZbw4Eu4v3!7|j2e2bdUS(|^yrr%%)`Tn`hfQ3*KEsyG_C8}K%Y9gahN4f#? z;Y~LYT^`>&#`LJI$${#iFzVJ;LH&$qiR!QuYHMR{dOYg#EwJgewtNrj6Mh`^8_-$Q zc#o{^*F<#byz-hm5QIfZmq)z?eNad9xpfojjE|vq=niU!-k|!)oX;FlQPc|Spzc;b z)Wm0_K4dGAqjEbpi0F&w%rQ7i0>+L3;!t#zY1T7o*$Z*2N3hLFC4YUdkj zCY}N7lP-!{*l1MyEf}Kr{~!^)kAI*pU&;bzA|+6-NjcPn8lxJvM@^_d>TMW@`clqB z-SW>-KlK*a@+GJ!_ppTjh-J_!Kl9rbWFTA*i#DKn)OyT2VdJz->`?p|?#B zLcRZ!Q0-P>J=}rQ@DmQfX<;tUzaRdK-AT6(=l!oq6z! zTOtE zocCWJpzp~D!DF`K15`&ZQD^xEb+#W+N90w)d}z|5&aybFpK7QtWdqc}%`q0EP!qg{ z`eAn4`rb`MU$DTEW}vdDv#x|1r~&FVYl~{w7xg|*LS4#PsE!w*Cb|+e(RG*_H={1y zUet;&p!$7++7b6VBI>}ml({@ z8q`F#peA}0nULE#MMSUJUDW&i9<}wEN}HX?hFVcURJ|e?f;CZR*%Nh#CZYyhi<;n8 z)Z20hHSr6!{61=Do}=gA|34AYO4F1vW<_1DyjTXyq0V?9_Qvt3mHdgijJ{<}yKvM5 zOWSk<)C5|i7S;=O1QRhoF2mG%|Bu*$^QhPEPt1vR%9$hSg}NgnQI~5uYOB|wR=gFp zfIT+<2x`KoQAcqDL-3(3Pg&k9AQ0W^s1OlZ3iYk8jM~C>sH2Fn@i=PGv(4SRVBytdANn8nyK!Z25dt`?VO3`zrGOYb6iJ&=&esGOt-$EJivMmEYFp zcSm(F8nqK~sDW2m6Hq&H#CjFAkf&CsvPlP^=Z?9FXoclam!pBL&=YlQhoc6Xg&KG% zYQXKN4i2O0{bK#o>O`6y$bi);&xbHM)f-p)z4hauJ?Z< z5pCTu)K=ZaQuqe*U_>pK=f99>it2bZYC@Y)@Ar48pAE-Qcj6{$z`w2UQT=+=HtjQ@ zCXxd^|Na+7L|Yw++TxZr-Pfikpax!yYPialZ?)w=qPF^1EQB9W^$XT9M^YU13GamY zvAcC<9o~O+xSb4Ln*FE`&S~p8n|}#)cDGRofM=c-{J+CinAw5w?I2d(Q8&OBI2X!=OP_OMJHxaGuA-2Vrs2yn7#B|&g)nO;p z(ey=~BJl`A{7eMs-*gwSqbrf*nxbgE6QbnQL8!x(gdoN0(sTZFD=|6Vc^6g!+*Dg6jAo zYC<1T9s4#nmn;iv=4G)0)i322==u3Sg@|Uj z0JXxeP!stYbzAqK&h8ef;VaYxGq*H%Asp4N9_lS;i0Bi$3$+vXQ7id~+Okxw%>e09XBdR~UX(%|Rddvj-36#idKNok**50a?uDpJ zcMElQ?xT+IA9O3judTTQK^Q?gKWYLkPz}4GZgX$cR<1z(Y}kVO@p=MP{|@S?UfOiB zcBXztYi`ue6+wNls<-3)*BQ6B6}q7p=>e#>U=XUoFzZZok^Ys!ns^%9<8>PKqd-3= zlAe7@5&V*H+om^B_csl~lacYAy6o{~jmAU&o~Nt9IZDMAIs=}M2Io9^6UduSo5i-> zZ?qdpUTVrR5O&$ReX$JrKcRN!cgpmQnw1}1VUTlcTi7l!brj>TW<+oBfSql5PqTmhlG4~;<|sH+h2{0Xeu-&Jpuou z5+6Zl20_m(@+MH{72%|99EV*guR-}%;xlZ1H6}lYynd)B6?Jq$PZPc;*lJF9?jK2h zjiN$x2H1svQQ9B%3?=U#AqyQXuzB|=Pfkci;A83ZF;)NP&)>-_Mg8K0zigYN!o1}5 zqMaUoRPZoY^Dvb^M^b+c?UJ6UHr~_jz&8~9OPKSYI;uOBc5|o`M~Ek0$(!^4(+=_( z6}k{FPos(y>dSVHcopKlG&qL*EOCaQo*fvC{BEKD5ZY-@+s?%G+^1|1>T~T!KEJy< zZEU*}R@Ljq?;p--+ejHNi1(pEVS=9XSl>iFf9~hcB}~TGcJdsLP^Ss`vuQhwbSR-J zdH2X$h?oDUrz@_4FqUAmb}4+@Qh&8YDgCi1Z?q zq3kXp8RexZe?eY0;{RY2VLoNc=%XHCJn^;Esc8H891jz&Q2!kMftd*xycqv3ku!v( z=NXX@I!Jo*6K_gbKuAUBAxQ-|g7h@3iNCsl%bLSd8H?z9r-f}OQ@q~IrZZy zFNTu{v&i3K%T(@V2i!w^1aWoSi1NYIJx*M|KMo^5yVgIANLj)WGVc@46E2e0lZ^(8 zXxN7^n!K)r2jq=ak337s&yDX0^C+8*{N?9=o@UfNKxzPG`g_AN(tl%Z+rFN;|9o7? zO#PpRBt1_J8f36>ej|4>kzPYOBTk~ziG*3Ud?w|ek-vh_f%p*0`rCmXlb7^tAwTI! z8sGDK-RPuT456WZYrRF~r#O}li{olKN`pzyZOThhre9q9QpVpyJWmYq&UR3K;dLU3 z@1fxSb*twkGpe3eQro^M4DSt(1*cW7DUznX(o(uHOq!(Jm+9tm2fNA@rjD zaq{$Z#r7>r9x|hoPl>I@;YvgMK1 z$&`l?>QI(PKmYI8fB@wyKQ&UijO2x>VNLN%y4hnYi>nWo2pauJWIZ*$g(AbWJKR_H@rBvK}Qby(UH&OI{}1?il%c ze#9@ZKKU>0M3n!C_+YyTrAL$Aj^i*;KmXs5$VKDtZAYKcfiEGJ@PzOU6?0$(>U|=< zmU`Ps=cdzC=#7=h*Arv=SVX!R`D-wQI!Vt{TQ4bnL+7t&I1M`ymJpvp!%>7k6sN&P zItZsMKYl^_7Wv%?BM3_g=P6rE{jJ2`Ql~I=Dv-CEbQ97SN$VLyo}Sj&ki1Qlxsoo> zCR66T#;J5RoWfC5d}kYfsZPmDdi-oee=QHEYy{yH_4AT$L;FW|uo|@SCtN2a5Uvoq z5%h!;JpcdSU#T2JqeMDcX$u2Mmmt20vPV=bOIlAdLS`G^O#SxM`I7WF{F|_yycN`G zPRK`Gk2hYk6EZpc)TK>7FZ=zyOm1Z=JfvbMojkU+8W7hLK;`-~{R!`Fx;32*p>Az#M_5RH z0ZF?&woWn9vGmc7yl2FV6E5rf{|liy1ue-)dJfx0h3sTfkWNqGbR16J11vz8N}Ik| z3U^Yzh_d8_rSz#M2l1+ey2R6>o^;f|M5sz|f5snrYEYP#Mmq`j>1>Ui%yiOO30VmB zsq=*T>usCkwoZ2Pzp|Y-!XWDAAS68{G>}dIgry15)GMsb-}0Y|-H8{nonF8;G|Xnx zNu7EAi$$B5MtK}<^4dPa$X`d^Z2NRk*D)RSl9Sg1Z{sNPM-%@@d^P2I-qSXM@QN^=^i|4|o|DAul7EbL zK1r*|KxQK{3u8w@IpTUo8JsT|K+g~4pP)SH`GrVjn|Mb4S;`;SbbH%JQr#K!QI0T_ zfj3fj3c3qY=^>Htl4{}46i&D4<}}DbIwe6*0Xva-#A9furwV1S2uF#hBd-^Ix-r7G zQJq%gWuWbA@^%tFH~qMsA1I6=bg~^+z*eO9Q|UI1#*?0bu>?K7gyDq#cJQ>y zsfK;NC2uj|3PDeIb;^^AdXsHl9@1aY{&PKh%3gdJyqiHovW{--&b`g6HGc z(RR3yjJw2h5$4#u@3A%cX>b?=cph6;5Qma?(`IKOy~+-ttS>10jl6g!dd=ol` z{h~r@^zRl|ZSl(Z3E5qR6Y?zaa>cb+dM=^amuvjuZ-lwh#uZpME$+>_kqIN#KT461 zWm~9k+~i%o5>g}{@k#jYyPsWgXTJ}PFHpyoKcT@7yS(Bu9Gnuj`QX%qYKJnr5_%j? z=}L${($y=W(y<&~t9zdCj+^|`xr8YGL#>3HXU4h`HlOY28<+iZ*@Qut7yHDGx_&ag zOJ7%(xWT{9NK>p_MA5Pl#Y%=0D_g!qxwup}o+P}v5lm0Fe0<}&-_4V-a1r=Cg!-Z-Y|oa=F5M;)+hmn%K+NwLMv4?o_UOKFJzH$3zbv6d#b@RVOhfz3ZA! zV((0@d|rt=v$&Re#diyGg~qQ8a_vtXpWW3}YtI~CIM{VHv2sq=5P$8!#`xReu1$#x z3%RDHO#D>FbuL+ac%*A!;@(JCSKq|qHC>Tj@dstDLOJdz7t_@y^<(j(&dL`~^=^E%AU#qR_MPmJSuJ+U@ r@5-1M+`*N@D{*5d*P~?YO|JN#dblztdi8YO@QIJ^hS*njQXZQ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index ab5945318..6de601011 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -3,20 +3,12 @@ # This file is distributed under the same license as the CyberPanel package. # FIRST AUTHOR , 2017. # -#: baseTemplate/templates/baseTemplate/index.html:219 -#: baseTemplate/templates/baseTemplate/index.html:272 -#: baseTemplate/templates/baseTemplate/index.html:279 -#: baseTemplate/templates/baseTemplate/index.html:286 -#: baseTemplate/templates/baseTemplate/index.html:293 -#: baseTemplate/templates/baseTemplate/index.html:300 -#: baseTemplate/templates/baseTemplate/index.html:307 -#: emailMarketing/templates/emailMarketing/sendEmails.html:93 msgid "" msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-21 19:54+0500\n" -"PO-Revision-Date: 2019-08-14 18:39+0200\n" +"PO-Revision-Date: 2020-04-26 22:47+0200\n" "Last-Translator: \n" "Language-Team: GERMAN \n" "Language: de\n" @@ -24,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.3\n" #: CLManager/templates/CLManager/createPackage.html:3 msgid "Create Cloud Linux Package - CyberPanel" @@ -328,7 +320,7 @@ msgstr "Italienisch" #: CyberCP/settings.py:189 msgid "Deutsch" -msgstr "" +msgstr "Deutsch" #: IncBackups/templates/IncBackups/backupSchedule.html:3 #: backup/templates/backup/backupSchedule.html:3 @@ -376,10 +368,8 @@ msgstr "Frequenz bestimmen" #: IncBackups/templates/IncBackups/backupSchedule.html:54 #: IncBackups/templates/IncBackups/createBackup.html:56 -#, fuzzy -#| msgid "Backup Management" msgid "Backup Content" -msgstr "Sicherungsverwaltung" +msgstr "Backup-Inhalt" #: IncBackups/templates/IncBackups/backupSchedule.html:98 #: IncBackups/templates/IncBackups/incrementalDestinations.html:72 @@ -398,6 +388,7 @@ msgstr "Suche Konten..." #: IncBackups/templates/IncBackups/backupSchedule.html:124 msgid "Select sites to be included in this job" msgstr "" +"Wähle die Webseiten aus, die in diesen Auftrag einbezogen werden sollen" #: IncBackups/templates/IncBackups/backupSchedule.html:150 #: IncBackups/templates/IncBackups/createBackup.html:127 @@ -460,10 +451,8 @@ msgid "Delete" msgstr "Löschen" #: IncBackups/templates/IncBackups/createBackup.html:3 -#, fuzzy -#| msgid "Cancel Backup" msgid "Create Incremental Backup" -msgstr "Sicherung abbrechen" +msgstr "Erstellen einer inkrementellen Sicherung" #: IncBackups/templates/IncBackups/createBackup.html:13 #: IncBackups/templates/IncBackups/createBackup.html:23 @@ -481,10 +470,10 @@ msgid "Backup Docs" msgstr "Sicherung Docs" #: IncBackups/templates/IncBackups/createBackup.html:17 -#, fuzzy -#| msgid "This page can be used to Back up your websites" msgid "This page can be used to create incremental backups for your websites." -msgstr "Diese Seite kann zum sichern der Webseite benutzt werden" +msgstr "" +"Diese Seite kann verwendet werden, um inkrementelle Sicherungen für deine " +"Webseiten zu erstellen." #: IncBackups/templates/IncBackups/createBackup.html:33 #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:35 @@ -538,7 +527,7 @@ msgstr "Job ID" #: IncBackups/templates/IncBackups/createBackup.html:162 #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:97 msgid "Snapshot ID" -msgstr "" +msgstr "Snapshot ID" #: IncBackups/templates/IncBackups/createBackup.html:163 #: dns/templates/dns/addDeleteDNSRecords.html:327 @@ -558,30 +547,22 @@ msgid "Set up Back up Destinations" msgstr "Zielort der Sicherung" #: IncBackups/templates/IncBackups/incrementalDestinations.html:14 -#, fuzzy -#| msgid "Set up Back up Destinations" msgid "Set up Incremental Back up Destinations" -msgstr "Zielort der Sicherung" +msgstr "Zielort der inkrementellen Sicherung" #: IncBackups/templates/IncBackups/incrementalDestinations.html:20 -#, fuzzy -#| msgid "On this page you can set up your Back up destinations. (SFTP)" msgid "On this page you can set up your Back up destinations. (SFTP and AWS)" msgstr "" "Auf dieser Seite kannst du die Zielorte für deine Sicherungen definieren. " -"(SFTP)" +"(SFTP und AWS)" #: IncBackups/templates/IncBackups/incrementalDestinations.html:26 -#, fuzzy -#| msgid "Set up Back up Destinations" msgid "Set up Back up Destinations." -msgstr "Zielort der Sicherung" +msgstr "Zielort der Sicherung definieren." #: IncBackups/templates/IncBackups/incrementalDestinations.html:35 -#, fuzzy -#| msgid "Select Template" msgid "Select Type" -msgstr "Template auswählen" +msgstr "Typ auswählen" #: IncBackups/templates/IncBackups/incrementalDestinations.html:47 #: backup/templates/backup/backupDestinations.html:30 @@ -635,30 +616,28 @@ msgstr "IP" #: IncBackups/templates/IncBackups/incrementalDestinations.html:117 #: IncBackups/templates/IncBackups/incrementalDestinations.html:153 msgid "AWS_ACCESS_KEY_ID" -msgstr "" +msgstr "AWS_ACCESS_KEY_ID" #: IncBackups/templates/IncBackups/incrementalDestinations.html:124 msgid "AWS_SECRET_ACCESS_KEY" -msgstr "" +msgstr "AWS_SECRET_ACCESS_KEY" #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:3 #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:13 -#, fuzzy -#| msgid "Cancel Backup" msgid "Restore Remote Incremental Backups" -msgstr "Sicherung abbrechen" +msgstr "Wiederherstellen von inkrementellen Remotesicherungen" #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:19 -#, fuzzy -#| msgid "This page can be used to Back up your websites" msgid "" "This page can be used to restore remote incremental backups for your " "websites." -msgstr "Diese Seite kann zum sichern der Webseite benutzt werden" +msgstr "" +"Diese Seite kann verwendet werden, um inkrementelle Remotesicherungen für " +"deine Webseiten wiederherzustellen." #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:69 msgid "Fetch Restore Points" -msgstr "" +msgstr "Abrufen von Wiederherstellungspunkten" #: IncBackups/templates/IncBackups/restoreRemoteBackups.html:99 #: emailMarketing/templates/emailMarketing/manageSMTPHosts.html:76 @@ -692,33 +671,31 @@ msgid "Actions" msgstr "Aktionen" #: WebTerminal/templates/WebTerminal/WebTerminal.html:3 -#, fuzzy -#| msgid "Domains - CyberPanel" msgid "Terminal - CyberPanel" -msgstr "Domains - CyberPanel" +msgstr "Terminal - CyberPanel" #: WebTerminal/templates/WebTerminal/WebTerminal.html:16 #: baseTemplate/templates/baseTemplate/index.html:641 #: baseTemplate/templates/baseTemplate/index.html:650 msgid "Terminal" -msgstr "" +msgstr "Terminal" #: WebTerminal/templates/WebTerminal/WebTerminal.html:18 msgid "Web Terminal Docs" -msgstr "" +msgstr "Web Terminal Docs" #: WebTerminal/templates/WebTerminal/WebTerminal.html:19 msgid "Execute your terminal commands." -msgstr "" +msgstr "Führen deine Terminalbefehle aus." #: WebTerminal/templates/WebTerminal/WebTerminal.html:26 #: baseTemplate/templates/baseTemplate/index.html:643 msgid "Web Terminal" -msgstr "" +msgstr "Web Terminal" #: WebTerminal/templates/WebTerminal/WebTerminal.html:28 msgid "Reboot SSH Server" -msgstr "" +msgstr "SSH Server neu starten" #: backup/templates/backup/backup.html:15 msgid "This page can be used to Back up your websites" @@ -872,11 +849,13 @@ msgstr "Verbindung überprüfen" #: backup/templates/backup/backupSchedule.html:54 msgid "Local Path" -msgstr "" +msgstr "Lokaler Pfad" #: backup/templates/backup/backupSchedule.html:57 msgid "Local directory where backups will be moved after creation." msgstr "" +"Lokales Verzeichnis, in dem Sicherungen nach der Erstellung verschoben " +"werden." #: backup/templates/backup/backupSchedule.html:82 msgid "Cannot add schedule. Error message:" @@ -1501,16 +1480,12 @@ msgid "Create Nameserver" msgstr "Nameserver erstellen" #: baseTemplate/templates/baseTemplate/index.html:488 -#, fuzzy -#| msgid "Create Nameserver" msgid "Configure Default Nameservers" -msgstr "Nameserver erstellen" +msgstr "Konfigurieren von Standardnameservern" #: baseTemplate/templates/baseTemplate/index.html:488 -#, fuzzy -#| msgid "Create Nameserver" msgid "Config Default Nameservers" -msgstr "Nameserver erstellen" +msgstr "Konfiguriere Standardnameserver" #: baseTemplate/templates/baseTemplate/index.html:491 #: dns/templates/dns/createDNSZone.html:12 @@ -1647,43 +1622,31 @@ msgstr "Zielorte hinzufügen/löschen" #: baseTemplate/templates/baseTemplate/index.html:590 msgid "Incremental Back up - Beta" -msgstr "" +msgstr "Inkrementelles Sichern - Beta" #: baseTemplate/templates/baseTemplate/index.html:592 -#, fuzzy -#| msgid "Cancel Backup" msgid "Incremental Back up" -msgstr "Sicherung abbrechen" +msgstr "Inkrementelles Sichern" #: baseTemplate/templates/baseTemplate/index.html:598 -#, fuzzy -#| msgid "Restore Back up" msgid "Create/Restore Back up" -msgstr "Sicherung wiederherstellen" +msgstr "Sicherung erstellen/wiederherstellen" #: baseTemplate/templates/baseTemplate/index.html:601 -#, fuzzy -#| msgid "Add/Delete Destinations" msgid "Add/Remove Destinations" msgstr "Hinzufügen/Löschen von Zielorten" #: baseTemplate/templates/baseTemplate/index.html:604 -#, fuzzy -#| msgid "Schedule Back up" msgid "Schedule Back ups" msgstr "Sicherung planen" #: baseTemplate/templates/baseTemplate/index.html:607 -#, fuzzy -#| msgid "Transfer Websites from Remote Server - CyberPanel" msgid "Restore from Remote Server" -msgstr "Webseiten vom Remote-Server übertragen - CybaerPanel" +msgstr "Wiederherstellen vom Remote-Server" #: baseTemplate/templates/baseTemplate/index.html:607 -#, fuzzy -#| msgid "Restore Website" msgid "Restore from Remote" -msgstr "Webseite wiederherstellen" +msgstr "Wiederherstellen von Remote" #: baseTemplate/templates/baseTemplate/index.html:624 #: manageSSL/templates/manageSSL/index.html:29 @@ -1725,7 +1688,7 @@ msgstr "NEU" #: baseTemplate/templates/baseTemplate/index.html:650 msgid "Web Based Terminal" -msgstr "" +msgstr "Web Basiertes Terminal" #: baseTemplate/templates/baseTemplate/index.html:657 #: baseTemplate/templates/baseTemplate/index.html:659 @@ -2408,16 +2371,12 @@ msgid "Record Successfully Added." msgstr "Record erfolgreich hinzugefügt." #: dns/templates/dns/configureDefaultNameServers.html:3 -#, fuzzy -#| msgid "Create Nameserver - CyberPanel" msgid "Configure Default Nameserver - CyberPanel" -msgstr "Nameserver erstellen - CyberPanel" +msgstr "Konfigurieren von Standardnameserver - CyberPanel" #: dns/templates/dns/configureDefaultNameServers.html:12 -#, fuzzy -#| msgid "Create Nameserver" msgid "Configure Default Nameserver" -msgstr "Nameserver erstellen" +msgstr "Konfigurieren von Standardnameserver" #: dns/templates/dns/configureDefaultNameServers.html:13 #: dns/templates/dns/createNameServer.html:13 @@ -2439,22 +2398,16 @@ msgid "First Nameserver" msgstr "Erster Nameserver" #: dns/templates/dns/configureDefaultNameServers.html:45 -#, fuzzy -#| msgid "Second Nameserver (Back up)" msgid "Second Nameserver" -msgstr "Zweiter Nameserver (ersatz)" +msgstr "Zweiter Nameserver" #: dns/templates/dns/configureDefaultNameServers.html:52 -#, fuzzy -#| msgid "First Nameserver" msgid "Third Nameserver" -msgstr "Erster Nameserver" +msgstr "Dritter Nameserver" #: dns/templates/dns/configureDefaultNameServers.html:59 -#, fuzzy -#| msgid "First Nameserver" msgid "Forth Nameserver" -msgstr "Erster Nameserver" +msgstr "Vierter Nameserver" #: dns/templates/dns/configureDefaultNameServers.html:68 #: emailMarketing/templates/emailMarketing/website.html:656 @@ -3759,10 +3712,8 @@ msgstr "SpamAssassin Konfigurationen erfolgreich gespeichert." #: emailPremium/templates/emailPremium/emailLimits.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -#, fuzzy -#| msgid "Emai Limits Docs" msgid "Email Limits Docs" -msgstr "E-Mai Limits Docs" +msgstr "E-Mail Limits Docs" #: emailPremium/templates/emailPremium/emailLimits.html:14 msgid "View and change email limits for a domain name." @@ -3832,7 +3783,7 @@ msgstr "Verwalten" #: emailPremium/templates/emailPremium/emailPage.html:13 msgid "Emai Limits Docs" -msgstr "E-Mai Limits Docs" +msgstr "E-Mai Grenzwerte Docs" #: emailPremium/templates/emailPremium/emailPage.html:14 msgid "View and change limits for an Email Address." @@ -4789,10 +4740,8 @@ msgstr "" "Mails." #: mailServer/templates/mailServer/emailForwarding.html:61 -#, fuzzy -#| msgid "Forwarding Docs" msgid "Forwarding Options" -msgstr "Weiterleitung Docs" +msgstr "Weiterleitungsoptionen" #: mailServer/templates/mailServer/emailForwarding.html:97 #: mailServer/templates/mailServer/emailForwarding.html:118 @@ -4801,7 +4750,7 @@ msgstr "Quelle" #: mailServer/templates/mailServer/emailForwarding.html:101 msgid "or path to the program" -msgstr "" +msgstr "oder Pfad zum Programm" #: mailServer/templates/mailServer/emailForwarding.html:106 msgid "Forward Email" @@ -5442,10 +5391,8 @@ msgid "Switch to LiteSpeed Enterprise Web Server" msgstr "Wechseln zu LiteSpeed Enterprise Web Server" #: serverStatus/templates/serverStatus/litespeedStatus.html:149 -#, fuzzy -#| msgid "LiteSpeed Processes" msgid "LiteSpeed Serial No. (License Key)" -msgstr "LiteSpeed Prozesse" +msgstr "LiteSpeed Seriennummer (Lizenzschlüssel)" #: serverStatus/templates/serverStatus/litespeedStatus.html:160 msgid "Switch" @@ -5453,7 +5400,7 @@ msgstr "Wechseln" #: serverStatus/templates/serverStatus/litespeedStatus.html:162 msgid "Get 15 Days Trial" -msgstr "" +msgstr "Erhalte eine 15 Tage Testversion" #: serverStatus/templates/serverStatus/litespeedStatus.html:175 msgid "" @@ -5461,6 +5408,9 @@ msgid "" "CyberPanel will auto fetch 15 days trial key for you. Make sure this server " "have not used trial already." msgstr "" +"Hinweis: Wenn die 15 Tage Testversion ausgewählt wird, muss der Serial key " +"nicht eingegeben werden, CyberPanel ruft automatisch den 15-Tage-Testkey ab. " +"Stelle sicher, dass dieser Server noch keine Testversion verwendet hat." #: serverStatus/templates/serverStatus/litespeedStatus.html:193 msgid "With great wisdom comes great responsibility." @@ -5970,10 +5920,8 @@ msgstr "Webseiten Grenzwerte" #: userManagment/templates/userManagment/createUser.html:107 #: userManagment/templates/userManagment/modifyUser.html:85 -#, fuzzy -#| msgid "Security" msgid "Security Level" -msgstr "Sicherheit" +msgstr "Sicherheitsstufe" #: userManagment/templates/userManagment/createUser.html:120 #: userManagment/templates/userManagment/index.html:49 @@ -6309,38 +6257,32 @@ msgid "Installation successful. Visit:" msgstr "Installation erfolgreich. Besuche:" #: websiteFunctions/templates/websiteFunctions/installMagento.html:3 -#, fuzzy -#| msgid "Install PrestaShop - CyberPanel" msgid "Install Magento - CyberPanel" -msgstr "PrestaShop installieren - CyberPanel" +msgstr "Magento installieren - CyberPanel" #: websiteFunctions/templates/websiteFunctions/installMagento.html:12 #: websiteFunctions/templates/websiteFunctions/launchChild.html:724 #: websiteFunctions/templates/websiteFunctions/launchChild.html:728 #: websiteFunctions/templates/websiteFunctions/website.html:1029 #: websiteFunctions/templates/websiteFunctions/website.html:1033 -#, fuzzy -#| msgid "Install Packages" msgid "Install Magento" -msgstr "Pakete installieren" +msgstr "Magento installieren" #: websiteFunctions/templates/websiteFunctions/installMagento.html:13 -#, fuzzy -#| msgid "One-click PrestaShop Install!" msgid "One-click Magento Install!" -msgstr "1-Klick PrestaShop Installation!" +msgstr "1-Klick Magento Installation!" #: websiteFunctions/templates/websiteFunctions/installMagento.html:51 -#, fuzzy -#| msgid "Username" msgid "Admin Username" -msgstr "用户名" +msgstr "Admin Benutzername" #: websiteFunctions/templates/websiteFunctions/installMagento.html:93 msgid "" "does not work on OpenLiteSpeed. It is highly recommended to use this " "installer with LiteSpeed Enterprise only." msgstr "" +"funktioniert nicht mit OpenLiteSpeed. Es wird dringend empfohlen, dieses " +"Installationsprogramm nur mit LiteSpeed Enterprise zu verwenden." #: websiteFunctions/templates/websiteFunctions/installPrestaShop.html:3 msgid "Install PrestaShop - CyberPanel" @@ -6387,7 +6329,7 @@ msgstr "WP + LSCache" #: websiteFunctions/templates/websiteFunctions/launchChild.html:729 #: websiteFunctions/templates/websiteFunctions/website.html:1034 msgid "Magento" -msgstr "" +msgstr "Magento" #: websiteFunctions/templates/websiteFunctions/listCron.html:3 msgid "Cron Management - CyberPanel" From 23f857071a1ae5fb7491d2884a6474ec9a442ca4 Mon Sep 17 00:00:00 2001 From: Linunaut Date: Tue, 28 Apr 2020 21:20:12 +0200 Subject: [PATCH 02/10] German Translation Updated Version - German Translation. --- locale/de/LC_MESSAGES/django.mo | Bin 93372 -> 93411 bytes locale/de/LC_MESSAGES/django.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 273cf450a68a0d13c0536adf70af0bfb4fe1ad0a..582c894943f4cf516d7fa33cd4148e6762fdb8dc 100644 GIT binary patch delta 10102 zcmb8!`Ge2Z{=o6~$8PLoUuHrKnlWgYFxj(y|>$yQYtM}NTL)ad-Z)j=bV4w`_to`_j2B^^E$6{K9e?nR(9`aW!G(JkuFLl z$%dUtl9eP$voDjRD)z=YI2`NZ)YxBuW$8bJjqovSj2p2Devb9%tqhq z8SRI)=nwfSNhj54T)_q6NM_;HcwKyO7nY;HH}(%=Y5Iq;5+210n0y`j6|n`~+E@d- zqJa!S$C-#VaT(w~k7csG_T0Xp!;=vFk) zFL7XsrNFc3_xUC))uq^!{#-QR^dmGJ=uK>hU!pTRg=VJpzVPAz^u?>u87)BrU5=*o zSu|sBVp-gRmGJ}Ygc~SHh zJe&Sq=vuBr1AYq)Y!8;llW1V6@4^Htp-b8ltNZ1A8qK+IVZ1R7-32$Iskmj^ug!Q zHGLV4d^?(n-DsdkVn6vl?2hVapl4w#9Du%m9rnh%(Q!V)v?<#|qa2p{ArxUnG=+_E zB%X&kxCGC~SJ2e{f)?*-G>~eClB58eU`ME@2dW$k#o8Y2UyL5f z^Uy%j574MXV=ZRjX7q#ap%L$i*N>oqo{9Zx$3x9DKm$D+>tGI6#NKGp4Z)T;1s(TZ ztc`oSu!{S?EsYvnC`3=di_jOQVO^Yy26PV^=sN6-Z=y3j6YrNhl_c}&w?KE( zYBYn-qTBd&^!05hU%upig= zVNcBcjbBoniPP~LG(*FF4@JHZE!NGLb_R!N7}0U8hGqWMIUU0Me+U; zG?kBGCcY4_e~8ZX+vst$HY)HV??IP|_Io9%bjgKFxnKadpha>gX5r(p|0WvP$LPTO z(14D``!so9MVbQ}#RRUyo%9=et}=*%uc*Yrws`_4p{W+9sTWtfF8qUXU5beHW#Gjae+ z_W!Ap1~aM{2CNfpj?TP28hIf)vkTFg4M#tG4K~3v8o)|4falSr`2b5MhW_1f9DS}q z2G6BwT#q%dWH+Eour2x%I-{!9!*1$~ zrg$p4<~O0+`Y{}cyUKjAm#gI>Bqv_tVR1-Ml>V)&=1u(E1Zm7(Tp#`-tPZKmfo7t$&?=fA?SUEo{tqr`@CQZoN;Hrnv`Fqn2YM3y;JVm<1FeyF z(Bj>S*2V$!xufxV>AGQQGtuXAuqF1#s_y@pG_2 zfh#l!_v@g=)C66sKIneGB=(EYgJ(YG;0pX3Zb6IshKB5at9^09aA74n!1HJ({*7j4 zD;mh>XaIZT^&>c#{_kkugBpb;7>QRDX zdFTgLpnn0qfxYk)T7(yz9g1oM`k|TVdn?e?ZbH}mT^xkF(c;W)8Zz1)yU-tqRo(xK zXq5asVk>T}M`yAN{lFO04*?W>U+?*3MZjQ>$~U@lxrDMnT@_sh|X|Sygm(mZax~=|DZG6ffnI+==guc z>&>!5>d!-K=Gtube-@3uaKRa_Lf7y!^kCYDF3qp#Nm#R0Sj*mM21cS8n-j0EKm&XZ z{V{th`UU3GKZ>3gty_nhn%g=ZUf9S5*ZzHU1}D)Uos2f&gW2fy&SL}yrprua6r zIPXWd+0!@#Uqk~bdu|B031-qSM3?BYGz|xsjuz8Aw0LesQ*s9wT>xE=E_Ge5jP6tn10M7Qg0Xz@Lh&;B=(Pq^Ur*@*`9 zGy37*(ITqZG3<(F=uw)BzSkc8)hvkj3(+<2hi2#&bg7od`>WCMUO>0$=8o)t*M3`k zU=KQ@L-D~gXf0If6ke=@o(nDUYwUx*-=ZM=bz6Y9(_e^lu=4q-l7I1BfD`F|g?+Gh z=dcuu(=;yR!VVmRO}eC#Yj7TR!0%$eQP)&5nf_v&f8m{drbpJN$9&QZ40raP#OYtJQcK^Y1@MmU^zCRH?*yf^vEJSumI(eLiC)2B#h5tYw+=mWy7+vF|=$fBI*X|Fr zsw?*lYupwcryF{b_D4TF6ldW?G{7C`uKBt|_TLE_o@~{7g%9PUHP9LTP=9p$jYMCZ zg5~j6v{>&z2YwI@bR`<-6X-$pG+K-=q36OjbliiO;r>5P!vRY54#iXnok?Rf6D_0d z(HRw@0S$}SC&vB^besifU`x<(mdERVMFUxb2D%y3M)YqQZofU~zCVGczE+=*iMr^F zTA%pQ&XzekJF0N+MayBA%mWAXkew0KJo2+!3-Gnk9ruorg5g=j|7#WZ~3eKevk z(c<_Kjr4nK<5%MA|KYoOz_LdWfnPGnd~pZzyJ z-k6D|YC&{4I>WWm;^?+`e-9eaakMrvhJ@#vqgCD!{m=k3fYE3G*P`FK6>IVRWEl+~ zT;m0NCAt;O%x>(3N3b{MUljfwU>+9Ie+&CzGBo@d-ya9lU5AeQJDRa7!@|#UE3`N- z#k5D|l{B2mR5Zey(KWgYt^T#>3|~bv@)3Hre~Yep**}F7tsxq4Hul5<%*8*W&#l2x zxCuQc>JMlCyKTA*4=Eat{>a>b9w?8YAKHl4z!&KA8?i4gL~COU zUVxvVM|SOtL!gbLtuJQ(o1#u!aE2G6A0Cg+1zHKmBpM@ICrssZrs@O6Uvq&=+#iecT64`6TrD`_QF%1pSS8 z8$C(4MvtO_G#njjDH}boItJ58=Xm1+bihIAhc8CgbQ*df&B2a157*-JXwiHzxbJ2+GXX7$#g>T>tJb-yP`s$FO#b{uUqZxb-{lErvZHv(({8MxZ zkD}->=jfka$I$m`OfOl=E0Qc4Ug&_n&@*}wn!>SYX0Am~z(r^+Jcd5M8cX2@ zbho^OzV}-6{q_9^Z@fEQkk!6j=XU3}$!njNmoaFJG& delta 10049 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 EA16`yIsgCw diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 6de601011..e72bb03e4 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-21 19:54+0500\n" -"PO-Revision-Date: 2020-04-26 22:47+0200\n" -"Last-Translator: \n" -"Language-Team: GERMAN \n" +"PO-Revision-Date: 2020-04-28 21:19+0200\n" +"Last-Translator: Linunaut \n" +"Language-Team: Linunaut \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 24fe54e752b265611369f1faed08744c96194072 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 24 May 2020 22:43:58 +0500 Subject: [PATCH 03/10] bug fix: plogical/vhost.py --- plogical/backupSchedule.py | 1 - plogical/vhost.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py index 0227aed6d..3093a54fa 100755 --- a/plogical/backupSchedule.py +++ b/plogical/backupSchedule.py @@ -87,7 +87,6 @@ class backupSchedule: if os.path.exists(status): status = open(status, 'r').read() - print(status) time.sleep(2) if status.find("Completed") > -1: diff --git a/plogical/vhost.py b/plogical/vhost.py index 556dc5960..6e353096d 100755 --- a/plogical/vhost.py +++ b/plogical/vhost.py @@ -91,7 +91,7 @@ class vhost: try: os.makedirs(pathHTML) - if ProcessUtilities.decideDistro() == ProcessUtilities. or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: + if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: groupName = 'nobody' else: groupName = 'nogroup' From 4d2cdb4d8525f4a296e911175ab9eba35c362d7d Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 24 May 2020 22:52:48 +0500 Subject: [PATCH 04/10] bug fix: managePHP/views.py --- managePHP/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/managePHP/views.py b/managePHP/views.py index 887719155..62e9d0f26 100755 --- a/managePHP/views.py +++ b/managePHP/views.py @@ -1085,7 +1085,7 @@ def installExtensions(request): phpPath = '' - if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8 + if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8: phpPath = os.path.join('/usr', 'local', 'CyberCP', 'managePHP', 'php70.xml') else: phpPath = os.path.join('/usr', 'local', 'CyberCP', 'managePHP', 'ubuntuphp70.xml') From 1ae981cb2a98edb73b899e1c3f1a341a889805b1 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 24 May 2020 23:35:08 +0500 Subject: [PATCH 05/10] bug fix backupSchedule.py --- plogical/backupSchedule.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py index 3093a54fa..a2ebcdf01 100755 --- a/plogical/backupSchedule.py +++ b/plogical/backupSchedule.py @@ -83,6 +83,13 @@ class backupSchedule: except: fileName = "Fetching.." + ifRunning = ProcessUtilities.outputExecutioner('ps aux') + + if (ifRunning.find('startBackup') > -1 or ifRunning.find('BackupRoot') > -1) and ifRunning.find('/%s/' % (backupDomain)): + pass + else: + return 0, 'Backup process killed without reporting any error.' + ## file name read ends if os.path.exists(status): From e4ae1ee5b1c65a0d1e8e6d088d94f5927b879283 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 25 May 2020 00:08:05 +0500 Subject: [PATCH 06/10] bug fix backupSchedule.py --- plogical/backupSchedule.py | 30 +++++++++++++++++++++++++++++- plogical/backupScheduleLocal.py | 1 + 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py index a2ebcdf01..46f531eab 100755 --- a/plogical/backupSchedule.py +++ b/plogical/backupSchedule.py @@ -88,7 +88,35 @@ class backupSchedule: if (ifRunning.find('startBackup') > -1 or ifRunning.find('BackupRoot') > -1) and ifRunning.find('/%s/' % (backupDomain)): pass else: - return 0, 'Backup process killed without reporting any error.' + if os.path.exists(status): + + status = open(status, 'r').read() + time.sleep(2) + + if status.find("Completed") > -1: + + ### Removing Files + + command = 'sudo rm -f ' + status + ProcessUtilities.normalExecutioner(command) + + command = 'sudo rm -f ' + backupFileNamePath + ProcessUtilities.normalExecutioner(command) + + command = 'sudo rm -f ' + pid + ProcessUtilities.normalExecutioner(command) + + backupSchedule.remoteBackupLogging(backupLogPath, "Backup Completed for: " + virtualHost) + try: + os.remove(pathToFile) + except: + pass + return 1, tempStoragePath + else: + return 0, 'Backup process killed without reporting any error.' + else: + + return 0, 'Backup process killed without reporting any error.' ## file name read ends diff --git a/plogical/backupScheduleLocal.py b/plogical/backupScheduleLocal.py index 3a69f20fa..6065b9c92 100755 --- a/plogical/backupScheduleLocal.py +++ b/plogical/backupScheduleLocal.py @@ -61,6 +61,7 @@ class backupScheduleLocal: retValues = backupSchedule.createLocalBackup(virtualHost, backupLogPath) if retValues[0] == 0: + backupSchedule.remoteBackupLogging(backupLogPath, '[ERROR] Backup failed for %s, error: %s moving on..' % (virtualHost, retValues[1]), backupSchedule.ERROR) continue if os.path.exists(backupScheduleLocal.localBackupPath): From 119032b0e554cd86c0f9ea9e72b15b22e1f8bc19 Mon Sep 17 00:00:00 2001 From: Linunaut Date: Tue, 26 May 2020 08:47:43 +0200 Subject: [PATCH 07/10] German Translation Fix Updated German Translation --- locale/de/LC_MESSAGES/django.mo | Bin 93411 -> 93412 bytes locale/de/LC_MESSAGES/django.po | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 582c894943f4cf516d7fa33cd4148e6762fdb8dc..7e87d0a8c9ba01996f98ef32fd361981ccf4204f 100644 GIT binary patch delta 10013 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�%-Czob!0qsNqRpv*^$Y9YF|kH!8qt7qL3iuMb zTh^lQy%v3cb?MMo?#}3%+qodSbElr2daSOwEi1LU)%F2Jnb#(z!_Fx#8JT^?EiSIucgD4A*=lWS{1-yx?vVfh diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e72bb03e4..879f60b6f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-21 19:54+0500\n" -"PO-Revision-Date: 2020-04-28 21:19+0200\n" +"PO-Revision-Date: 2020-05-26 08:47+0200\n" "Last-Translator: Linunaut \n" "Language-Team: Linunaut \n" "Language: de\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.3.1\n" #: CLManager/templates/CLManager/createPackage.html:3 msgid "Create Cloud Linux Package - CyberPanel" @@ -102,12 +102,12 @@ msgstr "NPROC" #: CLManager/templates/CLManager/createPackage.html:105 #: CLManager/templates/CLManager/listPackages.html:164 msgid "INODES soft" -msgstr "INODES weich" +msgstr "INODES soft" #: CLManager/templates/CLManager/createPackage.html:113 #: CLManager/templates/CLManager/listPackages.html:175 msgid "INODES hard" -msgstr "INODES hart" +msgstr "INODES hard" #: CLManager/templates/CLManager/listPackages.html:3 msgid "Manage CloudLinux Packages - CyberPanel" @@ -533,7 +533,7 @@ msgstr "Snapshot ID" #: dns/templates/dns/addDeleteDNSRecords.html:327 #: pluginHolder/templates/pluginHolder/plugins.html:29 msgid "Type" -msgstr "Art" +msgstr "Typ" #: IncBackups/templates/IncBackups/createBackup.html:165 #: websiteFunctions/templates/websiteFunctions/listCron.html:52 From 3b82e04fb501638c453cbcdb7fd647d264a0f43c Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Tue, 26 May 2020 16:11:35 +0500 Subject: [PATCH 08/10] bug fix: create query; --- plogical/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index d88edd44f..9434f3303 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1238,7 +1238,7 @@ class Upgrade: except: pass - qeury = """CREATE TABLE `websiteFunctions_backupjob` ( + query = """CREATE TABLE `websiteFunctions_backupjob` ( `id` int(11) NOT NULL AUTO_INCREMENT, `logFile` varchar(1000) NOT NULL, `ipAddress` varchar(50) NOT NULL, From 194f356ef47da51f0565d98194483ec1eee5dd50 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Tue, 26 May 2020 17:32:52 +0500 Subject: [PATCH 09/10] bug fix: cent8: package manager --- serverStatus/views.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/serverStatus/views.py b/serverStatus/views.py index 1ec698044..c28cce9b7 100755 --- a/serverStatus/views.py +++ b/serverStatus/views.py @@ -1058,12 +1058,13 @@ def lockStatus(request): elif os.path.exists('/etc/yum/yum.conf'): yumConf = '/etc/yum/yum.conf' - yumConfData = open(yumConf, 'r').read() - data = open(yumConf, 'r').readlines() + yumConfData = ProcessUtilities.outputExecutioner('cat %s' % (yumConf)) + data = yumConfData.splitlines() + yumConfTmp = '/home/cyberpanel/yumTemp' if type == 0: - writeToFile = open(yumConf, 'w') + writeToFile = open(yumConfTmp, 'w') for items in data: if items.find('exclude') > -1: @@ -1076,12 +1077,12 @@ def lockStatus(request): if yumConfData.find('exclude') == -1: - writeToFile = open(yumConf, 'a') + writeToFile = open(yumConfTmp, 'a') writeToFile.writelines('exclude=%s\n' % (package)) writeToFile.close() else: - writeToFile = open(yumConf, 'w') + writeToFile = open(yumConfTmp, 'w') for items in data: if items.find('exclude') > -1: @@ -1092,6 +1093,9 @@ def lockStatus(request): writeToFile.close() + command = 'mv %s %s' % (yumConfTmp, yumConf) + ProcessUtilities.executioner(command) + data_ret = {'status': 1} json_data = json.dumps(data_ret) return HttpResponse(json_data) From e834b0f20eadd724b86c3f370194248b9e7c6093 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 27 May 2020 22:45:49 +0500 Subject: [PATCH 10/10] UseFtpUsers --- install/pure-ftpd-one/pure-ftpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/pure-ftpd-one/pure-ftpd.conf b/install/pure-ftpd-one/pure-ftpd.conf index 1c0af0529..299252b61 100755 --- a/install/pure-ftpd-one/pure-ftpd.conf +++ b/install/pure-ftpd-one/pure-ftpd.conf @@ -18,7 +18,7 @@ MaxLoad 4 AntiWarez yes Umask 133:022 MinUID 1000 -UseFtpUsers no +#UseFtpUsers no AllowUserFXP no AllowAnonymousFXP no ProhibitDotFilesWrite no