From b08b63d4278fb699dcdc6ff5d5dfc44485c88ea2 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sun, 22 Nov 2020 19:49:16 +0800 Subject: [PATCH 1/9] fix wizard.htm misprint --- .DS_Store | Bin 26628 -> 26628 bytes luci-app-openmptcprouter/.DS_Store | Bin 6148 -> 8196 bytes .../luasrc/view/openmptcprouter/wizard.htm | 4 ++-- luci-app-status/.DS_Store | Bin 6148 -> 6148 bytes luci-theme-openmptcprouter/.DS_Store | Bin 6148 -> 8196 bytes mptcp/.DS_Store | Bin 6148 -> 6148 bytes omr-tracker/.DS_Store | Bin 6148 -> 6148 bytes openmptcprouter/.DS_Store | Bin 6148 -> 6148 bytes 8 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.DS_Store b/.DS_Store index 219147c872f5ab045d520759d8779069dc729854..ac5ab8316e3f4e24082faba5210f2e9325d8ab81 100644 GIT binary patch delta 2392 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 delta 366 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50C@2Jy2a6>$6epDz7i>&e&CDpY z*+PJYktwTVvYlWWBg5pSg1TWj>4w3{`MCu^4GauSymNpg8$%95DMKPdF+&kUa&Eqh zOHxjL5>TAu)Rtw2Qfm)6Vya0&Q#098Sb;HM@+o0mrPdvAO-u|04EeeF2*nV&$&w;! zlhZ}`W4-_lW&v874}>Mi7T?(oHv>r?VGcI=f(#^&F<#hM$i=vror6P=8E6R*2yg=l fS5S~`Ed0(qnP0{e6o3p&kiZ0mFT>_|o;l0_Y3o&M diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index e044221e0..ad41a924f 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -470,7 +470,7 @@
@@ -830,4 +830,4 @@
-<%+footer%> +<%+footer%> \ No newline at end of file diff --git a/luci-app-status/.DS_Store b/luci-app-status/.DS_Store index 65c9b2afcd89fa123d3f50a7463c8f28df68342b..3ed1d5e6f111ab54e4af9d17437013845fdf0312 100644 GIT binary patch literal 6148 zcmeHKF^|(Q6n^f7k`^I4oJ0qPENm6JfT->Uq|%mw4Jil)KzB(~u91>BYEmjFMOhg5 z1&Ev2_yh0<*jQj>V&`Y@p6zRsHYYZOPJWgBIqyCD+22d-8UR>-=Gy=*05Gu-8cnP! zgzQwdq^2~xh)j$zg4CO*i5GHj%Udfn1Db*VjRE?0>o9=~eBe<2e!qE17^KZZ=E%?(_*gJ#e#$r`iuW4_9s1dlZc4hppWKk25!j$5YWc z@W<%#^l=dTeBS4?*iXecjx?BN!)zS3+Ka`_{r!%0`(W9z7Pf8Q>R1Qe?sC~MuU@zB z+&_w5zFNFqzWE?oWw;3mxuWnCPOwp0WO!^lBOWEvq5F2z9`WH&ZDQt)lkbD*^VhrE zKK@^Ql1VYnM+#S(#|vi~hde$;J6>~5!(HwtSITm}5 z^IO@9@qS(hO(@&J_d97&^l~E=irOTZ^N!*1~dxg@pWa niJ}Wu>Npk+I*Qv^grLo$24YWPE)g{-`j3F1L06iAf6Blgn(qpj delta 244 zcmZoMXfc=|#>B)qu~2NHo}#D#0|Nsi0|SssW+=`{Hw;eB&n?(kxSWwuVDd*68?E?F zwLM4H9&!XKV`Io*C}Bup$OkFS%};Sj%E?axigQ5JOb%yNpIpx-!OUp$a`G%T8MceB zXE|BRbA-qm FW&k?|Nh$yU diff --git a/luci-theme-openmptcprouter/.DS_Store b/luci-theme-openmptcprouter/.DS_Store index 25181bc599bb2a02183fd3ac39170b5d7c5a0ca4..10f679b68f6e89948b30fc07e5d7faeae80e890b 100644 GIT binary patch delta 396 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aKKC<2lP@);PC8Hzn~@{>0vtY+S< z!10H9F*^sx#0C~!kP0@242BYh6o!15s-&F!B#<#c>miUP6hm|KQ(T~iazNBf4ri5TVwy0y zf>l=rb${G&PeggdHbe6fT=sT(Fp(gF}!Rs1*nVxPgQ#$X6Q+zcWwfm+=I7i-8GZHYf-f KHplbKVFmy}#6Bhf diff --git a/mptcp/.DS_Store b/mptcp/.DS_Store index 7f3055402f743cf1c348f508bb878894f6f038cc..62192371c05c02f0722cd9693c2ef4206a23791c 100644 GIT binary patch delta 43 zcmZoMXffEp&CHacF`1WHip^+t;d1A#lXaP8*hDU#ch221*`HaCalz(1=4m1TAX*K` delta 43 tcmZoMXffEp&CHbUIhmJPiY;l%neeA;C+jlHz?lBba*P``=P^$c0RTa74_N>J diff --git a/omr-tracker/.DS_Store b/omr-tracker/.DS_Store index 0706c24e11dfa7954a97dfe3b9f59653a31e0e28..3f60c36cf1471e468f2d11a76b084deca94e29b0 100644 GIT binary patch delta 37 tcmZoMXffEp&CE1&{$yTeDYh2gqUFw8C+jlHu>BFa;GDZ Date: Sun, 22 Nov 2020 20:15:26 +0800 Subject: [PATCH 2/9] del ds_store --- .DS_Store | Bin 26628 -> 26628 bytes luci-app-dsvpn/.DS_Store | Bin 6148 -> 0 bytes luci-app-firewall/.DS_Store | Bin 6148 -> 0 bytes luci-app-glorytun/.DS_Store | Bin 6148 -> 0 bytes luci-app-iperf/.DS_Store | Bin 6148 -> 0 bytes luci-app-mail/.DS_Store | Bin 6148 -> 0 bytes luci-app-mlvpn/.DS_Store | Bin 6148 -> 0 bytes luci-app-mptcp/.DS_Store | Bin 6148 -> 0 bytes luci-app-omr-bypass/.DS_Store | Bin 6148 -> 0 bytes luci-app-omr-dscp/.DS_Store | Bin 6148 -> 0 bytes luci-app-omr-quota/.DS_Store | Bin 6148 -> 0 bytes luci-app-omr-tracker/.DS_Store | Bin 6148 -> 0 bytes luci-app-openmptcprouter/.DS_Store | Bin 8196 -> 8196 bytes luci-app-shadowsocks-libev/.DS_Store | Bin 6148 -> 0 bytes luci-app-shutdown/.DS_Store | Bin 6148 -> 0 bytes luci-app-snmpd/.DS_Store | Bin 6148 -> 0 bytes luci-app-status/.DS_Store | Bin 6148 -> 6148 bytes luci-app-status/luasrc/.DS_Store | Bin 6148 -> 0 bytes luci-app-status/po/.DS_Store | Bin 6148 -> 0 bytes luci-base/.DS_Store | Bin 6148 -> 0 bytes luci-theme-openmptcprouter/.DS_Store | Bin 8196 -> 8196 bytes luci-theme-openmptcprouter/htdocs/.DS_Store | Bin 6148 -> 0 bytes .../htdocs/luci-static/.DS_Store | Bin 6148 -> 0 bytes .../htdocs/luci-static/resources/.DS_Store | Bin 6148 -> 0 bytes .../resources/openmptcprouter/.DS_Store | Bin 6148 -> 0 bytes mptcp/.DS_Store | Bin 6148 -> 6148 bytes mptcp/files/.DS_Store | Bin 6148 -> 0 bytes mptcp/files/usr/.DS_Store | Bin 6148 -> 0 bytes mptcp/files/usr/share/.DS_Store | Bin 6148 -> 0 bytes omr-6in4/.DS_Store | Bin 6148 -> 0 bytes omr-tracker/.DS_Store | Bin 6148 -> 6148 bytes omr-tracker/files/.DS_Store | Bin 6148 -> 0 bytes openmptcprouter/.DS_Store | Bin 6148 -> 0 bytes v2ray-core/.DS_Store | Bin 6148 -> 0 bytes 34 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 luci-app-dsvpn/.DS_Store delete mode 100644 luci-app-firewall/.DS_Store delete mode 100644 luci-app-glorytun/.DS_Store delete mode 100644 luci-app-iperf/.DS_Store delete mode 100644 luci-app-mail/.DS_Store delete mode 100644 luci-app-mlvpn/.DS_Store delete mode 100644 luci-app-mptcp/.DS_Store delete mode 100644 luci-app-omr-bypass/.DS_Store delete mode 100644 luci-app-omr-dscp/.DS_Store delete mode 100644 luci-app-omr-quota/.DS_Store delete mode 100644 luci-app-omr-tracker/.DS_Store delete mode 100644 luci-app-shadowsocks-libev/.DS_Store delete mode 100644 luci-app-shutdown/.DS_Store delete mode 100644 luci-app-snmpd/.DS_Store delete mode 100644 luci-app-status/luasrc/.DS_Store delete mode 100644 luci-app-status/po/.DS_Store delete mode 100644 luci-base/.DS_Store delete mode 100644 luci-theme-openmptcprouter/htdocs/.DS_Store delete mode 100644 luci-theme-openmptcprouter/htdocs/luci-static/.DS_Store delete mode 100644 luci-theme-openmptcprouter/htdocs/luci-static/resources/.DS_Store delete mode 100644 luci-theme-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/.DS_Store delete mode 100644 mptcp/files/.DS_Store delete mode 100644 mptcp/files/usr/.DS_Store delete mode 100644 mptcp/files/usr/share/.DS_Store delete mode 100644 omr-6in4/.DS_Store delete mode 100644 omr-tracker/files/.DS_Store delete mode 100644 openmptcprouter/.DS_Store delete mode 100644 v2ray-core/.DS_Store diff --git a/.DS_Store b/.DS_Store index ac5ab8316e3f4e24082faba5210f2e9325d8ab81..601c6b21a5ac0465114a08bad16d526e4b7a3343 100644 GIT binary patch delta 2462 zcmcgtZ%k8H6o2oweLl+TDx>9Hk?-kn;KJVM_{?0w; z+aLvl%zxo(4M7kT3~^3=6n(>@->*YWstNiyh9*@P z#0?@bo;r_sRI5U=K|UqzUpdm8f?jPtsC*1{ar2kh2|m(Vpi3LKbWkCjh|oc*HWR`+ zE&oJYD@RKXLXkd~wm$tr%2cG+K$l)gNd$bTH`Ah;|N zGSMYJXq=HD-2>>)%c2f8h&#^Z>E~c1&p>+l=Xo+@zH%SOqVVy$iB4hzv7Oiwf5=7M zLg_$bF;G$HvgBgdH!NB?Qn$k7vN9McWauaFOP3Le>G_1y$|5fTLskvEY4xJM0EQ;| z?9pghhpf7^*uCRu4Jd6aN${Dr97H+Z74!lgyN#CM)fz}axhe5AAqd=$ll5AdwX0#w z&Y`pG#bsA83iOP?VJO{Wc2mQS%dUCF+5H40JV??B~0RFCG(U7F4b#65jx;b>t zA|{=1$E$MOc~Vg2wA%uA-3;||=|CI-lO79jo>pYPgJA*u>`_v#VR8Rmk0S;P;A{s= zj$#$+V4a(WOVug}Rj)!mJ>0JDr04!*tVFG7f7_b{18XRFP*V((D_DNa8zj-#L#)6u z@sECwB+rXI5eVUrP9PrDiZ>H%*1FS3*9S(Q3)DU(HK7<5?vms4$Dj+&XjL*gMJPo+ z-0^Y9C_K*mw0LPjhafHSX>xUPi1?D>P(4E}K;Nim$w5)_&+6OI`R$?<`u*{WdPVnn zOi}&*3_5{$R-Xjpeip4KAf>^?&-&{~q>~Fc;q&i4Oh_fb1~}Tl&5; z6Ns5c7UANBn#^EtYC*f?7~1KFDj^dNA8N{nyG=?;BH&q5DMFL5p?N9qZ{ABHbt#0F zmn5Vc(+L6+T$h)CtA(Kxh)@d)_p%fKE!}ANCJeTi!Lov(Uwj??v;|`QeB#IoR!}P* z_gGFlQCcg8F6if!ijfT2c|RQEUVn)y0nd0D3Q60ob!vX!N|HnwXJCJ87PYfatl;rh z{Tv)^HIN*CueE?g-f2i~&r;aJSY=Sqo=u790xWMgkUe~7dz&16^#lC0I*anJ6~j!e z*5^r3oVN;L%;9;wo!FBwJ;)v~1>2DEIh+V;;80LWX>W=1?^w_@2d@Rqc>X;O<|1@V m2A4aspa(IuZ9J+HfpB`~5qrEUL`3+*Yl{B=M(~sC%=CXM6?9$z delta 2453 zcmcguZA?>V6u$Q@TrcHvTM%feEfg%+AT8yqwuM4V3!|V|ff0*ez)ai+6~vi2$ymwU z;uZy#GZQuHShh?zcmC+W0_`40Dt&3ow6)(n;&!Uy|>tw@O%HB_j%uQ z-t(UG+;i^MAh|V24wob3x(Nn;A9)-6RdhjbE zmS$=QUqmP&QIQ72N(FaUQ5l1Z1|VOpr6(*eVk7K0U!4kmwUiPGcuTFL1+!RU6O=Dj zz=--5>U$IVG|FUur`z4$(b5$1SVz1EAF!PB7nQlXWwu;g`Zsv3LRknH>2D8)2R_;Nz1nI_a zVOJE6u9N5>+KBbUy2u#MZss!wsrqy(1Z{dP*~P8UD`L=sW|&-93vEInv4_Q$i599G_Gv;HgOlV`7APzLu3yr}05!OK8lBDCa4sf@iLdp!hlnDEj}dLh5a0Lewo$hjL#MR~BRh@tn~ z4XKYOuFWKr#ViUEaNVhZisCI2N%HX!*1%LTL*Jl6#^M1DSW0Fg10^gOgzFY1^qAvd zxTF?sJq;#v7Nnb{)ag%!aE)doEkc~Q!IGJYn<1FD(8Fc&VD zOR3hNaDKep9EQ1YxP>Jru@056#!kcc6$uciXhtiwaIK<)o^HxmoC;z8HHS(<%6a`2 z!{kzy8*}(b^vgYAjhl4rwVUg4b0JGqAa`j1cj+0-ok|uBi{=K`=g2e&nQj}%+)_$Q zRr0UNa94++4Gt(0B(#Z7Mh^Vy_983)f#xJd%Ii^rV8~a&>xzM(J05maG1M&dg(?;f zTGQZuRU`VbTaZG3b)=>|DZDG8Q7E9lI)#oR?pMXZrD_%h2$0ugaZjsVB&uO}9M%0F zv~`Me3U9!k8itM{f;BAJ3KKQ&qJJ;KphpS49x2tnLU=;IM@Neghv4v}LeP_d;^Z*l z=|Q_IVbY_Ix~TTi5hO&5H(;cep`(Z=wJgGk3)JbrR9BC-(-@lQii%JZ4b`%T>RH^)2I@DWlRv{?y$(iL2rYK`ul`13Vm z^a`GMu%s!S400V!jWOu#NjS4yMWsCy++1I-&K9B2vSRrehiCD6Vsq5!AO|7K*NCit z!pFW;*x{2>%l{D^@AG9%!*f0zo}0h*$bAhfo0ZT5?4QFD<8;_O7 zO%Xd(p_$5l&U`%bid(g!0+yqDr)JTUTF0GCgr}pc15wQ+!A`e6zyiSy&n6lfAwh|hxf!{3reUV7vG9~!3tx)i%cb}d!wdA57r;DV SCkPEh{|I;*bW#TXl!0#!_g+>2 diff --git a/luci-app-firewall/.DS_Store b/luci-app-firewall/.DS_Store deleted file mode 100644 index 75395d38a900626a24c08ef893572e9ad8fb2267..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-veG47N)_MKE*&I^DnvB-RyIanqC!GE0UOW4 z=eui2nj$t-AzSi&iGR+zFHsy55f5+kgs4wMJ*Z%37t0zEzi3N3(XtO@zsH1bW>?8* zVvDjBt%glxK%U(WO=(U!Sz3L5-2Ytl7dFerGdqU8cX7WsetTG)v}5vLW6EjmJ>fHK zK^-c|Hr}73$GfGyUiahuIT^h8x<03{-}P2~jXDD-b-Hwovs#)rYSH#n-B+)7aQ?bH zXO&y8xz69HOGfIdC76p54E!qwxSNf#A&wM#YwK{*YYp@gDk5<%V3mRk--;0{ dt@se?1$HABz%-%@2n$4i1UwD8CS5T1=eDhl=}p7!7am^X+eUPb5&)V5F$2?=WMd4ax!;L$hmB!VyD(TlI( z$!~VnG}~0XNs*bd`)%fDhyAi-Iz(hf^*kXO643yIG1|klLDUpbT8yVntw@W$IbVaw+dw=#~-CmSgHqFZ^^n5Am`*ZsKt?%ajczZ~WA6;G-Q$WhDyOuG|S>ksW<~saDuGZGgcmMQq@+#-- z*jG6>*~7e-d_EOrKp9X5wuJ%IY?i^kpw7yGGN25!4Dk2CVlbv28$tK!z~ov0U<|br zthtxq80#_h*a*S`F%k-tP~%$+BjM0n@0WUP1SOn|Z$6CAYw|1e0OlmTVnUol|fY@Cg7Bwt&5hvQmnF(w!+?AHjkAy~Ll3|}tA cM;K0^x4ZzR9veYuAo@qZ(V&wu@TUxX0YtE3(f|Me diff --git a/luci-app-iperf/.DS_Store b/luci-app-iperf/.DS_Store deleted file mode 100644 index 7b5151159f9bb681166b1633b06a747b39fdb6f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S=v^B!VI(f@TX2fO`sKnG@s!A&Ha}wrl~e*@iO5pyU!1a3C(go1Mkj zaS$Df&`h-Z*7MoXKCe6(A~IRCOo%2#G{Rtv#+Y^p+j$Hm3Yrt3@q66SqF5!7EAf&mL{t%PP<3MKy;Wm%=rh&Fl5hXZfp7z3$$VOKd?A)l~KG zPj>#L@8-SwcuvkT;p}u*3I|$^mg$s=WJuUId|Fn zdHwk~w~8{L3@8KpzyNAC%jj58XJtScPzG8C`1@cn7}J1G(0@8G`4#{eL+u4??j<3xA*gN}|9q=0*H65h-# zi8l_SLlK&ZX5V@~JKE=!Crd>>mF?z)uIobKp}TJLZFZPQ?V9s|5 z&hY`$fVCn#5T~g?O?Bal;WQm~AL7!0wW6kzlgd~pRCeKp;-ot4Uc$+xiZ&Vp#z4%# zo<8=u|6l)n|BsXG$rvyO{uKkRlZ~?xwiJ46YjfOdJ@gjJ!g00YDg_g1#farrJb;S8 Y?s)=C1J;VLKS5T1=eDiz5^5Knv1yLp3H;$7$qXj{-jN`jhuUZAhxLGb1ic+dy(1^i}b zNRy`GO^VEv*>5vHJM5Pw(6RX8@czcEJj)6>^bSAFYxo4$UXYpxSxpCx`z{aTKlt*=|}=!>0p7xB>uUn1f)R@C4`; zGsQ*_9*C1vprkszVmL{M-D_N?*a%8GIlX*1t?cxM;zD(-??X7bOwdMSz!>N=uqTfR z_y4P(@BjTIdol)$fq%t-i}Ptd!IreQ4mQWV)AAio5D2_`+raK>Yh}uNdLSt;~q1#{_=T@^u@Nlv5V+?3o zTy=T_H=fk8)$tb<;Cr`ABbw2W9M$gM$^CkK?DD){xIX;+P|O#L*Ry)g@W-6VD1J^d z41swRG^b0N(hUvL=jiEkJs!{F;rOm|_!#C9jWKqsd2Gu`=kdn#XwZaQ%Ky^+_Q$** zrxmZSiTT!JDbG9eG;y5{zgfyVWb>> z8}hP%rJ$6P@yr+}Fq^PLF`gZM>(j|(g4(MBsz9p1j-0l6{XgHn|4)nbOchWC{*?lz znfG%3gCnf1wTt7m)}mdYv2k80Se4+wFU82^rT75N8~m0JfLXv&5FVI*2zVK^Qw4ri FfiJt*fgu0@ diff --git a/luci-app-omr-bypass/.DS_Store b/luci-app-omr-bypass/.DS_Store deleted file mode 100644 index ab36f815f39505a924387033256a507d0eaf0ed0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKF;2rk5Zp5sGJ+x{K@?Z;0sp{6<^^deqr?&^VqHWGwLd^ZOHYTy6A(=v!XK!a zy*-Q_C!#|U+LiX^ytjKJk1d~xcKteopag&T`&t+zGj$KrM-`ze{)Y28*(ct|Zzi-ahwkQ^rUBHh+;o9~3?P3^H{uJTJ_XV4oJh`NN@yXx5U8I-(ce>Sm3jG=QAN` zir7$v?yB>1&UZff#me=F$V{4LMl>d(5tK36$FMXCW*yElS`%;CHu2B{g(S4>WjxquurO$`!@DbaU8oDSWe9y zoLzj`yLpeEU$T?ekT=9s?mOT5T0hT>^Q1VZ!|$=5%iML>y7{uFkJEQKXB*qixoN$h z*K%GJWk4BF2DXI()NGc~fuN4cfHI&Av<&d~!9p4Hh+Z&!IxvJ50GPrY1as~sIL1cI zBYHusK#YU}CDg&nHu~iey`Y4XiOq+JnN93aOvsM?ZEz=(3+kv0C4cI0u) z_5bSU{=XljPs)HY@UIv!X)!G(I8v;wgTryHwa^)qh5fu>8-htF#qi})d<+c&yX6Tm UkLU$qf#@HBK!Xm-z@IYk37XPg6aWAK diff --git a/luci-app-omr-tracker/.DS_Store b/luci-app-omr-tracker/.DS_Store deleted file mode 100644 index 68034362b31c3f0f9127d23eef587417f71673a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I%v!V?sBXe+_c$Pv&z4*=pBSlD=pF7Q}v$IO0>sqeby#9|3bs3sSm zpA+|O@76tgY3oW(@OzAFC6}nx`nvV5mY>HT&$7>se^qmnKdyVq z`%_T{lmTU6TNpskX36$F>ZlAT1Ij?l0Dm8HD5DM7c$7~E2Dt(NQwv$n*0E(U z?uaqpN7^@hKYi_+$#e?9jJC5OFaXeJ6D-cy9WaSYYgrLJQf&MfQ>+&c!|~KESFLPy z{6z)i-koBO4Q8-t-M_Ki_$gd#v$@ zY5p7)AN%oq9{8R|GRD%T^EjN7&qL%uffa1V-+g`l@~6DL_ow0Ii(kL5N%{6;8Bebg zo(|V(`P*b%=w791yli5piw~H4<(ym z710IsuMT$p2te%6?Ty#|8;V$pgIGm$0qLQcP)ZD?CLS?ND5t-Sc~wLgFqFf1W{wk? zO+29(&rW~o(_yNB+N%PpK(4?^_&bpO|Mutee_o{jQ~_1sUnyWZ^|&5!NpWv&El&2@ tlI@O7O!8d7ri2%MD`u{2#TRVe=r84hSVeRJ>7nU|fR{l#Rp6)!d;$TPdawWh diff --git a/luci-app-shutdown/.DS_Store b/luci-app-shutdown/.DS_Store deleted file mode 100644 index 62557add9490c6a4df95707b45ca8187da06ee0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu};G<5Iu(o1;Nk-33c+oz`&B3B~)QxL+THpHc~sZas)-J;RE;$Ha>ur1qptN zcV`pgricwy=uSGnAv~a=VG2K=1J)WYjw1Wxy(a%uFH3F)~>Uy?Q(9K zk9jTgs;L61fGV&p3ZQ4RW&0j=R0UK4RiIUXzYiA9SOjc5%BKT^907nS!eY3Ve>tG# z0I&$yctiwdd@0bEnsCH0z8rBI@``|sM_*1xnDLyzY{Ch}2s`3d(#aGabyNjZfmneZ ze>>p*fARDAKQ7WcRX`Q^R|=T49G4?3DfHIf;<(pZ_%)o3^BRwB2`;1+BbQt85nK#$ X%NM{RVB--HnEnWe3_7R+f2zPIo`qmd diff --git a/luci-app-snmpd/.DS_Store b/luci-app-snmpd/.DS_Store deleted file mode 100644 index e2117360ddc16045923e48262104b57e4d2ecfbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHLOHRWu5FM8Y6~Q7)1PgKiB$OM3D(sQEfF-n*V3EiXki9QZiBquS65IfZi*N(p z*h7e$R_suPW-9wR^YK$&+_)|gnMu3IiBcjOqcM*5(5*3!a~s%5JO@DI=Xjubb(c@) zwr&R5>exmF_}T4JMJ?UZBMqM4>E~*^wq-f1>eqpVS5pO4fvr&hdp6s6KcM!ifGVI0bPDkMAwy#<1YJP?>Okj@0Kf!pZy2XM0A_-P zpbLly%!E>4C^d4#Frgg&O!5jr7ci8Qk;8`(W+NvQGY{N>J*ceBYuS@+o#85JfovKvcFurM$%FfkM`wckJTF zvCH%I{sWq%gl^~p@78T|Y@d^L-}-po4({$>ALDrH+@ky*!zO>DU%b^O#(*(k4D^rz z-QCjN9?s3CWDFPszhi*+2M=Woij`p8I#9$b05E|$3hI29;2f_Q6e~e^AWl+&lIrw| z;Upb)uW>=K5|nguv1hcSJv+UjxY#@FK8BMEf>s&>#z2#SEqNUB`G4Gf|8FMQlQCcn z^ojwOWYdiQMA5UgH90GlvZ?TNTkBTlt1847#SGZ_$4Nu&sIoD zA~7LAw&Z&kpM7!OMR80-JiT8`h{i;eKm`XQ3>_ltqAeMiMHV^kv8F4!qa|(DH!W{B z{6+@k>_+j-aw@5Dev{dCk(ZkC{!6!4US!#PUCgnXoV^_$KR>;m^m#76=~=FtcMjN& zcIkmubV28MyKd#(YI+>Jw>_G9Z652qzU-41pE>n=b>t&Cxi|yPfHUxy89>bzN%jO1!@za4JwgA8(%uz6xUP5AmVQN?@VgOyJwKEx{ z>>k_ok9z0((si3%*&wgkFJIf`+xzXIrZ3xzd&AT5dHeIXlcfSwfC^9nD)9dlK+iU7 zt^*mV02QDD-wN3GA;ArE#WB!79SA-G0PQ#44bMJH0Fx2GTyYEp1Jfu4Myb{jL!%sg zs(HEM7#QWEelyOgH*1|x)Nco$JY6&gGExC5aH_ynEEm@Q@8B2a|I;F_r~noCQwr$3 zTX!qGQthpim$P1*;P>!@A=lFpycGkz6=Pwo_~s}t*)#TY#WB#!!FxH7KLVx;jSBpR F0$(=$C zW0tcmGk{!=vCI;dG7mf)V^hOhQ~>vGjzz4`ny_b&_pj*>lCB>q9~i&vqBU_@k8;4+g1ZN_0oP)_j=#3w&$g7-^O2*iXLLm{~ERi2c?B=6{lVpw|Y7` z3|c_>z8}Vc8q`%k4iY_%YdVA|h{8c>X*gW{yi$?N>(x<34r{B`^@`kBTN{lEqWr10 zxqH|-IUSyj&M%F~9Da}5K3cqoD+ng6H#(}hP1WgYD!(XCW_DDgVU-cn^S}3RuYYd6 z#18&~-EBXf#SKno!hDb2UL2|T2pIRPMK&2JKnjoouPb0r4KepRl^CP|De#{ufaik* zM|3P^2KCVag?<76=Al^|#Q2uL9BI+9m>Gl~Fm6%-O)9rf3~th)U0R-FF*9h=8MluQ zZoka!3x(^i!}wCu8Fvg)NeYkxPZgLl)e_$SJCoo4Pm`!d3XlTtN&%j4xQ#k2$=={Z*|!9t?s15#@0r6 ztHW+@ZcZjmdg+>V=l((b?D_a;^5R4hP4HZjvZnDXyhLTezN16S8SprjE@buNVvm^j z`sk(D;<)n-EkA!xs& z{f7QTk3IIniDSQ@KhPQ5AW)#GIG_qV()i8V^StZl$j$%&YY&1ZKn(ymI$^1T%{@lr z6Fq(K@~&^tfVgZ?x)Sb7NyX zuJEOm=GObe-s#!se0=dmi_P$NscgaEHGIWj%DUs@rh6oNsiw4kPiORGr(=}ji&sDQ zetrAC{V%NG5v;U(`|BL~$SLbNakC_r$uVYLt3oVmRspNPOH{y|0{qoWT)bVgRlq9n zR|V*N5a@)C!9t@tI=!1_F<5BS zbYQ0VVCK!tR47cn9p@J+9hjrhwpIbFz+DAq^ka?g|9219|946D$tqwKcvcFqa>wno zaY^QGomd>*wF3PRos9AdjW-kw)K!eRbQLe7E5m+40it8D(1<-~_K$#)!8TTbCsp7N D2iJ-( diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/.DS_Store b/luci-theme-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/.DS_Store deleted file mode 100644 index b27391782c25c7f2947c34963ae61f1481d58592..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!A=`75Vb=ZoS>>XR1{A5(p!)cwGeSY+NSA&Tct(xP!Q~PqhzJcI?8Su(KOY5 z2Ydjh{z4BGr~Uw+!7ngl8`LErP9Q)t()f+XGxqxJ%HCm&@zyA4Fji%Z2~fmB8JZge z$5CgbU_B*3uIK2m#2+UEKT`foG&vq41NiPrEM$G=u`bKMzkmK93X`;6KjVeD;)~L} z5EW5*S=n=YYV4+7I!apJ@GJH{duh+N_O?>dmF@XEVQ0Kwef?3zsTanbp-v8i4utG} z3FAPGTWS;siJr$b145KVdB3_mnXJ8gUz4lN`m`n|jkS8SCO6jCr_-`{^R}_MbNebOsy{FRE9ck8`>NfxU$Iy`IsJ3``|pR@nBdNs zLGS-{BrcbGj_>X;j#S(Q|K+n|3<)tn3=jkN%YZ#`#KQe9L$ebD#K03|0M7>ris)F( z4CT delta 42 ycmZoMXffEp&CHacF`1WHiq&X#;d1B6I?S?cA{Wm)=Wdzo&n(BdU~?YxG!Xy_RSgmV diff --git a/mptcp/files/.DS_Store b/mptcp/files/.DS_Store deleted file mode 100644 index f177d78c795a48c68463c14667725aa3227793ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKv2GJV5Z$#6tc?&Zkcd)kL+8Q=N|Y2xhcN|Rq(h{DD7nj7@k!@f%Xh{CV{{)u z13y5M{6sn=dOA9O12MBZj&0dcA_Ozi?3~ax zj=Cll@-zS?*6@N;GZ?PTW5?gi0KU7b=!rs{rf19V@8H`aGBDk4l$r=UYUliuw|#N> zXgM1HCOYgdSG6BURg6V0M$sf6Qq|AVFirBJ-To>o)!Mb|H3o0mz{Xwzb2On(SUQ9Vh;*rd zE>%*CAzeE7HO=!0ONTC9NNPSLtt_cSk#=>cukCapeTO_U1I)lG16B9f#QXorulxVi zBz|HBn1O$a0a@z?-41Mt?$))<;a#giPe4&{Ug_{E1q^!?!(6NVP^v;;Kohwo;T6 zw|#)|9rzNvP1+st0e0sj@Sg2$iCQ=!#Qdb^-^=@B$G=#13;?V<4mto$0N|*El{z*H zgyN)gQZb$eBBMS!?gtqU=kl!M-(`TlT@`!?A&HKQ-*0*QE)vUL&yS>!9$X0dm$S2r ztztCzLv%PO_DbsvmLP=zcrb##KS_tC=SzPWg=yAqe`l3yZRx>7&Ktb3+&FLta^hxQ zHcq?V=si8{c-g==_O6uCt?l{m!v5s2`Q)`sGA~T}BUKy*eN5Tk3zI-jx^kQZsp`ko z0nY2Ze%M@{PG7FKTjJHmtR<$M_WFyK*jQVe&FXyRS!eU@QG9Yb{WSZ0PIJH&k4s+3 zV}m#F6^+6a%e4M@T8wIm`g|TDykCn Y3o;NLgSkfZpx7S)MT2cD1Amo)U)UjrrvLx| diff --git a/mptcp/files/usr/share/.DS_Store b/mptcp/files/usr/share/.DS_Store deleted file mode 100644 index 509554931aaada76cda32135e3714f4be3f2e967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-piJ5Z<*NvUU{31(FffHtAgWh=QPqbU02yhjdX=BoW+k7Cz~GYuRV4#Bp>l zkpf`}5su_f`lY+vC_1qAr9`popa^6n_zn zqb^8^JS%__`xp(P)I?CbiUtd<*|Cfa;I}IaBl=<(P3FH}nvC*R>spq|l_x7tm8z-Q z^V*l7XC^@&=HpR29Dc&uUYPeHvfmq%-q~UFA?Z%`>#J`~mWN5!9opn1?n0B#ACoLL zleQUW@yPZQxPVesRo$&}PP^29l`q#F( zkiJ7MnE__tJ_BV}t>gXw?%(hK`$=452AF~WiUC>a1f4c4iSE{g#o=A6K@UJtuwCKs lE(HvG6+>IRiq}A`fM25l=o1zW!2`lS0+t3Yn1M%S;5X<>YmWc` diff --git a/omr-6in4/.DS_Store b/omr-6in4/.DS_Store deleted file mode 100644 index 7c7a4bd74769f7526935bcc6c03c1b2fb8ffc444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~O-chn5QVEW!hoAB#f^Og=Kz5=j3>wiBu0%eVFKcQ7GA`i8!zF>e6On%Cl0s^ z5~`s4^-opL%m>rmB_cY1UezK~5vfq9%EpLscy#K>ohMK&Ydp0N_2RbMY)6*)pF@22 z6Sr(^w8+(ol#)IlH!3<(@tcgpks8o$hFl0OWIUJwWZ z2Sz|A&7zs(qx@|B^?5vN6Uq$=jeb2FFti7k0Cc#IoRvwNPi(_4yY{ABh2te08W({A KB&r~=2LhjcwoCi*fmvH8`!mZiF4&yMJWT`uBh(G; delta 42 ycmZoMXffEp&CE1&{$yTeDb^O=qUFw$b(m$@{)k*~&fPNEpIMIaz~(&WX(9j~=ncyN diff --git a/omr-tracker/files/.DS_Store b/omr-tracker/files/.DS_Store deleted file mode 100644 index 5d05dc450cab0ab55a5354e8452d94c779518910..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy^hmB5Z+A!Y=RIjkT_9oLzf~x;B;3YnGgyj3MBJW0J_-c=wiw7Mu|fNA;=Ov zJv6iwcTaHLbvyyDLdneT+$B*0B|S;su=hAB`Z3v0jLFXJD1Mgqru*Kt`z9}m73|ihQo!hq;k!3o?$FKg4W1`d2GB67|*Q2X+1~@Ox_c|QqnaK~qbM|x?Wnl)G z0cKzW1GG)3%Nt_sVg{Ij|C<5aA2cXpKv+7oTL(1u3IJFGw-vDQE`c?gFd!@)LIgy* zQb1QK>53s;Iruf@1%#zTS1u%7J|xX7>4qZh>@dEz=|Tn$xn%~JfmH^ouIu6X|KQj6 z|J5SyF$2uNKgEEob;3>?mPBXk+T!r6)u3Ha6wE6fo|k}Ok7CHhqj(F{3ive|fB|9Y S5Ii9KBVcLZh8g&y4EzMXgMmr_ diff --git a/openmptcprouter/.DS_Store b/openmptcprouter/.DS_Store deleted file mode 100644 index c037b11b5cc390094a3b58b677037c302dec9a29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}(1u5Z+A!-K0X~P^la^?4`FH5}^DXD!FMma6>X`4=oBdc8Mj&8^uneHVyJ? zz(a7MPtY4L0I$Q$?h+*ph+EWFGt%rgJ3F%zf3|irj4|FE1P#Wjj4=Uvz0REG;d+5TYU~ zE0trnqlRwgWrMWo^*`h6(91f$wU3mFC${H*jKX2N`s#y9GA~NPzD|yU5JJ9uijqJL zn`)2*souvm3qq7dxm{fwjW&0;YI0-e?YJgKdmHtd+}hk8kIUlqo5s6?lkWE)qo3pR z3&SjjPf*LM#Rs?qW9kv(vxa-Bx;?$jZ?9%oyQr7QB z=2&Q|{x`Ru#40%h@53*~2ohp|7$61~$bdb5#LETNq*BBHG4O9Nfaik*MRY9Y2KCVa zgKhx;OW@W5Hue&jBP}`>bAzw~!c8imN#(Z1;3ggX(#AO!bAu+Gaoc=wTbbJqh3o3D zztrK3I|gYa28e-K28w1{#ruE%>HdEp{0v@@u9x*d-0-WbeJ~IV)C}y~aL)Vx48P1|kzc38C>RI^ zc8md?^~-*NP5IsWZF{_H6WRqDg>jh*1bX!dz<}q-QE{3-QAb?om<>4#?Ij%;4}n5R Kbiu$cFz^Pe!z-l# From c1c89133bc73f25f1402494a68f58c06d2d1353e Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sun, 22 Nov 2020 20:19:35 +0800 Subject: [PATCH 3/9] deletds_store --- .DS_Store | Bin 26628 -> 26628 bytes .gitignore | 29 --------------------------- luci-app-openmptcprouter/.DS_Store | Bin 8196 -> 0 bytes luci-app-status/.DS_Store | Bin 6148 -> 0 bytes luci-theme-openmptcprouter/.DS_Store | Bin 8196 -> 0 bytes mptcp/.DS_Store | Bin 6148 -> 0 bytes omr-tracker/.DS_Store | Bin 6148 -> 0 bytes 7 files changed, 29 deletions(-) delete mode 100644 .gitignore delete mode 100644 luci-app-openmptcprouter/.DS_Store delete mode 100644 luci-app-status/.DS_Store delete mode 100644 luci-theme-openmptcprouter/.DS_Store delete mode 100644 mptcp/.DS_Store delete mode 100644 omr-tracker/.DS_Store diff --git a/.DS_Store b/.DS_Store index 601c6b21a5ac0465114a08bad16d526e4b7a3343..d02c15fe67507710f330aa2f52b69258b29a66df 100644 GIT binary patch delta 193 zcmZp>8A3B;$?g`*wJ*oRO*?lsjsnlcvXW7Z81<^%bI`J_DFo2YA z)^!$UWny5MEa0IuImM%jkzwpJsqt`6*DV$ygsnL9*^WwRjbmdTnSau9}hhyr84=A4ju>`X2HC-04t Unq0udGubF6j&Z~0i8008041wLc>n+a delta 195 zcmZp?$-2(`o2vu+n3xQax>6;I;nY3luiyt_z%)IHm_a<+Czck590f1BowgpfC z00SG-a|f`SBFxU(grww55jDYhfEM^`E^Rek+MMv#6B+@HfJQ(gpb^jr{0#`;J)4O! zk8Cvetj!?75B~l*^wcmL=*zbZHD!%1wRiRDbz;XMCN80_akt+0 zTY0+cu)s;Pti|c1J;e>7 z%p{GGssN&pmYUy6+T)~M{gmFm_(qZz11e71EFXom6hB9lJQAcCa0w~918uks4ieZ_ zi6h4_&p2@@=mAamJeuaC>^J@4EBf%*_&$sM*QxF{->06mm$G@OoWQ*tZa1iAcv+v|K&93A}K7zjgBf45N0((FpEqn{C{=YE${r?_T z)UFxybFQ0ak09*fy{+VSZzwc?fpA97oL`6;MZi7~30K}79P$)o{^4ao=wK&>4|jV0S>#SRgKATN9c z5S{oC5fAOpalRnHjY*k zyEVe?ysb!0X*Lmwct;=dV3KD+%z_nfqc98@2L3k&__te!Arue-1O5B`8f0;l7u(xE zNo~WrRKIN7O}lxu`NA8riC6f=IPdzSXZ-1rUkn2^e#}@rAN#?RXfQcwZSJ$Q@S}7v z62Vb8K$quFqcmibE*qy|F5crwgKanL#zAXqI=#KK)24TKXKgxl9Oq7(?sht}S;M}5 z)7g7?n7n#DeKULeQL;*K6B2Sw;Tas`KwD&dSNRUs8ihYrDon6mM#o|S$J{SASLS;sV0mFb{Krq1f2a1iOtFV+PwhrvX z6#&sfwGbThy9AG+3SEVzM6{p~8Hy-FiMnDC8IF3Y{9J{lL>Uf5T|S7)Ow0OyFbwDnY{7B(ShqkMqqDl8?U2F3g%AZRe1Vc?%K@CRhP4bA`n diff --git a/luci-theme-openmptcprouter/.DS_Store b/luci-theme-openmptcprouter/.DS_Store deleted file mode 100644 index f76438aa166dc9d82a52cd4d127f52b3c9c54b31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM&59F25U$R~brKbGSTG2}T)YLz?BbF=2r?x^ucy1Jd+Mu6cWMFvtT6~2fHDAB zSOk_%VYNWSxF~ay(>-g54DA70knBXfZhyu5qGJn&O-)dtlm>=@f%0 za~!vYI$~YpM4>VVrp$rqm6^^^m|Pw0Y^e^cu8?YCfEbu(K;-VL(18>J;4}HV_$pn+ za_NT@X>92F!=$Hk{m*_c3X`;2{lao9`4g)rEvsl1&lDfH9X@nZFC8QeuYXTm-SpCq zuiLjdkEU(UzZ15HyQQ^jJWjnZZug~e7_?F4{@pMR_^`nTagfM)Ts2@>1*@=IDvw6% zwOYl#yfv=aBgb(zD)!dq=6GDN&Ruk_?Cf zRfu2!9wg9*R_3LPF#LeU3|dC_hy`tXcpYSkR3o99zuu#Y@2~&7tlT%xI6}z<0qZbd%jH1^c%jT z-gJ(v&)7dWJd{3X#(zDei^fe~@j1iCkj{T(ii8+Ajts1*n=Xs||N8Rx|Hsiax@Tg5 z82Cd5Sib2t8>lRPS1uB9%G+4>um}-)6NS?mO6mg3H%}C=n9?y8PZ&!APF~)1%pvqW@F(yC}a|IawBe;$_ zB{}O^0OWd)#P20-KT`fwEID2$1NiRd**ObY#2Re;{r&RWQJAEa${(Ja%g-+?3Q-ir zrQ#2_sd{eerQM|Fb-v;3*h`zfwLdErjcm{V5;l4#rImdZr(PI0IyyNF8W8gRYZwQr zS5w_MNc29gSrDQi3MZwtet%=TQkI)LgR<;bE8CySa%XF6Fer%CkJa6y)7I5>|7LJ| zZf!LNm7u4fC>WO+ m9HoGvuVRSBt9T7m3-~1(fR4q?Ab3FNkAS9u24Y~Q4EzOi%Wif6 diff --git a/omr-tracker/.DS_Store b/omr-tracker/.DS_Store deleted file mode 100644 index 2a19d55d361703c3c539663cc5d10e1d2d88ee9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!EO^V5Ve!Eb%H7)REZpY=`Du@)TlimZPS3n4QWw(XsdLW4arKIb(Gx@K^nCD z1QKxJ!YA+p-1q_{zJ?jwiIS#OZxO9#r12Y%XFS=rD?7s&A`I6E zuA{C<&U!Whx!xo3$H~Btl)n;7j{lPZe0Lk{Eel!1I&AU%{q_e@n54DZAD+t>Ha53} zD2dW`>D=w9v7377C~11bQ=Gl>(w=Ya*Gffm+w+gZ&bVFPIZ|=zg>h%7lf$3`A!jFH z9H?3*#$_YS62IjPt7pH$^RqcNQp#pB)jvzHhB_a7#g z(~n;avm8D_Ee|cu;42slj~I39?id;Ew8YphA7hyh~YZZLr7g9Jr%EM^Av z(E)>Q0RRi&)&e&65||?`Iuaf4m;fy;5X(R@Sfn^5rW?IJk|M|`R|8f$|hyh~YUNOK6Ew|N#N3wV8%ERGZD?u+n qQ7|quI8OmXU&RoMS8)YY3-~1(fR4q?Ab3FNkAS9u24Y~X4EzH^h;QTo From 1b6ddbdee3f14fa235e16f13a38a57798da7f480 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Sun, 22 Nov 2020 20:35:00 +0800 Subject: [PATCH 4/9] fix --- .DS_Store | Bin 26628 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index d02c15fe67507710f330aa2f52b69258b29a66df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26628 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 Date: Mon, 16 Nov 2020 01:40:44 +0000 Subject: [PATCH 5/9] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (240 of 240 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/zh_Hans/ --- luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index d24b7169d..29b08d3cb 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-11-09 14:31+0000\n" +"PO-Revision-Date: 2020-11-16 04:25+0000\n" "Last-Translator: antrouter \n" "Language-Team: Chinese (Simplified) \n" @@ -1042,7 +1042,7 @@ msgstr "mtu :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:543 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:699 msgid "multipath:" -msgstr "多路径：" +msgstr "多路聚合：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:459 msgid "operator:" @@ -1062,7 +1062,7 @@ msgstr "漫游:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:467 msgid "state:" -msgstr "位置:" +msgstr "状态:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:546 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:702 From 72b8e2080fafc3ec7217cd27100d9ef6fb07e3bd Mon Sep 17 00:00:00 2001 From: antrouter Date: Mon, 16 Nov 2020 01:40:44 +0000 Subject: [PATCH 6/9] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (240 of 240 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/zh_Hans/ --- luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index d24b7169d..29b08d3cb 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-11-09 14:31+0000\n" +"PO-Revision-Date: 2020-11-16 04:25+0000\n" "Last-Translator: antrouter \n" "Language-Team: Chinese (Simplified) \n" @@ -1042,7 +1042,7 @@ msgstr "mtu :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:543 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:699 msgid "multipath:" -msgstr "多路径：" +msgstr "多路聚合：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:459 msgid "operator:" @@ -1062,7 +1062,7 @@ msgstr "漫游:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:467 msgid "state:" -msgstr "位置:" +msgstr "状态:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:546 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:702 From 937872e05c38fd9afdb751b82364f2eb7dcaa848 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 22 Nov 2020 15:51:31 +0100 Subject: [PATCH 7/9] Menu name via setting and typo fix --- .../luasrc/controller/openmptcprouter.lua | 38 ++++++++++--------- .../luasrc/view/openmptcprouter/backup.htm | 4 +- .../luasrc/view/openmptcprouter/settings.htm | 6 ++- .../luasrc/view/openmptcprouter/wanstatus.htm | 8 +++- .../luasrc/view/openmptcprouter/wizard.htm | 6 +-- .../root/etc/uci-defaults/openmptcprouter | 6 +++ 6 files changed, 42 insertions(+), 26 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 9af857553..b01d7a126 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -8,20 +8,19 @@ local ipc = require "luci.ip" module("luci.controller.openmptcprouter", package.seeall) function index() --- entry({"admin", "openmptcprouter"}, firstchild(), _("OpenMPTCProuter"), 19).index = true --- entry({"admin", "openmptcprouter", "wizard"}, template("openmptcprouter/wizard"), _("Wizard"), 1).leaf = true --- entry({"admin", "openmptcprouter", "wizard_add"}, post("wizard_add")).leaf = true - entry({"admin", "system", "openmptcprouter"}, alias("admin", "system", "openmptcprouter", "wizard"), _("OpenMPTCProuter"), 1) - entry({"admin", "system", "openmptcprouter", "wizard"}, template("openmptcprouter/wizard"), _("Settings Wizard"), 1) - entry({"admin", "system", "openmptcprouter", "wizard_add"}, post("wizard_add")) - entry({"admin", "system", "openmptcprouter", "status"}, template("openmptcprouter/wanstatus"), _("Status"), 2).leaf = true - entry({"admin", "system", "openmptcprouter", "interfaces_status"}, call("interfaces_status")).leaf = true - entry({"admin", "system", "openmptcprouter", "settings"}, template("openmptcprouter/settings"), _("Advanced Settings"), 3).leaf = true - entry({"admin", "system", "openmptcprouter", "settings_add"}, post("settings_add")) - entry({"admin", "system", "openmptcprouter", "update_vps"}, post("update_vps")) - entry({"admin", "system", "openmptcprouter", "backup"}, template("openmptcprouter/backup"), _("Backup on server"), 3).leaf = true - entry({"admin", "system", "openmptcprouter", "backupgr"}, post("backupgr")) - entry({"admin", "system", "openmptcprouter", "debug"}, template("openmptcprouter/debug"), _("Show all settings"), 5).leaf = true + local ucic = luci.model.uci.cursor() + menuentry = ucic:get("openmptcprouter","settings","menu") pr "OpenMPTCProuter" + entry({"admin", "system", menuentry:lower()}, alias("admin", "system", menuentry:lower(), "wizard"), _(menuentry), 1) + entry({"admin", "system", menuentry:lower(), "wizard"}, template("openmptcprouter/wizard"), _("Settings Wizard"), 1) + entry({"admin", "system", menuentry:lower(), "wizard_add"}, post("wizard_add")) + entry({"admin", "system", menuentry:lower(), "status"}, template("openmptcprouter/wanstatus"), _("Status"), 2).leaf = true + entry({"admin", "system", menuentry:lower(), "interfaces_status"}, call("interfaces_status")).leaf = true + entry({"admin", "system", menuentry:lower(), "settings"}, template("openmptcprouter/settings"), _("Advanced Settings"), 3).leaf = true + entry({"admin", "system", menuentry:lower(), "settings_add"}, post("settings_add")) + entry({"admin", "system", menuentry:lower(), "update_vps"}, post("update_vps")) + entry({"admin", "system", menuentry:lower(), "backup"}, template("openmptcprouter/backup"), _("Backup on server"), 3).leaf = true + entry({"admin", "system", menuentry:lower(), "backupgr"}, post("backupgr")) + entry({"admin", "system", menuentry:lower(), "debug"}, template("openmptcprouter/debug"), _("Show all settings"), 5).leaf = true end function interface_from_device(dev) @@ -730,6 +729,7 @@ function wizard_add() ucic:commit("openmptcprouter") -- Restart all + menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" if gostatus == true then luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null") luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") @@ -751,9 +751,9 @@ function wizard_add() luci.sys.call("/etc/init.d/mptcpovervpn restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/vnstat restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/v2ray restart >/dev/null 2>/dev/null") - luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status")) + luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/status")) else - luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/wizard")) + luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/wizard")) end return end @@ -914,7 +914,8 @@ function settings_add() luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null") -- Done, redirect - luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/settings")) + menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" + luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/settings")) return end @@ -937,7 +938,8 @@ function backupgr() if send_backup ~= "" then luci.sys.call("/etc/init.d/openmptcprouter-vps backup_send >/dev/null 2>/dev/null") end - luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/backup")) + menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" + luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/backup")) return end diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm index 174e7cda1..f7ebf5bb0 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm @@ -1,9 +1,11 @@ <%+header%> <% luci.sys.call("/etc/init.d/openmptcprouter-vps backup_list >/dev/null 2>/dev/null") +local ucic = luci.model.uci.cursor() +menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" %> <% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %> -
+

<%:Backup on server%>

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm index da7e9f494..fbc61a7a9 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm @@ -3,6 +3,8 @@ <% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %> <% local latest_omr_version=luci.model.uci.cursor():get("openmptcprouter","latest_versions","vps") + local ucic = luci.model.uci.cursor() + menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" omr_test = false uci:foreach("openmptcprouter","server", function(s) servername = s[".name"] @@ -13,7 +15,7 @@ end) if omr_test == true then %> - +

<%:Update VPS%>

@@ -34,7 +36,7 @@ %>
- +

<%:Advanced Settings%>

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index e02083b86..f4836fecf 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -31,6 +31,10 @@ -- * Many tests -%> <%+header%> +<% +local ucic = luci.model.uci.cursor() +menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" +%> @@ -48,7 +52,7 @@ } } function formatBytes(a,b=2){if(0===a)return"0 Bytes";const c=0>b?0:b,d=Math.floor(Math.log(a)/Math.log(1024));return parseFloat((a/Math.pow(1024,d)).toFixed(c))+" "+["Bytes","KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"][d]} - XHR.poll(20, '<%=build_url("admin/system/openmptcprouter/interfaces_status")%>', null, + XHR.poll(20, '<%=build_url("admin/system/" .. menuentry:lower() .. "/interfaces_status")%>', null, function(x, mArray) { var status = document.getElementById('openmptcprouter_status'); @@ -218,7 +222,7 @@ temp += ''; temp += '
'; temp += ''; - temp += ''; + temp += ''; var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png"; var equipmentIcon = ''; content = ""; diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index e044221e0..2fb57a315 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -7,7 +7,7 @@ local sys = require "luci.sys" local ut = require "luci.util" local ifaces = sys.net:devices() - + menuentry = uci:get("openmptcprouter","settings","menu") or "openmptcprouter" function device_notvirtual(dev) for _, iface in ipairs(net:get_networks()) do local ifacen = iface:name() @@ -35,7 +35,7 @@ } <% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %> - +

<%:Wizard%>

@@ -470,7 +470,7 @@
diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter index 9fae15302..24cbccb20 100755 --- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter @@ -107,6 +107,12 @@ if [ "$(uci -q get openmptcprouter.settings.scaling_governor)" = "" ]; then commit openmptcprouter EOF fi +if [ "$(uci -q get openmptcprouter.settings.menu)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set openmptcprouter.settings.menu='OpenMPTCProuter' + commit openmptcprouter + EOF +fi sed -i 's/net.ipv4.tcp_retries2=3$/net.ipv4.tcp_retries2=15/' /etc/sysctl.d/zzz_openmptcprouter.conf From db9577ba164505ed8c1efc644916ef3878530644 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 22 Nov 2020 15:51:56 +0100 Subject: [PATCH 8/9] rename interface only if not bridge or tunnel --- luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename b/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename index 0928e0140..ad256bae9 100644 --- a/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename +++ b/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename @@ -14,6 +14,10 @@ _set_intf_name() { config_get device $intfname device config_get modalias $intfname modalias config_get ifname $intfname ifname + config_get type $intfname ifname + if [ "$type" = "tunnel" ] || [ "$type" = "bridge" ]; then + return + fi [ -n "$modalias" ] && { if [ -f /sys/class/net/${INTERFACE}/device/uevent ]; then chk_modalias=$MODALIAS From 6364c3675030aa6b01d11e5aa8e661d03a36265b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 22 Nov 2020 15:52:37 +0100 Subject: [PATCH 9/9] Add another IP check for proxy --- luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter | 3 +++ 1 file changed, 3 insertions(+) diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter index 67a4160bd..5df98b004 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter @@ -703,6 +703,9 @@ function interfaces_status() local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") if mArray.openmptcprouter["external_check"] ~= false then mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website)) + if mArray.openmptcprouter["ss_addr"] == "" then + mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.co")) + end --mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com") end end