From 5a9a256f2623810589c9510f73abbbffe50d7841 Mon Sep 17 00:00:00 2001 From: Nos- Date: Mon, 27 Aug 2018 22:18:09 +0200 Subject: [PATCH 1/4] Improved german translation. --- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 44974 -> 45011 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 29 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index 3939e87019df710e0047e1cd4bfdc3c7146383f3..e976f510a27b0f496ef546d6f5b40bd184602e12 100644 GIT binary patch delta 6463 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 delta 6418 zcmZYCeSFX59>?+T?(N1Ho4bt-yK^)5W;2mOwkZz78O7YJVP<2S*zg^SjNEKwQZ{rV z3|UF6R7aiDsXRE&a+GtN&XFjNQ=M{DIIp+sI{M>09`$%$pX+;luba@nVP`r{%@#@8_tzp?cpzjmBX z#3L{j=VLQ`8Mjf87Q3L*D z^_^t)J_M7fZ;i^-XiUTt_^{feCXhPWO!QG~Nt}!RjPER`ppKtG?NJq~!7l4@>sizU zucKCa3w1cXvdp3MLuD`o2VflPY)!`$+=AM&2Aq!mQ`kC}!W;_ia4VMJQEZQWr<(fl z$ReEi7>*5?kKf=doHEUEI^ajx5wBw`HfIzqs6Q59Dkk7joQapw)r>}Gn-#A>y|4{i zV6F88wk7@y7vW9piSxNb-ElYScKjLRF*?WGl7~_4ooN*D?Ec*(Wj_^|AxxcxAyrRR0e&y61oM=Py_Zw9pX&XwJg9W zT!H#P?ZP&?|Mj-PS=6<=h8nO5cSeSxQW=f`7=?|o3r1oxYUP<2gG+4vix@?G0yTjz zZ2S{;C61WOf*IdQrJ$7-qV~1~)nO%e!6T>)T|}+u8tTjFJq-o! zej{?MoSmpl1{aw#(7cHJ>oByXq7BBOCiDPmg%6|lGzUYm9J^sPYNaPp?LR?f@N?Al zy^Q_PyV$IF0BQkg*c_)|C>9r!e-+B9P>0p18SX;u{XWzR4xw(zJ2rj~wIzQ-W$G`e zj;~-C-a;*)`FwK=5>OKuhj%lDdS2pE(8@QW_WA&J#?LSTeV;HZ>4U1DjWcmG_Cb#Y z=6NFOy3Ikg+iZOodlO&7WNg2X?BYax2;FTI5-D85`>`#*K>D?sgi7gis6(?Im5~Fs z{x#Hq_4fG}HvSHEmLf{cZ%Q|8O*{;hnJmszRloj`5X zY1E!yLS^V1497@*nY0Bds6#vwwKZ9`el}`iWvB&J;C|iz8VcImk&DgD#-O%h8Y%

q?13d$&Gh2_`= zD^Q=%TGU}VjjQOWP5H;flY>S_x2E1eSdD09Rh?-b9YQ<5g!`KIP_=ej0@#saI z>)HnSr~%7RGhb)xt5GvQh~9V%_55vYiKkH4>oRIU&!*Je#m3uF_x*JnpF!Q0E2s(GMjhfNPn!=~XY5a$iyHVP z?2Z?)mF|Bi%ZsBT0X6VgY>)Za3O8UH?m-RwJu1~9<>r*fU_au~*aOQk8IR#O{2s^R zh}Gt2eFt_R{vGNHJ6}=I3&Cs5gW;%waMW{o$7M01DYhU)C9+%+GX13Sr|%Oi2nFAYN8dW_J=SCkGK?c$lkO56_tq_s8j5-$$YV*Fow7v zY66d;GE{)ts->t5)Y$r?m_+;`hNAbgX2q>h6Yq}d#~n;Tsm-trCZlFtY-1Od!cC~H zsztT`18U+8sEPg)wIct`=H9nJ4HS!dKMB=t6srGRW+ym#}08G;T-+Q;f2LbhgXuHMy`+Xwn zY*gVWJc0c&>^b8oj3!=&Smj>I=#be^}t7`1m&SVfrohB>n=sVasZBuZLkc@pNpBW$2C1p|++PmC=2uj2}W* z6>m_8#N+nC1yo8eVGq2HI&4ujW(#_vo~NJ=>k!mHqcIG}qXx{gaS5vZdW^&^7=drp zus(fIKA}Pb{D_));C8c;7;Hs67}enfYYuAfi!c=z;fwe_K7hG97##PbQXjF?+=3pc z{)VFZo3zt4KfAe91XEFB8>~W2WQVmLn-G73%Gf3J#H*-@Tt^Lb1MkN`X7d1!zyY`p z2jWMVujjupXQkAo5KF}_Kcxm@1@X(M_5*gCFWhug zycS#HVO)eKu@|Pl>^M*05>$Wg4;1tvh}dIN(jB9S2cUi|9zz|fQk;yNQK$R{CSb?C z{5gid!g#F06nqE!<1N$~N!n+w=P*&xE`j(APV`JT~Pwy7^F+lC%52%3x_L~%jp)YX) z24Nrc#=)oohoL?^qiwv(x(PM0?bf~4*R01S<2xTv&`i&u4&4=0$6g1FO;8gE#}?QD z)p0TgZcTyft9F?tw&{|3Vn2n_f~$;@pu~w&NKY~x`+8btwvA& z|JtK&M|7J;9*gSU?3x|tQCJt9ajiw=m03aFy}R`2S=T-{*3)lXe(|&!+4Jf~<$dLK zFBmd+rFZa0}<%dR_DT<3GI!KTs)UR~|0QB$*X^Yiku=QuHiQU6!> zzy3S8|M9r@di2u0zw~u(#g%&_S7wz*)_q+b=I1-Ac\n" "Language-Team: \n" "Language: de_DE\n" @@ -165,7 +165,7 @@ msgstr "Einstellungen gespeichert." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:274 #: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:55 msgid "Public Dashboard" -msgstr "Public Dashboard" +msgstr "Öffentliches Dashboard" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:109 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:181 @@ -589,17 +589,17 @@ msgstr "%s löschen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160 msgid "Please enter a valid number of vouchers." -msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein." +msgstr "Bitte gib eine korrekte Anzahl von Gutscheinen ein." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168 msgid "Saved the number of vouchers." -msgstr "Anzahl der Voucher gespeichert." +msgstr "Anzahl der Gutscheine gespeichert." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170 #, php-format msgid "%s's vouchers" -msgstr "Voucher von %s" +msgstr "Gutschein von %s" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194 msgid "User not found." @@ -1599,7 +1599,7 @@ msgstr "" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60 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)" +msgstr "Menschen dürfen mir eine E-Mail senden (z.B. für Ticket Gutscheine)" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:330 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36 @@ -2341,6 +2341,7 @@ msgstr "Eintragen" msgid "ended" msgstr "vorbei" +# Wie ist dies zu verstehen bitte? #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:205 msgid "please arrive for signup" msgstr "Ankommen zum Eintragen" @@ -2639,11 +2640,11 @@ msgstr "Dein Passwort" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176 #, php-format msgid "Angel should receive at least %d vouchers." -msgstr "Engel sollte mindestens %d Voucher bekommen." +msgstr "Engel sollte mindestens %d Gutscheine bekommen." #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181 msgid "Number of vouchers given out" -msgstr "Anzahl Voucher bekommen" +msgstr "Anzahl Gutscheine bekommen" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216 msgid "m/d/Y h:i a" @@ -2664,7 +2665,7 @@ msgstr "Angekommen" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:243 msgid "Voucher" -msgstr "Voucher" +msgstr "Gutschein" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:244 msgid "Freeloads" @@ -2727,7 +2728,7 @@ msgstr "Erstellt von %s am %s" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:524 msgid "Day & time" -msgstr "Day & time" +msgstr "Tag & Zeit" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:525 msgid "Duration" @@ -2751,7 +2752,7 @@ msgstr "Führerschein" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:562 msgid "Edit vouchers" -msgstr "Voucher bearbeiten" +msgstr "Gutschein bearbeiten" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:566 msgid "Add work log" @@ -2808,12 +2809,12 @@ msgstr "Nicht angekommen (Geplant: %s)" #, php-format msgid "Got %s voucher" msgid_plural "Got %s vouchers" -msgstr[0] "Einen Voucher bekommen" -msgstr[1] "%s Voucher bekommen" +msgstr[0] "Einen Gutschein bekommen" +msgstr[1] "%s Gutscheine bekommen" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:701 msgid "Got no vouchers" -msgstr "Voucher nicht bekommen" +msgstr "Gutschein nicht bekommen" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:716 msgid "" From ee3e4193c5a3e16a40b0a809064bb58a4018b496 Mon Sep 17 00:00:00 2001 From: Nos- Date: Mon, 27 Aug 2018 22:26:20 +0200 Subject: [PATCH 2/4] Commented the german translation according to Issue #312 . --- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 45011 -> 45011 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index e976f510a27b0f496ef546d6f5b40bd184602e12..57c42f1c86af2be98f89a2e844373934be44b4fd 100644 GIT binary patch delta 16 Ycmcb7pXu^_rVTRLj7FPfv$web07Cf(2mk;8 delta 16 Ycmcb7pXu^_rVTRLjE0+Kv$web07CNz2LJ#7 diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index f1edf009..805acbe9 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-12-29 19:01+0100\n" -"PO-Revision-Date: 2018-08-27 22:16+0200\n" +"PO-Revision-Date: 2018-08-27 22:26+0200\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -110,6 +110,7 @@ msgstr "löschen" msgid "leave" msgstr "verlassen" +# As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation "Engel hinzufügen" for this button. #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:322 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:540 From ac6361b51bed8f9d3b540c2604d6750bf5ada535 Mon Sep 17 00:00:00 2001 From: Nos- Date: Tue, 28 Aug 2018 00:39:11 +0200 Subject: [PATCH 3/4] Tried to fix inputfields for date, email, tel --- includes/pages/admin_user.php | 8 ++++---- includes/sys_form.php | 2 +- templates/user_shifts.html | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 8da09e81..0fb05ffb 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -59,12 +59,12 @@ function admin_user() . '

' . "\n"; $html .= ' Name' . '' . "\n"; $html .= ' Vorname' . '' . "\n"; - $html .= ' Alter' . '' . "\n"; - $html .= ' Telefon' . '' . "\n"; - $html .= ' Handy' . '' . "\n"; + $html .= ' Alter' . '' . "\n"; + $html .= ' Telefon' . '' . "\n"; + $html .= ' Handy' . '' . "\n"; $html .= ' DECT' . '' . "\n"; if ($user_source['email_by_human_allowed']) { - $html .= " email" . '' . "\n"; + $html .= " email" . '' . "\n"; } $html .= " jabber" . '' . "\n"; $html .= ' Size' diff --git a/includes/sys_form.php b/includes/sys_form.php index c974c1d1..ef0c877a 100644 --- a/includes/sys_form.php +++ b/includes/sys_form.php @@ -68,7 +68,7 @@ function form_date($name, $label, $value, $start_date = '', $end_date = '') $end_date = is_numeric($end_date) ? date('Y-m-d', $end_date) : ''; return form_element($label, '
- ' + ' . '' . glyph('th') . '