From e073e3bbcf3c322e2067cb1d55f5bf2bb2cadbe0 Mon Sep 17 00:00:00 2001 From: henrypp Date: Mon, 28 Jan 2019 17:29:33 +0600 Subject: [PATCH] upd locale --- bin/i18n/!example.txt | Bin 15636 -> 16870 bytes bin/i18n/Chinese (Simplified).ini | Bin 11142 -> 12376 bytes bin/i18n/Dutch.ini | Bin 17056 -> 18290 bytes bin/i18n/Finnish.ini | Bin 16492 -> 17726 bytes bin/i18n/French.ini | Bin 17916 -> 19150 bytes bin/i18n/German.ini | Bin 17642 -> 18876 bytes bin/i18n/Hungarian.ini | Bin 16918 -> 18152 bytes bin/i18n/Italian.ini | Bin 17926 -> 19160 bytes bin/i18n/Korean.ini | Bin 12346 -> 13538 bytes bin/i18n/Persian.ini | Bin 16066 -> 17300 bytes bin/i18n/Polish.ini | Bin 17368 -> 18602 bytes bin/i18n/Portuguese (Brazilian).ini | Bin 17362 -> 18596 bytes bin/i18n/Portuguese.ini | Bin 18188 -> 19422 bytes bin/i18n/Russian.ini | Bin 16894 -> 18180 bytes bin/i18n/Spanish.ini | Bin 17658 -> 18892 bytes bin/i18n/Turkish.ini | Bin 16640 -> 17882 bytes bin/i18n/Ukrainian.ini | Bin 16536 -> 17770 bytes bin/simplewall.lng | Bin 159234 -> 160116 bytes src/resource.hpp | 329 +++++++++++++++------------- src/resource.rc | 63 ++++-- 20 files changed, 217 insertions(+), 175 deletions(-) diff --git a/bin/i18n/!example.txt b/bin/i18n/!example.txt index 48ef8c8393e78ed40ce0d416a428155edd050347..a595b4a50387e529683fd3800a5c892a91188e96 100644 GIT binary patch delta 840 zcmbVK+bTp+82+T3nz^BENDjM6ktj8BfilLHo%77#j<(q|Ova41L0mZG5q{o7$zv#w zppL}3d#%;_58vTm_m>}c4UeDQQtgV_Y0P5_X{;gxhvyldeVoBV6$KRG zKfQO4C*^gzt=VD9CbII-H{5%S05#N^P~ckTxrza;L*qwAcLko)5Aq z&&-rs#UAOfqA3zjUrxZih`QWbgU;Uws;5T(4kLyC!=NAQKYsj1n`igXi;#c#;{Nm` IVy-Xn3nW6I_5c6? delta 13 UcmaFX%s8cL!w1RDT2d;?04;(AZ~y=R diff --git a/bin/i18n/Chinese (Simplified).ini b/bin/i18n/Chinese (Simplified).ini index 25d299721668b0536a873fc184583f5d2c0fe25b..bad588197b9e7e8dde356e37f4e4d81bcb1741f9 100644 GIT binary patch delta 1114 zcmcJPy>1gx5QUHEKp@3Rfkb5xLZP9GA{rNqZ4?VgknJR*au%;0EF2s8FM?*fJOJDC z3`o2TG&}_r72mnnRvbW~LM!i%XXeg1b7pqWkG>v%{a~WPFYBEq8f%8# z$EY7yWn@LkgOAXCvx0DH91qxg)1^FU{g z{RY?xo!S6NCQ7`u}y7%#Z$===t z+pN+P79{pw*Ae-xFaxto(b_7n7G)hR0jmxFeULg-NR~@hp`N?z>g^ia5uRAl@Ub%S zQeaf(KnhF`s>S1t`+0|XtTrVfct-er;1auzwLJYn@W%B$;dmN$#cCPjVq-4vN`x8# wIJ>0avZrFcQM!VIUz*roROi32c=Z=)*JY`N7AY^-jCLg}uHn2b7DZAfCpRT(ogF_idFY+u6eD%StPQp<~2mE3ZpQ_DzUx{|rC2IS#h92q>05PShUT8@9 zx{g$8tSNDi_keiB?pTG}tW-BL;)30w&nPv~RV{&gp_}_$TkE$#%AuBnFs1I;_c={ySysCfly6e8*toDO$dv{RV zWZj3YS!eG2a-a>5!n2)#cu}FLHxDwe#yFZ!Dfy7DfwHv!@q*4WCfRJ(O=WipvPmLm=Q2NHUb{;8fAw(X17tz z+}@>VGeKyV8M(*R2l26mQD|_K7np`X3Yt`-uSLTV!*P?9QfTZf_-GA{_4#d>oFgI z+10aaqhP~YvgSmKcGWSftHhm0*Z;x620!QvKKvIJ?pt)ZHFtHQh#{$exkr-Mv{(;U8?fcTSu>xWp#pj zZMvOduc*!8fOUDDdX)G^zdQi1h9c*}9c8^sL?0DFQ#;+EWR~eURGX>!KV`+4W@bJb zU$n>_74)uoGkbL9>Kmnh^$_dqs@)-3H9lt_fo8ew4%xr6h&SWGxcxUzsy>@~zB%HX OT#O6z>i)<_zrru*JFJ-i delta 14 Wcmdnj#rURyal-+r&A+79r~&{rI|kVR diff --git a/bin/i18n/French.ini b/bin/i18n/French.ini index 6affbe58c371d06548c328e50da32793ace4909c..a54c51b5d1ad1206bc53917b15e9c313f23cf004 100644 GIT binary patch delta 964 zcmbW0!D#ssbB#~Y)G{5`6YMfR0FZCR8RT)!{gpxXPCIu>bDL`ZpH_+#kYgicDMSb(_V7yM3qmW&0Zl>&KqjBVM5FfMph&)PeinUcQmg_%5?> zmxm6`$J(PL^~RgPjHb=jOwXXp-En;->QE8JVv|a1rLX4;(k4Vgt#JhmyEpb#@-tQL zQ~h$*g0+L-JCSyw%mGMtEDC$ZEW=_sM=e!^H8dZHHJ`>LycF)g$LgmheZKmq^cf-Y&k~ zywZ!V_}#{fD&IZW+tfvWS`6(5@)H1lS8Q+WP)gMa7$#+Ud648w85A$>uFW=a{;@W~ zW!b&4UQ$o(ud)BNBas$%)EaWzJ>@eB;JYYhiR{=drjWd16{g91|+CyFv zHo_JeYrYr1ZbZODeFpkZ+lmjR<>B9v{ilfPq6_~4+p3#$2N$ucL4ni zR$N^04O|=OM&Cl;q6;6w-?@`w+~`Iw+Bq(`1Ok{(QexXXIApfXYoG)f&)4&)*&? z#sl6H@{6)&zRl;>m2;V1&sZMgQ0_X8v{GF-rbkRSb?3{}%6gMgJ(0b!Mo(Un-LNhy z2j415I1k|!ngz$Lw#Y8Q*u#NsYL#zWj>zs14LIYm0v&%a?xOFCohRQ7UaD)3@_gC;puB#C+kB&L)OMB6BhWR>dqi sx8R@-)NpS1FC5f?RH-`uA6b~&j#Hm>b<&55)ufK5i0NPZ4`;2qUuK}PRsaA1 delta 14 VcmaFS%Q&rtaf67=WD}G*!Vo(sm8TCdyyU6bBpZM8Wt1Ri8H&h z)W+7e+_JCzosav~^xo#JgoK8jTc`SQzgEU1r1r{&B<CQ2 z8M`UD%Ffv9u{-qqg0s7J+nRtU_LAQMh3_MFTlS2o<7X$VPg&QkT>_ZHGpG2Rf|pL` zlK3^S1?Ar^pi;<90UJOq z5s#W7uGyL&Qhmmi1VRZ!BYQ|!gCDV7P$coDiE>H%QF6hB>nj*5U$-8m%AU@R85Da`bOn4u`sgI0I z6V`HY)~D- DaU{qt delta 14 VcmcaHm9eddaYKph=5?}@GypI11^WO1 diff --git a/bin/i18n/Korean.ini b/bin/i18n/Korean.ini index 56267bf38de05f81c58df9aa79ada8a21e6ec565..089c066fe38e258640eb015f56cfd4209012928e 100644 GIT binary patch delta 1073 zcmb`G!A=u#5XL7Qj8r{<;Xt{dAyG->M7U`zWep7|O}A*gh-;Yqm8SFJ{yKPUk-}-#6dPetz>k`t)((LwxgY&9>}?)$F;| z&BK0#9om@%mRQHS*yF2(FLN`GE&IAw9besBy*B>#Fqz3--?%>OlTx>RYh`nbOMyp9 zU~erZZP`vNwZ09pJDd@Ag12uy&Io&eHy~EgA-*2o*u|&Z-Li@`pyS&CzY^tkcDYy? zHL2Z&WS2Taa!(!dDfT-MQYu{(RRegOP&a}_z=2(Ssf#}{ z9pNsiu1%5McXV4&erh^>+olZ-gqvb79euoe31_+5x8}cV1g-^W_n$6xCGFlKv$B#1L|ApQ|PE@{69ffo26)z T;9HKl1k1b2SN&hYX%T(`4Kv5( delta 71 zcmV-N0J#6+X}VyrtQE876|fO0EC3(?$hok_q{1Kou*M(&bkME2AOOVHAOOg~AOPI0 dSi4l>YIe{r+K?-P6peUkoVVsL>5faOGl8$Kc*}=lGqqCC;By=Sm zNE{EqBSfO7;2C%To`7fI_w6R~1pyU0`EGW0cE3L}{`U6MyM^-~<^1NI8~19qVS84y zZL3>MTqREI)SQj2XMN%?-^)Mm=buZ9r4AK!+qHK7Vfk(rQ{n7|ji{>Fv86V#8F7#I zka$dXVgueo;wf22t*R4p1F|DupR%`P*R2V9#}4>ipzz%!yJcOXw%=>8-ez63Rt8`n zqJ1u(ap8%lb3*(Q*p%zvTtGR<9RoImnqxnZn|cx=eMIEgliVqf=pK^OO_KI!`dN|x z>Jec8z#JFr_bb#5HgHvPkjP2JRHE0Z1soz7N z4a0oMap$K)-UwnoBUh&*K#c*MS^hp+$^H(g|4YykME?)SVvA}tsGCosQfuyDkr$S# z_m)}TcCZ_~JJ>zEeQWXVU=Q#n3F!M{sR?%GPNAhkxp#hxgintll*!miVqSl=PA$ziC(L z*8ZSyo4SmUPd>y4@T zI*0LseFyTfZIE8`vTL{m(h~N3@9tS{YNr}gRNbI9W4>Utht+?a8;r`lCOZ-7d9$}5n;_^XwOqe%8 x|09`;nc-?=-FjdbRJc}b7)LCt?pAWQ*G8INoTlVCNzcGLoVk9&|IpR5`voX0BgqTDo7-L9}&QjZSCkFE~ChdrV%+mEx zFW|xl5PTAS4;fs#^Sf0_vYDL}sj9BJ=bn4ct^D{@`f^(O+Kb%L_9geCx)nFn(la&G zQ&VmBd+akEE7e>><;uP_qSKr1^M$QSLO@ebHDG!=TEmz`P)T30UI_IqcrpYs9B!p8HvjP8#rb zDftk)_c5bKUVCFx@TuN=?jST|v?fmcX?Rd$#HGIFW{@$h8^6(V|8T5bb1Ep-rn%qc o>g;@GQyjEe8~zKo`PX0jx5?e|3e3B}6rQd9)6Vq}MfL#x0I-j=vH$=8 delta 14 VcmZ27k?~SH;|4$3%^k8WY5*=c1+D-9 diff --git a/bin/i18n/Portuguese.ini b/bin/i18n/Portuguese.ini index e1240ca53345f72f3ceb0e6d9825851b4c0a397b..9eb48940351effce9d0d0f6342ef07c7744de867 100644 GIT binary patch delta 1016 zcmb_bJ4+)`7(If;8Wb#d4T2AZO_8lcu&~fLYFJ++QA@dI5)FCDBr0l=1*?TcR;Sp% zVCRC3zsA4dU+|o7W;bIYHZo-L<=%6@^SEDrT@O6{8Tk8q{N{0ZauLhe#UeJ5gU5P- zwU1Lcv`|I`{=?Py&rJ9u^=YU`Kn^=7gwIoH=Mms=fCfPmI7Warx~$85*I2i>+D4V{ z8tV>M9kD|DT&r@mVfcW1BS;}n@*?*6`NwiOo$Z|%%L$Q3>=y9UMcl!W^O!wqWOV;I zJJwrTnyei6WTL}IDh|1(PE!27s&5$SC4}vmv;yU=K<^^fDA{9rdCN}Xb6oq*3=5>F zQm&|vOj6RWf>As^_fO4$1UcemP}w))NW!~?vECd?*utz`jS_6*jPN|R37uml8lMOC z-A`XheC2+Z_*rE5tI8_icXSWQ%w;D>jtxE@M?tnU3f6Iy$C`X9)GWn*I6s)qmN+L% zSdaaC*dx4Xmn3nHz7=&mAmRPz^y)fKl!z}7xnwrVs3&B#Vq=;-jfi?^U(6H4>yj%7 z*lVV~&z$oVT8cwCoMJYElmF;PbaU1`7ll4`z9 hssBKmt?IGq4q diff --git a/bin/i18n/Russian.ini b/bin/i18n/Russian.ini index e4d37ca2cb5408f48a99a7ccef208c4f2e9b4bbd..e1c853aa8a649e9ce821c8d804dda2f71f260ad7 100644 GIT binary patch delta 875 zcmb7C&1w@-6h5T~)RF|Ewiz7~$C849Sf}G8nbc&Go9WbqPE$$Jb|v}%1vlc-E_5LX zf}RJl(5)LE!3XdK#D%_q_?=6nap6LSd+%ZHIp5DY_t&eX*YB3jP8_M`*W}wuPCm7B z=O3Im{QhOGZfJ*&$k3P)N)dPII>+3@dca+dc)$%r8RD4F3*{eG@s=-NnIbo#Lz>9y z`rSf{eID7|ggugzx>HLL?BJJ{4!Dovfb+CMBT!7~3DzHgx9jCv2>?B0HIS>68LCx+ zK^)uat`*af&#R@i4sOHwZGt+Fwy~7Ivv~N%tuYAt^-JS&{vX|adf|1Erwq)8)&m@qYEiZN>@5e^F$~)c(%~z+LB+)@ LZE+LX`pA9*s&9x{ delta 27 jcmZqaWBk|5xFJVk@((Az$sWu+oBJfDuxw6~eWC&Yoihr) diff --git a/bin/i18n/Spanish.ini b/bin/i18n/Spanish.ini index 16296d5ca40ae3530bcc1498ec8abccf11d286dc..be6186e9ce094902d3187d80b2abb883427b3fc6 100644 GIT binary patch delta 1084 zcmb`Gv2GJV5QZnBixLUxiU3NHNEAVeKuA$K7shueRv=WCTh%Y%?wPjG!P`^#(#{35GJ;DwkQ?nNU z7H}^pKBeG!pmUD>2H2AF?-x)Ga%X@IpyoJ_eixWFOZ*5|4${PnUu?kngz;Y;D}dC8r9H$Tiu-RBEq5V zgb_;Bv0V_?M3$NDVo98w41KRBqNcYvpAx@g5BTe0m3-rDs&h~u4KSYbWQeYQv@)UM zZPHG8q`s);{`0N1$4weNVyB+4FtPc}UXjucGZ8_Dz7lq^IR0aDx7i`OzF4ptxoW0s zClzudJTY5nv5L-xzd^jFT3D%Se*4bKNeB6V?Ma>U3nJbHznekUAGRSB#bPjzJhNhvf7Em03NUXAha zeiGxi@jH0(Uj04qZUX*EZ)UUa4m0!4JkK-3>4&v%AJ|UthGS+XGUM8Z+)4`>w~>Z>XM8 zo2&Id}gsU}uE#LC*xV;WQ`P4!wm%9r(4 zLk%>>Zt?D7_wf$Y;oZd^;Z4bPc80Hmw-@q<#4czNl*+|<@ce7>+VvWZ+c0g@WK7{f zfIYz8qy3OJ@7*&0b+2~U-k@IYRP(D4#w`#jd$R5Rrt z&Ro8oP}yW@?z0PV{Hk71(+JmKhADDe=;==6j|x{eHYtg#vregpY3a=ga(z6p*l4kd z>z#u-{!G4M}*%6)Hq{o<*V)nZ`{dU%G0nI*2WOC^_X9b2-OF0 zJf~L)wVF!uSB10rm%`#HJp47p5u+CWg-QOhaIQ8J_M|G6Frh__D#YdYM}C^P-i<#{ CPQ$YR delta 14 VcmaFW#WFjl0|YY-+N}Hfo41wil7&$%8kcBI?DH9>lAH zypxCrPaaf?tX>2?3F*a(|DJj(dQicu;5S>-?jqr_`ySu>=9_Qk&GoO*-|NxGs}!@< zG*$(xy7GalBOxF?diqcZxatm%hk!dv4~p@ChB8+=H=iC3afY6K%7lRLYXvhLvvoJ6{=T2xmsOL;Yc|0T7IIu9ystkT$!R9#gK9sNSt zXy1jcWA7 z%79c$o1ba#9_g|Jum!M=Rn~9TDLH9FL|(duT^^yYWB#Wj(=t9l=IkID3o`pqMaMS; zw@T8;6UuNI{)FM#AiViHqqz`@fTT#cE{Z_4BfkWSz|_d4dc5WgmOy9> zG{c<1WV3t6R(%vT>^p8sp$NRbq-+S(WWiv-U;@-)#9*{tnuYPBsD=)M0>g=&8;&hG zq`-;6iXKp4xU)9$oC3p?vkYst^GGq?V4hyb!pJs#5(}f)_J6XB z6)1k$-YC!Lu7zyt_RF4(8#Pcw`imG1lK+o Mbx=h3{g_gf0bELCL;wH) diff --git a/src/resource.hpp b/src/resource.hpp index 6d52a6eb..01af087d 100644 --- a/src/resource.hpp +++ b/src/resource.hpp @@ -40,192 +40,205 @@ #define IDC_MUTE_BTN 111 #define IDC_CLOSE_BTN 112 #define IDC_FILE_ID 113 -#define IDC_ADDRESS_LOCAL_ID 114 -#define IDC_ADDRESS_REMOTE_ID 115 -#define IDC_FILTER_ID 116 -#define IDC_DATE_ID 117 -#define IDC_CREATERULE_ADDR_ID 118 -#define IDC_CREATERULE_PORT_ID 119 -#define IDC_DISABLENOTIFICATION_ID 120 -#define IDC_PREV_ID 121 -#define IDC_NEXT_ID 122 -#define IDC_IDX_ID 123 -#define IDC_ALLOW_BTN 124 -#define IDC_BLOCK_BTN 125 +#define IDC_FILE_TEXT 114 +#define IDC_SIGNATURE_ID 115 +#define IDC_SIGNATURE_TEXT 116 +#define IDC_ADDRESS_LOCAL_ID 117 +#define IDC_ADDRESS_LOCAL_TEXT 118 +#define IDC_ADDRESS_REMOTE_ID 119 +#define IDC_ADDRESS_REMOTE_TEXT 120 +#define IDC_PROTOCOL_ID 121 +#define IDC_PROTOCOL_TEXT 122 +#define IDC_FILTER_ID 123 +#define IDC_FILTER_TEXT 124 +#define IDC_DATE_ID 125 +#define IDC_DATE_TEXT 126 +#define IDC_CREATERULE_ADDR_ID 127 +#define IDC_CREATERULE_PORT_ID 128 +#define IDC_DISABLENOTIFICATION_ID 129 +#define IDC_PREV_ID 130 +#define IDC_NEXT_ID 131 +#define IDC_IDX_ID 132 +#define IDC_ALLOW_BTN 133 +#define IDC_BLOCK_BTN 134 +#define IDC_LATER_BTN 135 // Editor Dlg -#define IDC_NAME 126 -#define IDC_NAME_EDIT 127 -#define IDC_PORTVERSION 128 -#define IDC_PORTVERSION_EDIT 129 -#define IDC_PROTOCOL 130 -#define IDC_PROTOCOL_EDIT 131 -#define IDC_DIRECTION 132 -#define IDC_DIRECTION_EDIT 133 -#define IDC_ACTION 134 -#define IDC_ACTION_EDIT 135 -#define IDC_RULE_REMOTE 136 -#define IDC_RULE_REMOTE_EDIT 137 -#define IDC_RULE_LOCAL 138 -#define IDC_RULE_LOCAL_EDIT 139 -#define IDC_REGION 140 -#define IDC_DISABLE_CHK 141 -#define IDC_ENABLE_CHK 142 -#define IDC_ENABLEFORAPPS_CHK 143 -#define IDC_APPS_LV 144 +#define IDC_NAME 136 +#define IDC_NAME_EDIT 137 +#define IDC_PORTVERSION 138 +#define IDC_PORTVERSION_EDIT 139 +#define IDC_PROTOCOL 140 +#define IDC_PROTOCOL_EDIT 141 +#define IDC_DIRECTION 142 +#define IDC_DIRECTION_EDIT 143 +#define IDC_ACTION 144 +#define IDC_ACTION_EDIT 145 +#define IDC_RULE_REMOTE 146 +#define IDC_RULE_REMOTE_EDIT 147 +#define IDC_RULE_LOCAL 148 +#define IDC_RULE_LOCAL_EDIT 149 +#define IDC_REGION 150 +#define IDC_DISABLE_CHK 151 +#define IDC_ENABLE_CHK 152 +#define IDC_ENABLEFORAPPS_CHK 153 +#define IDC_APPS_LV 154 // Settings Dlg -#define IDC_NAV 145 -#define IDC_SAVE 146 -#define IDC_RESET 147 -#define IDC_CLOSE 148 -#define IDC_WIKI 149 +#define IDC_NAV 155 +#define IDC_SAVE 156 +#define IDC_RESET 157 +#define IDC_CLOSE 158 +#define IDC_WIKI 159 -#define IDC_TITLE_GENERAL 150 -#define IDC_TITLE_LANGUAGE 151 -#define IDC_TITLE_CONFIRMATIONS 152 -#define IDC_TITLE_HIGHLIGHTING 153 -#define IDC_TITLE_EXPERTS1 154 -#define IDC_TITLE_EXPERTS2 155 -#define IDC_TITLE_LOGGING 156 -#define IDC_TITLE_NOTIFICATIONS 157 +#define IDC_TITLE_GENERAL 160 +#define IDC_TITLE_LANGUAGE 161 +#define IDC_TITLE_CONFIRMATIONS 162 +#define IDC_TITLE_HIGHLIGHTING 163 +#define IDC_TITLE_ADVANCED 164 +#define IDC_TITLE_EXPERTS 165 +#define IDC_TITLE_LOGGING 166 +#define IDC_TITLE_NOTIFICATIONS 167 #define IDS_TITLE_EXCLUDE 1 -#define IDC_ALWAYSONTOP_CHK 158 -#define IDC_LOADONSTARTUP_CHK 159 -#define IDC_STARTMINIMIZED_CHK 160 -#define IDC_SKIPUACWARNING_CHK 161 -#define IDC_CHECKUPDATES_CHK 162 -#define IDC_CHECKUPDATESBETA_CHK 163 +#define IDC_ALWAYSONTOP_CHK 168 +#define IDC_LOADONSTARTUP_CHK 169 +#define IDC_STARTMINIMIZED_CHK 170 +#define IDC_SKIPUACWARNING_CHK 171 +#define IDC_CHECKUPDATES_CHK 172 +#define IDC_CHECKUPDATESBETA_CHK 173 -#define IDC_LANGUAGE_HINT 164 -#define IDC_LANGUAGE 165 +#define IDC_LANGUAGE_HINT 174 +#define IDC_LANGUAGE 175 -#define IDC_CONFIRMEXIT_CHK 166 -#define IDC_CONFIRMEXITTIMER_CHK 167 -#define IDC_CONFIRMDELETE_CHK 168 -#define IDC_CONFIRMLOGCLEAR_CHK 169 +#define IDC_CONFIRMEXIT_CHK 176 +#define IDC_CONFIRMEXITTIMER_CHK 177 +#define IDC_CONFIRMDELETE_CHK 178 +#define IDC_CONFIRMLOGCLEAR_CHK 179 -#define IDC_COLORS_HINT 170 +#define IDC_COLORS_HINT 180 -#define IDC_RULE_ALLOWINBOUND 171 -#define IDC_RULE_ALLOWLISTEN 172 -#define IDC_RULE_ALLOWLOOPBACK 173 +#define IDC_RULE_ALLOWINBOUND 181 +#define IDC_RULE_ALLOWLISTEN 182 +#define IDC_RULE_ALLOWLOOPBACK 183 +#define IDC_RULE_ALLOW6TO4 184 -#define IDC_USESTEALTHMODE_CHK 174 -#define IDC_INSTALLBOOTTIMEFILTERS_CHK 175 -#define IDC_PROXYSUPPORT_CHK 176 +#define IDC_USESTEALTHMODE_CHK 185 +#define IDC_INSTALLBOOTTIMEFILTERS_CHK 186 +#define IDC_SECUREFILTERS_CHK 187 -#define IDC_USECERTIFICATES_CHK 177 -#define IDC_USENETWORKRESOLUTION_CHK 178 +#define IDC_USECERTIFICATES_CHK 188 +#define IDC_USENETWORKRESOLUTION_CHK 189 +#define IDC_USEREFRESHDEVICES_CHK 190 -#define IDC_ENABLELOG_CHK 179 -#define IDC_LOGPATH 180 -#define IDC_LOGPATH_BTN 181 +#define IDC_ENABLELOG_CHK 191 +#define IDC_LOGPATH 192 +#define IDC_LOGPATH_BTN 193 -#define IDC_LOGSIZELIMIT_HINT 182 -#define IDC_LOGSIZELIMIT_CTRL 183 -#define IDC_LOGSIZELIMIT 184 +#define IDC_LOGSIZELIMIT_HINT 194 +#define IDC_LOGSIZELIMIT_CTRL 195 +#define IDC_LOGSIZELIMIT 196 -#define IDC_ENABLENOTIFICATIONS_CHK 185 -#define IDC_NOTIFICATIONSOUND_CHK 186 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT_HINT 187 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT_CTRL 188 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT 189 -#define IDC_NOTIFICATIONTIMEOUT_HINT 190 -#define IDC_NOTIFICATIONTIMEOUT_CTRL 191 -#define IDC_NOTIFICATIONTIMEOUT 192 -#define IDC_EXCLUDE1 193 -#define IDC_EXCLUDE2 194 -#define IDC_EXCLUDESTEALTH_CHK 195 -#define IDC_EXCLUDECLASSIFYALLOW_CHK 196 -#define IDC_EXCLUDEBLOCKLIST_CHK 197 -#define IDC_EXCLUDECUSTOM_CHK 198 +#define IDC_ENABLENOTIFICATIONS_CHK 197 +#define IDC_NOTIFICATIONSOUND_CHK 198 +#define IDC_NOTIFICATIONDISPLAYTIMEOUT_HINT 199 +#define IDC_NOTIFICATIONDISPLAYTIMEOUT_CTRL 200 +#define IDC_NOTIFICATIONDISPLAYTIMEOUT 201 +#define IDC_NOTIFICATIONTIMEOUT_HINT 202 +#define IDC_NOTIFICATIONTIMEOUT_CTRL 203 +#define IDC_NOTIFICATIONTIMEOUT 204 +#define IDC_EXCLUDE1 205 +#define IDC_EXCLUDE2 206 +#define IDC_EXCLUDESTEALTH_CHK 207 +#define IDC_EXCLUDECLASSIFYALLOW_CHK 208 +#define IDC_EXCLUDEBLOCKLIST_CHK 209 +#define IDC_EXCLUDECUSTOM_CHK 210 -#define IDC_RULES_BLOCKLIST_HINT 199 -#define IDC_RULES_SYSTEM_HINT 200 -#define IDC_RULES_CUSTOM_HINT 201 +#define IDC_RULES_BLOCKLIST_HINT 211 +#define IDC_RULES_SYSTEM_HINT 212 +#define IDC_RULES_CUSTOM_HINT 213 -#define IDC_COLORS 202 -#define IDC_EDITOR 203 +#define IDC_COLORS 214 +#define IDC_EDITOR 215 // Main Menu -#define IDM_SETTINGS 204 -#define IDM_EXIT 205 -#define IDM_PURGE_UNUSED 206 -#define IDM_PURGE_ERRORS 207 -#define IDM_PURGE_TIMERS 208 -#define IDM_REFRESH 209 -#define IDM_ALWAYSONTOP_CHK 210 -#define IDM_SHOWFILENAMESONLY_CHK 211 -#define IDM_AUTOSIZECOLUMNS_CHK 212 -#define IDM_ENABLESPECIALGROUP_CHK 213 -#define IDM_ICONSSMALL 214 -#define IDM_ICONSLARGE 215 -#define IDM_ICONSEXTRALARGE 216 -#define IDM_ICONSISHIDDEN 217 -#define IDM_FONT 218 -#define IDM_ENABLELOG_CHK 219 -#define IDM_ENABLENOTIFICATIONS_CHK 220 -#define IDM_LOGSHOW 221 -#define IDM_LOGCLEAR 222 -#define IDM_WEBSITE 223 -#define IDM_CHECKUPDATES 224 -#define IDM_ABOUT 225 +#define IDM_SETTINGS 216 +#define IDM_EXIT 217 +#define IDM_PURGE_UNUSED 218 +#define IDM_PURGE_ERRORS 219 +#define IDM_PURGE_TIMERS 220 +#define IDM_REFRESH 221 +#define IDM_ALWAYSONTOP_CHK 222 +#define IDM_SHOWFILENAMESONLY_CHK 223 +#define IDM_AUTOSIZECOLUMNS_CHK 224 +#define IDM_ENABLESPECIALGROUP_CHK 225 +#define IDM_ICONSSMALL 226 +#define IDM_ICONSLARGE 227 +#define IDM_ICONSEXTRALARGE 228 +#define IDM_ICONSISTABLEVIEW 229 +#define IDM_ICONSISHIDDEN 230 +#define IDM_FONT 231 +#define IDM_ENABLELOG_CHK 232 +#define IDM_ENABLENOTIFICATIONS_CHK 233 +#define IDM_LOGSHOW 234 +#define IDM_LOGCLEAR 235 +#define IDM_WEBSITE 236 +#define IDM_CHECKUPDATES 237 +#define IDM_ABOUT 238 // Tray Menu -#define IDM_TRAY_SHOW 226 -#define IDM_TRAY_START 227 -#define IDM_TRAY_MODEWHITELIST 228 -#define IDM_TRAY_MODEBLACKLIST 229 -#define IDM_TRAY_ENABLELOG_CHK 230 -#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 231 -#define IDM_TRAY_LOGSHOW 232 -#define IDM_TRAY_LOGCLEAR 233 -#define IDM_TRAY_LOGSHOW_ERR 234 -#define IDM_TRAY_LOGCLEAR_ERR 235 -#define IDM_TRAY_SETTINGS 236 -#define IDM_TRAY_WEBSITE 237 -#define IDM_TRAY_ABOUT 238 -#define IDM_TRAY_EXIT 239 +#define IDM_TRAY_SHOW 239 +#define IDM_TRAY_START 240 +#define IDM_TRAY_MODEWHITELIST 241 +#define IDM_TRAY_MODEBLACKLIST 242 +#define IDM_TRAY_ENABLELOG_CHK 243 +#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 244 +#define IDM_TRAY_LOGSHOW 245 +#define IDM_TRAY_LOGCLEAR 246 +#define IDM_TRAY_LOGSHOW_ERR 247 +#define IDM_TRAY_LOGCLEAR_ERR 248 +#define IDM_TRAY_SETTINGS 249 +#define IDM_TRAY_WEBSITE 250 +#define IDM_TRAY_ABOUT 251 +#define IDM_TRAY_EXIT 252 // Listview Menu -#define IDM_INFO 240 -#define IDM_ADD_FILE 241 -#define IDM_ALL_PROCESSES 242 -#define IDM_ALL_PACKAGES 243 -#define IDM_ALL_SERVICES 244 -#define IDM_REFRESH2 245 -#define IDM_DISABLENOTIFICATIONS 246 -#define IDM_OPENRULESEDITOR 247 -#define IDM_EXPLORE 248 -#define IDM_COPY 249 -#define IDM_CHECK 250 -#define IDM_UNCHECK 251 -#define IDM_DISABLETIMER 252 -#define IDM_PROPERTIES 253 +#define IDM_INFO 253 +#define IDM_ADD_FILE 254 +#define IDM_ALL_PROCESSES 255 +#define IDM_ALL_PACKAGES 256 +#define IDM_ALL_SERVICES 257 +#define IDM_REFRESH2 258 +#define IDM_DISABLENOTIFICATIONS 259 +#define IDM_OPENRULESEDITOR 260 +#define IDM_EXPLORE 261 +#define IDM_COPY 262 +#define IDM_CHECK 263 +#define IDM_UNCHECK 264 +#define IDM_DISABLETIMER 265 +#define IDM_PROPERTIES 266 -#define IDM_ADD 254 -#define IDM_EDIT 255 -#define IDM_DELETE 256 +#define IDM_ADD 267 +#define IDM_EDIT 268 +#define IDM_DELETE 269 -#define IDM_EXPORT_APPS 257 -#define IDM_EXPORT_RULES 258 -#define IDM_IMPORT_APPS 259 -#define IDM_IMPORT_RULES 260 +#define IDM_EXPORT_APPS 270 +#define IDM_EXPORT_RULES 271 +#define IDM_IMPORT_APPS 272 +#define IDM_IMPORT_RULES 273 -#define IDM_NOTIMER 261 +#define IDM_NOTIMER 274 -#define IDM_SELECT_ALL 262 -#define IDM_ZOOM 263 +#define IDM_SELECT_ALL 275 +#define IDM_ZOOM 276 #define IDX_PROCESS 1000 #define IDX_PACKAGE 2000 #define IDX_SERVICE 3000 #define IDX_LANGUAGE 4000 -#define IDX_RULES_SPECIAL 5000 -#define IDX_TIMER 6000 -#define IDX_TIMER_NOTIFY 7000 +#define IDX_TIMER 5000 +#define IDX_TIMER_NOTIFY 6000 +#define IDX_RULES_SPECIAL 7000 // Strings #define IDS_UPDATE_NO 2 @@ -429,6 +442,16 @@ #define IDS_STATUS_UNUSED_APPS 200 #define IDS_STATUS_INVALID_APPS 201 #define IDS_STATUS_TIMER_APPS 202 +#define IDS_SECUREFILTERS_CHK 203 +#define IDS_SECUREFILTERS_HINT 204 +#define IDS_USEREFRESHDEVICES_CHK 205 +#define IDS_RULE_ALLOW6TO4 206 +#define IDS_RECOMMENDED 207 +#define IDS_ICONSISTABLEVIEW 208 +#define IDS_ACTION_LATER 209 +#define IDS_ACTION_ALLOW_HINT 210 +#define IDS_ACTION_BLOCK_HINT 211 +#define IDS_ACTION_LATER_HINT 212 // RC data #define IDR_RULES_BLOCKLIST 1 diff --git a/src/resource.rc b/src/resource.rc index a58d867a..1d6955cb 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -66,8 +66,8 @@ IDM_MAIN MENU POPUP " " { MENUITEM " ", IDM_ALWAYSONTOP_CHK - MENUITEM " ", IDM_SHOWFILENAMESONLY_CHK MENUITEM " ", IDM_AUTOSIZECOLUMNS_CHK + MENUITEM " ", IDM_SHOWFILENAMESONLY_CHK MENUITEM " ", IDM_ENABLESPECIALGROUP_CHK MENUITEM SEPARATOR POPUP " " @@ -76,6 +76,8 @@ IDM_MAIN MENU MENUITEM " ", IDM_ICONSLARGE MENUITEM " ", IDM_ICONSEXTRALARGE MENUITEM SEPARATOR + MENUITEM " ", IDM_ICONSISTABLEVIEW + MENUITEM SEPARATOR MENUITEM " ", IDM_ICONSISHIDDEN } POPUP " " @@ -301,7 +303,7 @@ FONT 8, "Ms Shell Dlg" } IDD_SETTINGS_GENERAL DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { @@ -321,7 +323,7 @@ FONT 8, "Ms Shell Dlg" } IDD_SETTINGS_INTERFACE DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { @@ -334,7 +336,7 @@ FONT 8, "Ms Shell Dlg" } IDD_SETTINGS_HIGHLIGHTING DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { @@ -343,56 +345,59 @@ FONT 8, "Ms Shell Dlg" } IDD_SETTINGS_RULES DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { - GROUPBOX "", IDC_TITLE_GENERAL, 4, 4, 262, 40 + GROUPBOX "", IDC_TITLE_GENERAL, 4, 4, 262, 64 - AUTOCHECKBOX "", IDC_USECERTIFICATES_CHK, 12, 16, 246, 10 - AUTOCHECKBOX "", IDC_USENETWORKRESOLUTION_CHK, 12, 28, 246, 10 + AUTOCHECKBOX "", IDC_RULE_ALLOWINBOUND, 12, 16, 246, 10 + AUTOCHECKBOX "", IDC_RULE_ALLOWLISTEN, 12, 28, 246, 10 + AUTOCHECKBOX "", IDC_RULE_ALLOWLOOPBACK, 12, 40, 246, 10 + AUTOCHECKBOX "", IDC_RULE_ALLOW6TO4, 12, 52, 246, 10 - GROUPBOX "", IDC_TITLE_EXPERTS1, 4, 46, 262, 52 + GROUPBOX "", IDC_TITLE_ADVANCED, 4, 70, 262, 52 - AUTOCHECKBOX "", IDC_RULE_ALLOWINBOUND, 12, 58, 246, 10 - AUTOCHECKBOX "", IDC_RULE_ALLOWLISTEN, 12, 70, 246, 10 - AUTOCHECKBOX "", IDC_RULE_ALLOWLOOPBACK, 12, 82, 246, 10 + AUTOCHECKBOX "", IDC_USENETWORKRESOLUTION_CHK, 12, 82, 246, 10 + AUTOCHECKBOX "", IDC_USECERTIFICATES_CHK, 12, 94, 246, 10 + AUTOCHECKBOX "", IDC_USEREFRESHDEVICES_CHK, 12, 106, 246, 10 - GROUPBOX "", IDC_TITLE_EXPERTS2, 4, 100, 262, 42 + GROUPBOX "", IDC_TITLE_EXPERTS, 4, 124, 262, 52 - AUTOCHECKBOX "", IDC_USESTEALTHMODE_CHK, 12, 112, 246, 10 - AUTOCHECKBOX "", IDC_INSTALLBOOTTIMEFILTERS_CHK, 12, 124, 246, 10 + AUTOCHECKBOX "", IDC_SECUREFILTERS_CHK, 12, 136, 246, 10 + AUTOCHECKBOX "", IDC_USESTEALTHMODE_CHK, 12, 148, 246, 10 + AUTOCHECKBOX "", IDC_INSTALLBOOTTIMEFILTERS_CHK, 12, 160, 246, 10 } IDD_SETTINGS_RULES_BLOCKLIST DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { - CONTROL "", IDC_EDITOR, WC_LISTVIEW, LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | LVS_SHAREIMAGELISTS | NOT WS_BORDER | WS_TABSTOP | WS_VSCROLL, 0, 0, 272, 166 + CONTROL "", IDC_EDITOR, WC_LISTVIEW, LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | NOT WS_BORDER | WS_TABSTOP | WS_VSCROLL, 0, 0, 272, 166 LTEXT "", IDC_RULES_BLOCKLIST_HINT, 4, 170, 262, 10 } IDD_SETTINGS_RULES_SYSTEM DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { - CONTROL "", IDC_EDITOR, WC_LISTVIEW, LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | LVS_SHAREIMAGELISTS | NOT WS_BORDER | WS_TABSTOP | WS_VSCROLL, 0, 0, 272, 166 + CONTROL "", IDC_EDITOR, WC_LISTVIEW, LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | NOT WS_BORDER | WS_TABSTOP | WS_VSCROLL, 0, 0, 272, 166 LTEXT "", IDC_RULES_SYSTEM_HINT, 4, 170, 262, 10 } IDD_SETTINGS_RULES_CUSTOM DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { - CONTROL "", IDC_EDITOR, WC_LISTVIEW, LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | LVS_SHAREIMAGELISTS | NOT WS_BORDER | WS_TABSTOP | WS_VSCROLL, 0, 0, 272, 166 + CONTROL "", IDC_EDITOR, WC_LISTVIEW, LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | NOT WS_BORDER | WS_TABSTOP | WS_VSCROLL, 0, 0, 272, 166 CONTROL "", IDC_RULES_CUSTOM_HINT, WC_LINK, 0, 4, 170, 262, 10 } IDD_SETTINGS_LOG DIALOGEX 107, 0, 272, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { @@ -577,6 +582,7 @@ STRINGTABLE IDS_TITLE_EXPERTS "Experts-only" IDS_TITLE_LOGGING "Logging to a file" IDS_TITLE_NOTIFICATIONS "Notifications (whitelist only)" + IDS_TITLE_ADVANCED "Advanced" IDS_TITLE_EXCLUDE "Exclude" IDS_ALWAYSONTOP_CHK "Always on top" @@ -662,6 +668,19 @@ STRINGTABLE IDS_ADDRESS_REMOTE "Destination" IDS_ICONSEXTRALARGE "Extra large" + IDS_SECUREFILTERS_CHK "Enable protection of installed filters" + IDS_SECUREFILTERS_HINT "Prevent unauthorized applications from accessing the installed filters." + IDS_USEREFRESHDEVICES_CHK "Refresh filters on device arrival" + + IDS_RULE_ALLOW6TO4 "Allow IPv6 redirections (6to4) for all" + IDS_RECOMMENDED "recommended" + IDS_ICONSISTABLEVIEW "Show as table" + + IDS_ACTION_LATER "Block for now and ask me later" + + IDS_ACTION_ALLOW_HINT "Always allow this program to access the internet" + IDS_ACTION_BLOCK_HINT "Always blocks this program to access the internet" + IDS_ACTION_LATER_HINT "Do nothing and ask me later" } //