From ed2c4cb3ef0ebe1f46c3d8431be4d8f45fcf4466 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 12 Nov 2020 09:29:42 +0000 Subject: [PATCH 01/12] Update de_DE & nl_NL locales, thx Mark Holtkamp --- locale/de_DE/LC_MESSAGES/messages.mo | Bin 14670 -> 14610 bytes locale/de_DE/LC_MESSAGES/messages.po | 6 +- locale/en_US/LC_MESSAGES/messages.mo | Bin 16673 -> 16703 bytes locale/nl_NL/LC_MESSAGES/messages.mo | Bin 13854 -> 12722 bytes locale/nl_NL/LC_MESSAGES/messages.po | 123 +++++++++++++++++++-------- locale/pocompile.sh | 2 +- 6 files changed, 92 insertions(+), 39 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo index 79079375f71d44c2b1678b787d2bd9bf38e57c92..a87161595f0e994426948e15d47fe922a4252f3d 100644 GIT binary patch delta 3649 zcmXxmd2Cfh6oB!0(z10g76GX~mI4;UmPJ|#iYpP7Vge{)6qi;7g0XHvh}YC5!GNYb zfuM*HjT&STD!7!WC_#)Hf&~SGLHma+2GOWs6#YKlNJ@V*^X|-?b7t;?FB%s$Ci_cs z76<<9ZL zPB;d;CHf`0z+vo#r!h&((RnrKym6R|H^=dM zG=Tfijpv~WJbr3C31JZp7k(DI;Ck$et(b?~un2czBmRIy9ww8f3*CXIHi-RsIE3-} zSd5#{bv{O>hF$3TKVdHWhu`7{C(r;2iN*(dAVZ-a8bB>_I^jy}i4)O`W?&`Wi~NKY z{PJivVj8!j6*`C;@HiUq>y#^T;T9TZ^bs0q8}btl@QY`|2|OE%dxUTnR-u8^p#e|9 z9Gs3mUmwTk#r_j$K+mHAzkvquP7luCg|;wYrrXhy?vEbE0rZcf0h~?RdJ$IR&9UE% z-j(%efS;p*9YNRq1Fb+l7sewv6AiSg7xg#uaST|Asc3|EMH}OTbJ6D(p-1yF8t6K7 ze6I~~lcbjG?#UVHpT_>4F!;No4&*&laJzj_g(u_vF96jUL&_LE; z8aJWy_Mk_32%UEf4die1Eyyd+ZrB@rJ^Le{C!vyt6Km0o#>W06w3O50_)Ii_1P9?` zXohRhfLhTb+8W1q<2m%(<9Hz#!+_Fg=I3E4`-f39jCee{;be59dhCNU&G z(WlXjR-=`C6Frhv^!9&&Ub^-;eiE%jNt$XJS(=6em3TSUqLC)iW;BzR(C6O5{-tcCGiqYM4W2@8=}PR2?_nJti2Z5?E!`ya zh;Bu{sP2d+aeOJ7*mATouSD14Y4kVYjuc-&eUlL8Fz_Vlc=kCJ*`qieUAPYpz*;oW z>1gJ&kSc~|bc6M1;P0Rtw;|tI;d?Z(n#I3K+O711g*pwY2E1>N|T?06Dp)3EgOu`@117g~vK z*ox=k$7rCxqnEI2W%hfZCtBi5a0gDoE;w*-_W5cwp)0T}PQ^6djstxEAEz;tfz?=r z`>-SC56K494V~B<`{6*$!>iDMu0sQwg(ff;t=MCjj|>qZ}@D3bB zFG(Khdh0821m2GZwhD*iJ}kf@qIO<6nqe(E|LSN1`u;zHKDPv|%my^T&6s$pw$iYK z?PzAl(adtrBU|i=W^ggO&`nr`4`Dt&8C{B=^~-2L@1yJOMCa{CEA$r@Vuvc~&#M?p zNzceeq7yDc7rF|a*nkGmgf9F7y1<6$miYM&Of&v7nqgse_I2xyzC}aPf855Rfm~Ki z{oU{y2K+*qiUx8Mrtwa6!};hPSdKpbDi&i4mf%+ONOq$YX-5+{hOU=CESpGo^toZ^ z{ILlQOMNXGKm&5TVJ7-Tu?*dKJ^EH`Ml)|i??OBJTn{?@Ll>&h4JV)*T#rR~7k0xr zXyyx%QwYft8ZNjE&8!Wba3J=N#r{9h0&b)klw%1FMl&9RUbgYk>F9b7pzAfo{-W4l zfdrU@wKQDt{pjcDo!Ezd)t*Eb=r=O^S`No<^e;d!?*#Oc&W__t(DhcKm3SM|_#uwR zAF&LFp6}6e{+H2k!Rye8GjTM|K_A?RX7VZe+@9!Rw3Pp%73e%F`~QV9nBKitAoUupJtW||A@QoC9X6n09b+A;@==B7fXzIa;do6MHty40RbNy(+D sy_v}+nbfzLgC)aLyIaajCl+U#`hL}MM7pZxf{`s#`^_lJ?5(-)KWV{khX4Qo delta 3700 zcmYk;3v8Cv8Nl)L36vISX$w>VfsY~x2%|R@+lb(mq6Q2>HZ_2bvaoI~D;5K&Zxk<4 z@PeNjuP8=Cyg@8xn}SSI#W)DcV5QIqIu$V*GYCd4CfonddrTyyzjMy_o^zh(Ip_W0 zk(S*p$)VDoj|Kj8@%K#rp2!PfbS8vdg^q@>pfrRgyb+7=W9)~Ak)QA_zlP%fum=tu z5W*lFfv4lS*c-3LGMt0?_$Mq0AqlNC1~PCjy1_H(#8=UU+oOlk1y14+EM<~TMCVOM z=gq}l*c``O(E#p3H(rA#@Yt#GB!m}exbQ1jfZMST?!>;>f&KA6*n-EA$U_5Zy3j3n zYJ=EcgA*8k5{q#My3T%NYWN&o|3~b_{-FoE`#}L3z;N_|vB)!_8V#TxIi2u39E=Ol zj8@=yT!s9Ejr{Ux-p4Fkl8Zg2;(R(KE% z>}B-%HsnPJZ=)IQj((1A{3H4X_vW2;ok7S@D8~sn1zjg;q~XR((KEUqeUG0-16hw| z@EUr?e@6p(2eY^Xo%a=bl-=mO%&;_&e&|~;6y0zF`g+!+pC_S~h7;@2jAq6DLbQ~P zaeO5jz(Y6|A4M~K2MuT^dPMu;_z@gO|3n-g&c(1Y6=)zAVJY`7TtUN#uR}L%KsRc| zk+=fg;2E@(FQFT^p_lC4*#Bp=6Rp@0G@;|@b9vlg11v`8mt!CH4;3_AxDMTDdhA~l zoreb4h%USgsdBh8`W%|kR}gAf#{_ifsWUpiPfQ(`BJRH`6H>n89l;)8>~ZbX&aW~ zZk&n7Vt*QgF1!#e;d1n-?nS?_)7<6F@Lx1$x>8QqJg(eElx_!lihi5OVUz$Vi2 z4vZU}9?1ph!k6P1oQDQ{H(G(UNL9mM(G5D#1P-AacO&0np(m3~a2TF?|Iu}?OlbJ} z{T`jTB7X2Vn(4+k-j0^~FuLI}?1d#~r)PaS8o+q;h^o+1PeY%(0lhOfp@AjnYnj|f z!^`&+y5R=ghg;E0w03M->KCy${Wi1$Z{roX15Kc4Tsl4)&A1Z13p1i~(0~@i{z_!u zB-|4}$f2d*i21k;UFZXJ!%uM{ev1Y=WPFGRj32{mFL zydAT?|M$_Ln&B1v4er4T^m{T7D$#%@qZ6m$D7*^$;u18VThY?5MW25jt=P-h58ptK zU|Z~WDf@?`H297P-=lY6AZdC@D$v_M18eXpG_a4b8jZFPYS4KXqZ!Ua=l>)eC8SN@EocoSgnY{s}Cj-;M@y5d9868pprG zEd5>=q~l}I=O)B{Eqb<7(YsWid#iBM;D6KlR1NL#&D~KnGqZ2=o}%8FOh@iO z|CO14<>nM$pE;0wqj+YfGnXm3B-53GbpEWdPFK=yXY-+f9Mef\n" "POT-Creation-Date: 2017-10-19 08:56+0000\n" -"PO-Revision-Date: 2020-04-12 10:21\n" +"PO-Revision-Date: 2020-04-14 08:51\n" "Last-Translator: Bill Zimmerman \n" "Language-Team: German\n" "Language: de_DE\n" @@ -181,8 +181,8 @@ msgstr "Übertragene Pakete" msgid "Transferred Bytes" msgstr "Übertragene Bytes" -msgid "Wireless Information" -msgstr "Informationen Funknetz" +msgid "Wireless Client" +msgstr "" msgid "Connected To" msgstr "Verbunden mit" diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 54e887d87808db6009bd27ec62bd42a2fef903c1..606d982e20a5e2be89f15f890ae09b9cc3576414 100644 GIT binary patch delta 5179 zcmYk;30PKD9>?*6>;}pvnkc+j2==0*pePEaCQRX&;W8RN`Y1Cx<3`FjIat$8a&WQ) z^97?CHP^!2wQ?DkaVavL(X_El%!MgUC`%{JrRMwNo~LK-(~r+N=Y8)z=lt)zuPrb2 z+gs}AoQ(>oG90%_J90hPn0!BDj90a9?3(osYR7?X+#N)r7StBCkPHmP z!Pp!}qAF5|ny?79kY}(M=VB!Dn;SHA;m~{C3&*1R@tBHUjKEQ-TQmuE;WAXE7NI75 z12w@GJH8#YpriKlQ>a^U0kxo;=**=NLj8hp0WxMPF$p)IDsU1Xz&g}UL)f+|mVmjK zhVfW}9;`;)${k42%!jC3auE&B)_1st=CyXzUk}5Y_U?){pibO_+Tk(O1J`BYRToR~Fk{c7tPR0+4CcDN7qy_2Z(&!W!1idw*rsOyLF%4ot^R6oI*+L8L} zi{SOgK!aQhp(VspLM8*a=#rvgR00ksD=G#`yt6}l74HzcBLKPjv@5-qMr6zOv8()AF^2P zpKeJP)Q0;yG&Erz>Zu-!JkVw~4#6e1--tRf;sLkB9#mzzpzdu3YJxu2VRn29hB7`K z_5In_Qfx-wnNOpKAHV&`BFzD>`|o@Mssf{V$8^soqe?#uwetC>1usT_+=99#@1PcP z1T|qj>i3`lL(spoTj?;Qa*m0op^4H_Ck{YexWM`(>H>>UC9Sa@M4k6J>b$Qp5QDn7 z<6)?Z#i17BMQtG6j_2Z|djEe-Ln~Wt-GE{A-$k8x5VfEqsD)fYmGmcUj-kJBD-wg6 z(1Th?S1iU1)U#ECy6!I2b!*kv`+tlE)iHIbADHG{-M1hPRq9@-hio8f!pBh){ML?7 zMlHy(pFfYf6_wZ$*Wz52Tx#%P@Fph>QP=-7PrUJFoov4x>$6TyO{VV28 zbAK`OFp~Zh)Ghckw!kVhJX5Q13(eK(?v6)wcNa7cb>8&u)L%O+Wk44wM@_s26L2?b z!aCH-@1S<--@|?C!%^RlLXCH_{dA0?pNHDm81&#oRO#oTu2<26`nRI7m;v3Jb=Do& zk^XzAg)~~jGu(b>q!?zf?K`MvWEpC~yHE={jjgaARhe5DgP}d$g~vNIREi#`d-Y4y z@4-ma%BNro&P4q#EJ0m(pZ)wW#?n85y3SXqXXFlQL&3e=g~gyg?~0md0BS+bP#U@g z=mu&bw^17k>g_%wQK*HqMh|*W=k>=R zz5l~$=)}>eg-pZ<{3B|@GSur)VbrhpbU=!+=?LtjhYx~EoXHnm~g1YYa z*bbXzQ-3uQvfZ6!p-MXtwZlQE*Jmu=i!<$bIjSPdQ48B-`#W(w{SPn)y?xz(=Vzc6 ze#m+XwXw^6slP6Cmx22+>_PX7-B1g82(|J&)Kfdcj!#DIbOyG?*_eh^*cxk5x8xjZ z$5&Ak-oZGG=;yx9sSb@H3=FXY%TOooN0s;^)IC3ky0@256Es=_`@7@qQI+U``hKdl zJL=#0Ec8Pir(Ddx(fNn%OhmnAZxdeKrel>=mH4Y|pRjJlW26(&g65Mmbo=hO8eKR5woWIf9M>Y~24!J_|i3+OYH8O^H z$rkcH(eVTsOg4}VvW)0vjwJsi?~-BUB+)UIbRc@-bbP}9W|>JerjuN9p3EUT$S(39 zqNCKsyyDA_Y&~Wry?2NnJRRSA=4 z%=VJ7mfR-1rzVS>B|2(+nb8SO6|Eu?K^jOISxjaT9T&;!rj{{JVFY(*$PjXa=y*<#>mzR4+_H*4k=_5--*4OV@b^T&D|O^B`4@SS z#FD4UbrMb%5FHnMnK9m+?X=c5^^JKJ&yg>Pj$e^4n_9+X<4%%D_K?d&M+vF+)x^ZL v|A5x-$TjjI$s_uC(ea+|d`z6*k*#-Q8o~l6%q*Vto2_3au8;k>SrPI-Qyv!% delta 5156 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 diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo index 7f05fd366e3cd603a896d50169659d3945228cd3..265bcf1d3c6776b3b8cae9278be6ba462bf796b3 100644 GIT binary patch delta 4811 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 delta 5929 zcmc)N32;>P0mt$GYPbTDKnR2o$O8>Y2uTQ_CWv^12&o4Ff{IsMl9v$O?1p`tAd0RP zL9`y|R&51DQP2WjtV-n&4?wg@T#yTBmI@34#?dSjg zdHcV21MBPW4@5ucn{v0|+DmfCfv(2n`Hb0ooNA4!>1#|7r($n>0ej(YV1>23)b0s7d3zgs^j^n2`o(1M~%6Qf*QULd*D-;ikq+}?!YvB3&Z#kGIBG6 zX{w5r~xfU4fsja0G`WY|JBfoRA{C?u9!CxMIn)4l*x!GIYVQ!L;}m|WmCdl`B4aW|QCm@k zT9T=#j%K1dXhn5!4bqlbj2hrWsOQ%q9|-d_YGymF@1r{YJL;3{i5DxCgbAD^MM;L!Fh4_I{i7E!2wbLrv%a z>N%ZY4KNjtqkoe_K@E;Tb#Su1KizsRYG4PGfgQ-9@ZS}#(h5O(^QHYz-g%GtC4|4%?t`UL;?H2b*R(27&W7n zNZaN~)QsOnjr=nlf&V~FAg?g_*R2BeX*z)F_%Q0va1S0wHgcP-_%mb#cQq0 zv7GxYsI&0}YQ$M1lZWvn)POEPZGj)PBJHRxSZM2)qgHl3Y5?0%1K)#s|N9tCq3|aP zI*kWVZ|Gi}9BDS{J`Y(%bF#hnqZ;(A3s4QltjkdYc?7leTW$RtsP^`vR_H)6`>zKM zQNc&jbSX)8T!3nD4C?frifXVHbv6Rn8y8vcwmysw^>Jh_W)G?(UuklydSGwv2c!PD zjVxvTkE1Y(ip1Vv7w)T3OEm?x1s9^0`fAh+?m#{NAg19u)ZyH0>vyBt*=y_fp(b+T(WX64V>kpq6X{_Q9>Fzk+X~K0TkKI_f?Zj=?HC3pK%8F^%(Qmf8o_CMt}19yvGWbTH0toYZ0lb|?fD0&j=x0B>|1-^ z{iNi|q@jL40DTCio#?6|+Y+VZi~7|S-NZ{QQRJUo=#oZzFMdKUBPWov$QxuUsU*7k z6Yc97@*?>K(WP(7=g9fG;W~xfOZY=;ZX>6YyY&6f>Y6>I7{XWETk&?bUoTk91r! zZ9)58L@p!^wr(|!Ah|>bSl7i#5(iU7eT{cq85EY$zo{cr$)jW%d7b2uEkxH!az>(L z%)_W}LR}lk4Mg8`ov&NCnM-sCbuCJgc)gL=?c^OYov43v5xJV&O=gi9QA?~%lR z8kZwqT4pDCh3FbiDiWpS%M^%{XUTa)|A6UyRok04aW~GK}cb*YmaHIx?A*lf~p+l24u{*N`BYLv%%wBwhoFSLS~`h5N`)$pu7L z6}g}Mn*5gN<8~`)CRdRs$jhYTawwc;Z=S@Zw){BuB74adxjv;>XOL8;Obq{GH?~%m*r%=$< zL|PN2`=&a9ltX>WW{j2&HqUMS$k z_h&5dMV-j(X3q(=Mw&xGr@7IY7ix3n`hyW?n%`?ZqsEDZobj_Jcy6#E(f*t^H{9%c zs*cQdZJVA`9||@$H?@W7W|kWW&2`+X>H}?FbGsXuH@c}|1d=x+-gZP_32 zLQZj;M{CUyuhTRpSJv2u^F1f%Z#mjcN&NE6$9%Ek0Y_rf3NvHHS@VZD6ZLf1Wn5mw zGv|bwIuA3xD(fU)Q7|yiaak2dgP+%FnZ7&j*n0za$5&?G>&t8idM$o$j+q|uha)Uu z#A^*jVxw~!yV>8w?#lVg#7=AHZ)otG@%5nwcS0~!9Clga_VJ~O`;OJJ?>xF%el2=Q z?ApOM4gBsNdS(Wj(h~O#8SCp=9c&DRTN2O5igK%aGzTMYxY1wl#=P8uE@dU7OUhyo z=GIn~RTP(vDjr?tj2<(t?8Kr`T&d^yy-0Cw*dO!){zxc1&Z!NxP#J7$^EbK0wVa%B z&e8jEPB0Lg@@Nn;t(uFUuFL3i@XS-2dBA9OER;;tx8Cv6kVxVyEQ) zEq-pn03XM3)qgvR2MeeFu%kG!==br#BR~GWqj^7PvK8bvvm{1D`p~?IUAIo81 diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po index ca7711f8..4b21a39e 100644 --- a/locale/nl_NL/LC_MESSAGES/messages.po +++ b/locale/nl_NL/LC_MESSAGES/messages.po @@ -1,22 +1,19 @@ -# RaspAP Portable Object file -# Project home: https://github.com/billz/raspap-webgui -# Licensed under the GNU General Public License v3.0 -# This file is distributed under the same license as the RaspAP package -# FIRST AUTHOR billzimmerman@gmail.com, 2017 -# msgid "" msgstr "" -"Project-Id-Version: 1.2.1\n" +"Project-Id-Version: raspap\n" "Report-Msgid-Bugs-To: Bill Zimmerman \n" "POT-Creation-Date: 2017-10-19 08:56+0000\n" -"PO-Revision-Date: 2019-10-21 23:15+0000\n" -"Last-Translator: Tom\n" -"Language-Team: \n" -"Language: nl\n" +"PO-Revision-Date: 2020-04-14 08:51\n" +"Last-Translator: Bill Zimmerman \n" +"Language-Team: Dutch\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Crowdin-Project: raspap\n" +"X-Crowdin-Language: nl\n" +"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n" #: index.php msgid "RaspAP Wifi Configuration Portal" @@ -37,6 +34,12 @@ msgstr "WiFi apparaat" msgid "Hotspot" msgstr "Hotspot" +msgid "Memory Use" +msgstr "" + +msgid "CPU Temp" +msgstr "" + msgid "Networking" msgstr "Netwerk" @@ -178,8 +181,8 @@ msgstr "Verzonden pakketen" msgid "Transferred Bytes" msgstr "Verzonden Bytes" -msgid "Wireless Information" -msgstr "Draadloze informatie" +msgid "Wireless Client" +msgstr "" msgid "Connected To" msgstr "Verbinden met" @@ -224,7 +227,7 @@ msgid "Interface is up" msgstr "Interface is up" msgid "Interface is down" -msgstr "Interface is down" +msgstr "" msgid "Interface already down" msgstr "Interface reeds down" @@ -248,6 +251,9 @@ msgstr "Clienten lijst" msgid "Interface" msgstr "Interface" +msgid "DNS Server" +msgstr "DNS server" + msgid "Starting IP Address" msgstr "Beginnend ip adres" @@ -279,16 +285,16 @@ msgid "Host name" msgstr "Hostnaam" msgid "Client ID" -msgstr "Client ID" +msgstr "Klant ID" msgid "Information provided by Dnsmasq" msgstr "Informatie gegeven door Dnsmasq" msgid "Stop dnsmasq" -msgstr "Stop dnsmasq" +msgstr "" msgid "Start dnsmasq" -msgstr "Start dnsmasq" +msgstr "" msgid "Dnsmasq configuration updated successfully" msgstr "Dnsmasq configuratie succesvol geupdate" @@ -318,31 +324,31 @@ msgid "Dnsmasq is not running" msgstr "Dnsmasq is gestopt" msgid "Upstream DNS servers" -msgstr "Upstream DNS servers" +msgstr "" msgid "Only ever query DNS servers configured below" -msgstr "Only ever query DNS servers configured below" +msgstr "" msgid "Enable this option if you want RaspAP to send DNS queries to the servers configured below exclusively. By default RaspAP also uses its upstream DHCP server's name servers." -msgstr "Enable this option if you want RaspAP to send DNS queries to the servers configured below exclusively. By default RaspAP also uses its upstream DHCP server's name servers." +msgstr "" msgid "This option adds no-resolv to the dnsmasq configuration." -msgstr "This option adds no-resolv to the dnsmasq configuration." +msgstr "" msgid "Add upstream DNS server" -msgstr "Add upstream DNS server" +msgstr "" msgid "Format" -msgstr "Format" +msgstr "Formaat" msgid "Choose a hosted server" -msgstr "Choose a hosted server" +msgstr "" msgid "Log DHCP requests" -msgstr "Log DHCP requests" +msgstr "" msgid "Log DNS queries" -msgstr "Log DNS queries" +msgstr "" #: includes/hostapd.php msgid "Basic" @@ -409,7 +415,7 @@ msgid "Unable to save wifi hotspot settings" msgstr "Mislukt om Wi-FI Hotspot instellen op te slaan" msgid "Start hotspot" -msgstr "Start hotspot" +msgstr "" msgid "Stop hotspot" msgstr "Stop hotstop" @@ -426,6 +432,9 @@ msgstr "Logboek uitvoer" msgid "WiFi client AP mode" msgstr "WiFi-client AP-modus" +msgid "Bridged AP mode" +msgstr "" + msgid "Hide SSID in broadcast" msgstr "Verberg SSID in uitzending" @@ -445,9 +454,6 @@ msgstr "Huidige instellingen" msgid "Default Gateway" msgstr "Standaard Gateway" -msgid "DNS Server" -msgstr "DNS Server" - msgid "Alternate DNS Server" msgstr "Alternatieve DNS-server" @@ -492,7 +498,7 @@ msgid "Language setting saved" msgstr "Taalinstellingen opgeslagen" msgid "Console" -msgstr "Console" +msgstr "" msgid "Hostname" msgstr "Hostnaam" @@ -501,7 +507,7 @@ msgid "Pi Revision" msgstr "Pi-Revisie" msgid "Uptime" -msgstr "Uptime" +msgstr "" msgid "Memory Used" msgstr "Geheugen gebruik" @@ -554,7 +560,7 @@ msgid "Monthly" msgstr "Per maand" msgid "interface" -msgstr "interface" +msgstr "" msgid "date" msgstr "datum" @@ -634,7 +640,7 @@ msgid "TOR is running" msgstr "TOR draait" msgid "Relay" -msgstr "Relay" +msgstr "" msgid "Relay settings" msgstr "Relay-instellingen" @@ -660,6 +666,10 @@ msgstr "We proberen TOR op te starten" msgid "Attempting to stop TOR" msgstr "We proberen TOR te stoppen" +#: template/dashboard.php +msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page." +msgstr "" + #: common form controls msgid "Save settings" msgstr "Instellingen opslaan" @@ -681,3 +691,46 @@ msgstr "omhoog" msgid "down" msgstr "omlaag" + +msgid "adblock" +msgstr "" + +msgid "Ad Blocking" +msgstr "" + +msgid "Start Ad Blocking" +msgstr "" + +msgid "Restart Ad Blocking" +msgstr "" + +msgid "Blocklist settings" +msgstr "" + +msgid "Enable blocklists" +msgstr "" + +msgid "Enable this option if you want RaspAP to block DNS requests for ads, tracking and other virtual garbage. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis." +msgstr "" + +msgid "This option adds conf-file and addn-hosts to the dnsmasq configuration." +msgstr "" + +msgid "Choose a blocklist provider" +msgstr "" + +msgid "Hostnames blocklist last updated" +msgstr "" + +msgid "Domains blocklist last updated" +msgstr "" + +msgid "Update now" +msgstr "" + +msgid "Statistics" +msgstr "" + +msgid "Information provided by adblock" +msgstr "Informatie verstrekt door adblock" + diff --git a/locale/pocompile.sh b/locale/pocompile.sh index 50795c28..f727cac2 100755 --- a/locale/pocompile.sh +++ b/locale/pocompile.sh @@ -2,11 +2,11 @@ # Compiles portable object (.po) files into machine object (.mo) files # Requires GNU gettext +# Install with: apt-get install gettext arrLocales=($PWD/*/); # compiles message catalogs to binary format -# requires GNU gettext for f in "${arrLocales[@]}"; do echo -n `msgfmt -o ${f}LC_MESSAGES/messages.mo ${f}LC_MESSAGES/messages.po` echo "Compiled ${f}LC_MESSAGES/messages.po" From 93d28e0fe7280138f1c31dac9426cca589168f90 Mon Sep 17 00:00:00 2001 From: furkan-gnu Date: Fri, 13 Nov 2020 15:34:42 +0300 Subject: [PATCH 02/12] Translated to Turkish --- locale/tr_TR/LC_MESSAGES/messages.po | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po index 807f15bd..d47beaf2 100644 --- a/locale/tr_TR/LC_MESSAGES/messages.po +++ b/locale/tr_TR/LC_MESSAGES/messages.po @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: Bill Zimmerman \n" "POT-Creation-Date: 2017-10-19 08:56+0000\n" "PO-Revision-Date: 2019-10-21 23:15+0000\n" -"Last-Translator: Furkan 'Cuqer' Sarıboğa \n" +"Last-Translator: Furkan Sarıboğa \n" "Language-Team: \n" "Language: en_US\n" "MIME-Version: 1.0\n" @@ -252,7 +252,7 @@ msgid "Starting IP Address" msgstr "Başlangıc IP Adresi" msgid "Ending IP Address" -msgstr "Ending IP Adresi" +msgstr "Bitiş IP Adresi" msgid "Static Leases" msgstr "Statik Kiralamalar" @@ -270,10 +270,10 @@ msgid "Active DHCP leases" msgstr "Aktif DHCP kiraları" msgid "Expire time" -msgstr "Aşım Zamanı" +msgstr "Aşım zamanı" msgid "MAC Address" -msgstr "MAC adresi" +msgstr "MAC Adresi" msgid "Host name" msgstr "Sunucu adı" @@ -318,31 +318,31 @@ msgid "Dnsmasq is not running" msgstr "Dnsmasq çalışmıyor" msgid "Upstream DNS servers" -msgstr "Upstream DNS servers" +msgstr "Ana DNS sunucuları" msgid "Only ever query DNS servers configured below" -msgstr "Only ever query DNS servers configured below" +msgstr "Yalnızca aşağıda yapılandırılmış DNS sunucularını sorgulayın" msgid "Enable this option if you want RaspAP to send DNS queries to the servers configured below exclusively. By default RaspAP also uses its upstream DHCP server's name servers." -msgstr "Enable this option if you want RaspAP to send DNS queries to the servers configured below exclusively. By default RaspAP also uses its upstream DHCP server's name servers." +msgstr "Eğer RaspAP'ın sadece aşağıda yapılandırılan sunuculara DNS sorgusu göndermesini istiyorsanız bu ayarı aktifleştirin. Varsayılan olarak RaspAP aynı zamanda kendi ana DHCP sunucusunun isim sunucularını da kullanır." msgid "This option adds no-resolv to the dnsmasq configuration." -msgstr "This option adds no-resolv to the dnsmasq configuration." +msgstr "Bu ayar dnsmasq yapılandırmasına no-resolv'ı ekler." msgid "Add upstream DNS server" -msgstr "Add upstream DNS server" +msgstr "Ana(Upstream) DNS sunucusu ekle" msgid "Format" -msgstr "Format" +msgstr "Biçimlendir" msgid "Choose a hosted server" -msgstr "Choose a hosted server" +msgstr "Bir kurulu sunucu seçin" msgid "Log DHCP requests" -msgstr "Log DHCP requests" +msgstr "DHCP isteklerini kaydet" msgid "Log DNS queries" -msgstr "Log DNS queries" +msgstr "DNS sorgularını kaydet" #: includes/hostapd.php msgid "Basic" @@ -379,10 +379,10 @@ msgid "Information provided by hostapd" msgstr "Bilgi hostapd tarafından sağlandı" msgid "Attempting to start hotspot" -msgstr "paylaşım başlatılıyor" +msgstr "Paylaşım noktası başlatılıyor" msgid "Attempting to stop hotspot" -msgstr "Paylaşım durduruluyor" +msgstr "Paylaşım noktası durduruluyor" msgid "HostAPD is not running" msgstr "HostAPD çalışmıyor" @@ -572,7 +572,7 @@ msgid "Loading {0} bandwidth chart" msgstr "{0} bant genişliği tablosu yükleniyor" msgid "Showing {0} to {1} of {2} entries" -msgstr "{2} girdiden {0} ve {1} arası gösteriliyor" +msgstr "{2} girdiden {0} ve {1} arasındakiler gösteriliyor" #: includes/openvpn.php msgid "OpenVPN is not running" From 30ed6b90269c137812c0c791a56f18db43afac51 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Tue, 17 Nov 2020 10:11:53 +0100 Subject: [PATCH 03/12] Update BACKERS.md --- BACKERS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/BACKERS.md b/BACKERS.md index 9b7dcfa0..9104fb2b 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -32,3 +32,4 @@ Ralf J - "Thanks for RaspAP including OpenVPN. It was a big help for me." -€15 Felipe C - "Thanks for the good work on RaspAP!" -$6 Webagentur S - "Like what you and RaspAP are doing." -€20 Matthew B - "Great project, easy to set up." -£15 +Mikko M - "Thanks for the great RaspAP." -€10 From eb7c50be268d6af40d5ff2be60ceda49c6a2a3d0 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Wed, 2 Dec 2020 22:43:36 +0100 Subject: [PATCH 04/12] Log installer output, addresses #721 --- installers/raspbian.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index bc8c5aab..89f56514 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -51,6 +51,11 @@ readonly ANSI_RASPBERRY="\033[0;35m" readonly ANSI_ERROR="\033[1;37;41m" readonly ANSI_RESET="\033[m" +# Log output +readonly LOGFILE_PATH="/tmp" +exec > >(tee -i $LOGFILE_PATH/raspap_install.log) +exec 2>&1 + # Fetch latest release from GitHub API readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) From 3f4901495a30a7ebf40293f5d7c727968d59fea5 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 5 Dec 2020 14:30:11 +0000 Subject: [PATCH 05/12] Add stop services to uninstaller --- installers/uninstall.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/installers/uninstall.sh b/installers/uninstall.sh index 542ddc65..d0f160b0 100755 --- a/installers/uninstall.sh +++ b/installers/uninstall.sh @@ -205,6 +205,16 @@ function _remove_sudoers() { echo "Done." } +# Stops any running services related to project +function _stop_services() { + _install_log "Stopping services" + echo "Stopping hostapd, dnsmasq & dhcpcd" + sudo systemctl stop hostapd.service || _install_error "Unable to stop hostapd" + sudo systemctl stop dnsmasq.service || _install_error "Unable to stop dnsmasq" + sudo systemctl stop dhcpcd.service || _install_error "Unable to stop dhcpcd" + echo "Done." +} + function _uninstall_complete() { _install_log "Uninstall completed" echo "It is recommended that you reboot your system as a final step." @@ -218,6 +228,7 @@ function _remove_raspap() { _remove_raspap_directories _remove_installed_packages _remove_sudoers + _stop_services _uninstall_complete } From 6aaa1bd7a4bc140a9dab5c30cd04894537f3b905 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 7 Dec 2020 09:47:04 +0000 Subject: [PATCH 06/12] Set default install branch to latest release --- installers/common.sh | 2 +- installers/raspbian.sh | 4 ++-- installers/uninstall.sh | 11 ----------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index 4d4a03e9..fb540b67 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -297,7 +297,7 @@ function _download_latest_files() { fi _install_log "Cloning latest files from github" - git clone --branch $branch --depth 1 $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" + git clone --branch $branch --depth 1 --quiet $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root" if [ "$upgrade" == 1 ]; then diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 89f56514..35409dcf 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -37,7 +37,6 @@ # Set defaults repo="billz/raspap-webgui" -branch="master" assume_yes=0 upgrade=0 ovpn_option=1 @@ -58,6 +57,7 @@ exec 2>&1 # Fetch latest release from GitHub API readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) +branch="$RASPAP_LATEST" #override with the -b, --branch option # Define usage notes usage=$(cat << EOF @@ -67,7 +67,7 @@ Usage: raspbian.sh [OPTION]\n -o, --openvpn \n\tUsed with -y, --yes, sets OpenVPN install option (0=no install) -a, --adblock \n\tUsed with -y, --yes, sets Adblock install option (0=no install) -r, --repo, --repository \n\tOverrides the default GitHub repo (billz/raspap-webgui) --b, --branch \n\tOverrides the default git branch (master) +-b, --branch \n\tOverrides the default git branch (latest release) -h, --help\n\tOutputs usage notes and exits -u, --upgrade\n\tUpgrades an existing installation to the latest release version -v, --version\n\tOutputs release info and exits\n diff --git a/installers/uninstall.sh b/installers/uninstall.sh index d0f160b0..542ddc65 100755 --- a/installers/uninstall.sh +++ b/installers/uninstall.sh @@ -205,16 +205,6 @@ function _remove_sudoers() { echo "Done." } -# Stops any running services related to project -function _stop_services() { - _install_log "Stopping services" - echo "Stopping hostapd, dnsmasq & dhcpcd" - sudo systemctl stop hostapd.service || _install_error "Unable to stop hostapd" - sudo systemctl stop dnsmasq.service || _install_error "Unable to stop dnsmasq" - sudo systemctl stop dhcpcd.service || _install_error "Unable to stop dhcpcd" - echo "Done." -} - function _uninstall_complete() { _install_log "Uninstall completed" echo "It is recommended that you reboot your system as a final step." @@ -228,7 +218,6 @@ function _remove_raspap() { _remove_raspap_directories _remove_installed_packages _remove_sudoers - _stop_services _uninstall_complete } From 3b1c9b23c5ae3999a1b8b6905e3b3030166dc99f Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 7 Dec 2020 09:55:01 +0000 Subject: [PATCH 07/12] Update installer w/ -c advice.detachedHead=false --- installers/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/common.sh b/installers/common.sh index fb540b67..ce5adcb1 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -297,7 +297,7 @@ function _download_latest_files() { fi _install_log "Cloning latest files from github" - git clone --branch $branch --depth 1 --quiet $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" + git clone --branch $branch --depth 1 -c advice.detachedHead=false $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root" if [ "$upgrade" == 1 ]; then From da0e714f86be792284199eb0cac1204b43b302ee Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 7 Dec 2020 11:37:57 +0000 Subject: [PATCH 08/12] Openvpn template layout, relative img paths. Closes #716 --- app/img/180x150.png | Bin 0 -> 38125 bytes templates/hostapd/security.php | 2 +- templates/openvpn.php | 63 ++++++++++++++++++--------------- 3 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 app/img/180x150.png diff --git a/app/img/180x150.png b/app/img/180x150.png new file mode 100644 index 0000000000000000000000000000000000000000..975230ef0d692b3543085e781b31cb0ec103ba2e GIT binary patch literal 38125 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 d_?UeA{{!Q3^Px>;xCH

- RaspAP Wifi QR code + RaspAP Wifi QR code
diff --git a/templates/openvpn.php b/templates/openvpn.php index bfe83d9f..f6cd45b6 100755 --- a/templates/openvpn.php +++ b/templates/openvpn.php @@ -27,32 +27,39 @@

-
-
-
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- - +
+
+
+
+
+
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+

@@ -67,10 +74,10 @@ ' , PHP_EOL; - } else { - echo '' , PHP_EOL; - } + echo '' , PHP_EOL; + } else { + echo '' , PHP_EOL; + } ?> From c0e5625ae1dd3e3b3a398b198993c43b216a4829 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 7 Dec 2020 12:45:19 +0000 Subject: [PATCH 09/12] Update release verison 2.5.2 --- README.md | 2 +- includes/defaults.php | 2 +- index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e5e383fa..2ab02526 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/xeKD93p.png) -[![Release 2.5.1](https://img.shields.io/badge/Release-2.5.1-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/) +[![Release 2.5.2](https://img.shields.io/badge/Release-2.5.2-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/) RaspAP lets you quickly get a WiFi access point up and running to share the connectivity of many popular [Debian-based devices](#supported-operating-systems), including the Raspberry Pi. Our popular [Quick installer](#quick-installer) creates a known-good default configuration that "just works" on all current Raspberry Pis with onboard wireless. A responsive interface gives you control over the relevant services and networking options. Advanced DHCP settings, OpenVPN client support, SSL, security audits, themes and multilingual options are included. diff --git a/includes/defaults.php b/includes/defaults.php index fb543d43..eff12bc7 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -6,7 +6,7 @@ if (!defined('RASPI_CONFIG')) { $defaults = [ 'RASPI_BRAND_TEXT' => 'RaspAP', - 'RASPI_VERSION' => '2.5.1', + 'RASPI_VERSION' => '2.5.2', 'RASPI_CONFIG_NETWORKING' => RASPI_CONFIG.'/networking', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', 'RASPI_WIFI_AP_INTERFACE' => 'wlan0', diff --git a/index.php b/index.php index 8c702885..04aee0d1 100755 --- a/index.php +++ b/index.php @@ -14,7 +14,7 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 2.5.1 + * @version 2.5.2 * @link https://github.com/billz/raspap-webgui/ * @link https://raspap.com/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/ From 3cd5de59fea3609370dda180ddc866226459101f Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Wed, 9 Dec 2020 09:57:58 +0100 Subject: [PATCH 10/12] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 505b7abf..0b4093fa 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,9 +8,13 @@ assignees: '' --- **Before submitting an issue** -Please read this first https://github.com/billz/raspap-webgui/wiki/Reporting-issues -* [x] This is a bug report +All submitters MUST read this first https://github.com/billz/raspap-webgui/wiki/Reporting-issues + +Have a question or want to suggest a feature? You may do so here https://github.com/billz/raspap-webgui/discussions + + +* [ ] This is a bug report * [ ] I searched existing issues before opening this one * [ ] I checked the FAQ before creating this issue * [ ] I have read and understand the issue reporting guidelines @@ -20,7 +24,7 @@ A clear and concise description of what the bug is. **Your environment** * Raspberry Pi hardware (examples: Pi 3 Model B+, Pi Zero W) -* Raspbian version (examples: Buster Lite, Buster Desktop) +* Raspbian version (examples: RPi OS Lite, Armbian) * Followed the project prerequisites? (Y/N) * Checked the project FAQ? (Y/N) * RaspAP Quick Install or Manual setup? From 3a7ac95ffe9e4fcf2fc5d8cbfbde2cf934d88da1 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Wed, 9 Dec 2020 10:01:45 +0100 Subject: [PATCH 11/12] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0b4093fa..abe8e634 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -13,7 +13,6 @@ All submitters MUST read this first https://github.com/billz/raspap-webgui/wiki/ Have a question or want to suggest a feature? You may do so here https://github.com/billz/raspap-webgui/discussions - * [ ] This is a bug report * [ ] I searched existing issues before opening this one * [ ] I checked the FAQ before creating this issue From 9b2ea74a6f95354ad99d72d8cfcbaa249717cb2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 22:29:22 +0000 Subject: [PATCH 12/12] Bump ini from 1.3.5 to 1.3.8 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c6c21827..2b445d7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2125,9 +2125,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== interpret@^1.1.0: version "1.2.0"