From 537168d8ee774e2ca3adfa8f00f1ee164155cc78 Mon Sep 17 00:00:00 2001 From: Sander Land Date: Mon, 1 Jun 2020 11:48:29 +0200 Subject: [PATCH] i18n fixes --- katrain/gui/popups.py | 4 + .../i18n/locales/en/LC_MESSAGES/katrain.mo | Bin 10249 -> 10314 bytes .../i18n/locales/en/LC_MESSAGES/katrain.po | 3 + .../i18n/locales/fr/LC_MESSAGES/katrain.mo | Bin 10637 -> 10702 bytes .../i18n/locales/fr/LC_MESSAGES/katrain.po | 4 + .../i18n/locales/haha/LC_MESSAGES/katrain.mo | Bin 10981 -> 11052 bytes .../i18n/locales/haha/LC_MESSAGES/katrain.po | 3 + .../i18n/locales/ko/LC_MESSAGES/katrain.mo | Bin 11526 -> 11591 bytes .../i18n/locales/ko/LC_MESSAGES/katrain.po | 4 + katrain/popups.kv | 8 +- spec/KaTrain.spec | 99 ++++++++---------- 11 files changed, 67 insertions(+), 58 deletions(-) diff --git a/katrain/gui/popups.py b/katrain/gui/popups.py index 96b6aa6..44c72d8 100644 --- a/katrain/gui/popups.py +++ b/katrain/gui/popups.py @@ -292,6 +292,10 @@ class AIPopup(QuickConfigGui): class ConfigPopup(QuickConfigGui): + def __init__(self, katrain): + super().__init__(katrain) + self.configfile.text = i18n._("config file path").format(file=katrain.config_file) + def update_config(self, save_to_file=True): updated = super().update_config(save_to_file=save_to_file) self.katrain.debug_level = self.katrain.config("general/debug_level", OUTPUT_INFO) diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo index 77ce3098ae8209e6db666cbb5ec1ec3c699e7560..753fb900c074698c943d4ec49b88a36f60950b0e 100644 GIT binary patch delta 2551 zcmYM!duWzb9Ki82d*@}gnRBz5)!upACY6>+*B+c=mjrbDnego!>dn+dA`$ zndu|>iT1$X%lu!>|Mv+?A*}BAzXN$(L%9gwi++y9l#gLPX61x%1r}f*9Eo{&Jr2N0 z@%@bGJmgA;dhQOe40G{09E`8x<+vG*X%{-+ZY;!uvD}RYcm|0j^y^O$I0#)(8D54d zm-#~}52k25+8~9lXs!*g7ESF^WRam2ZQmB(uSeT&K?mN0j`I!L?$=m< zI@V`1sO^g|?ZBgXaNvpP0C&Z51=1(XM^~~4`{FXR-P7m&xy(KYDd+-T-#4QJEk^@cg$DQxV(~ zaQ1;A!en%dW})rpV4>fC6%V7Z1()KRSd2qCNg14oAK`KIm+b8;dsddg)s#O*58phN zWxxxgi_jG}qnTWRPTYod<~^OkykAej}QRZD`7O#qw_S?Cg*AKa`Mv78kmxFcas|Q=dx|rmPUH zFF^+$7wd0Bw`e+=(pqG9!ZI|#l~|4$^b8zAxA>1(9z2|LM0sqQ2OCtNThM^Fp!FWc z9q8ft5e?`RnlXF3@;r1!Md&YIIePd~Xdq4KVSYZA-$m!^Kr@s+79W1Y1QmawXW%Tl z@{4F-14s5`ssy>h1a1a2AI(4=I$#SL*fZ!jFU0zGbPLzU_ZcLRblAp&DgO#h;bFXV zCeVQ|pr2iT@@F99&_JhPFPw(icn|i*S;z+w=As#FMBl%H2K;)g&)_J(|8IFP;`8xE zHnSPP4QPi+=)}{|70$&htc)%|1FAwNszuLAV=T9z{hmU;?C@;#4NQ!oVml9><`2<{ zzC;h@5j16IFog-0^U^2zQ@0-IHzYA&K|_6Y%_GU`n!2iFW95>q$8+y2D88evF4@qy gq^6;Mak8?hD!I6_xoTmuraswXyC=4m4Lg?oA1LGcS^xk5 delta 2470 zcmYM!e`uFQ9KiA0_SOBUxw*}@Y-_g7YHTz^mSz?U9Th2C&@>bc_K$M~LE9olcwDLA zNJX56FxM&dtP_<+;jK2&)xSq-Mq0m zxm1wa9{78c|5EuqWM)vau$=nmSb)D`KBjU)$iyi)3Cl1KYtiR( zqYIHM3Cp=Vz)H-;HFyX1;O)2@jp+b7;2=)Hld=9a8sJqVhHw*$FyprI1(je1^?KwA z4|B6$BjzxFXrf@mOQNmlMD4dags=*IVI6XX&D?zc78>wA^!Z^l;1lurXUG*UMz5g@ zy@9@;Mdw`R55*Kr(R8#!J-VVN?SM*DiXwErG-;6vy*!)U*+V*8cY zego~F#o&npPo?0%HRu2j#d;&sH#DOwS%z7-67BagIzcy@!L4Y&o#+-0pj&k`*1teA zbq#&*_gsdd95NWqh$nCBPA^P+)JTglwxA)bKtt_BhhC3&VIOjZA#P4Rf-dDtG}KGz zdsor-{zOkl9+MPe6?&{^qy3)A<49O&rNIF@qHEA&xE?2B4?5shM#AYEvHtI;ICj=r}Oxx%}# zeh8i57&_snXn><=hR4v&`v-l0VnVAO^U)Ve(FfH?pD+^*WPYqKM*Fv+0e7PBy%ybq z2HJ;?Gk|W<`>}omeg70XesYe2sr)`R{DMxH#*OTSBJ_C`I?+sYMGg2Owji&Bljz=_ z$HjOZo3N3MzaO{b-FOTQ@FMaFOu`ik_tB8SsC8I_b8sm-@s8L&fVI>w;GLMxKJaQN zMYm`M+P@yT!hCM`;u3rnyU}mxU$`Hqa-fd;N&19>->ePA<16dIKI;AG;hW2{jCfvj z0lMNAG?gpRi97JtR>bF9&7!I#QHcqA=^S>*E!^$wP`78|CG2Xq2G8)wlo@GVy04`@JH_lyTpf{77VQedty z1KGClH2UIloQ7>^73+J@!?ZuPA4L`yPN13k20is-XvY4C?L?K_8n}S) zd{Bm_vKsxp&qf1l!fI?s_r4e1+XJzF0jsG09P34u<12jtXVLx`dI(=Z&rCl$-(V&A zH&w@JaK&fQm5icaydSX^Q;cpP52B}dL9D-k2DAaq%sbJ2n4b?Ecw(14f6_IBh7+qfCgH612&fp-r1^IA&7C2LoVy$rsrRw0`5aSzl;j_NB4XLxopCj z%tI|SjCwy0Q<&chDJVt7uEPe@ingc&Hlb3x7g?;eqxv6n&rhQIpG6IP2{qAmRKMG< zJ-}d-0igQlp|61-r=Wq?q6XOL>QUrft3$11Cnn)ORKEkL2|7?2>_+uFjoQLq)K*<} z^*>PaCG)Z}HYb%~G(dy~p4qYwKbStlSE-T~#kw8UV>c@1HdIKTp@xc~raFgnaS*v| zjGICU@UoVcfeL*->b(W1_X<&`?19hMRIf)AJ zG%D$5Q4?H2E*p0BKT+>bpe78GRs}c`DRXHI(w z-^51L;rk1f(tn%@L{Abe6_rU3m7xMuhMsWGSEB-Y0X5ER7}O_eJB4m+#*MgyaAhm@ z;#K?>kMcKn87o-s2tGF7>^sc6pGl^f-Nf_M3%sd-$58<^kyh4ZZzIXJ!}uV^P}^oh z6cq6-)QT-<^0F`zlNF)*m7?}8iaJF5QHQP_wW3bcVeUd@=oBVk50ZWBMFlX3I*g+^ z-`d5J%W)Z&pbkw72Jj$G$4^}Sh_e&5;x1GMFJL0xMooCvwTF4Q zg!)R&A}<@iu#ZO!JYSG~k{-@_ ls=C^%t!u2Rt!eNo>Z4vm#p}^mys8@S4fWd@OU&I9_zwY5`dk12 delta 2496 zcmYM!ZD^KN7{Kwf-22?7E_F?9ZE9OO6{U={iL90^q8wvZtki7zVX=~ipb|YxP?F|{ zO$CwEmIkS`Vav*ulhUlgnq{I3P07*<(x_Hq6!!nS1C4w4@0|NNFV}UQ`+53nHr6E0 zjY{4U_}j|=c>d2O+Y8~fjQ<@;b36Tf?2LYnh4jC}QJ9n&!U((>({M88;55v|d*kO1 zMV~~jM0k$73#`U$Y{4?>O5_Sv z+#FYnnd~2y&@keL=nLpZYiM!wr8%Bm5IBaV9se?W>A zE~Ayaj#em(tgKK0CLB;g!-(!d7pg*!Vj=FwI$VU=1w+>3r}RI>9(qoN z0>6fsb}PRrNg*7^KKfa=4Fx=a2JmAJ2_unWgwp7JcnAH(XrQm)?f6FQ_u?e_-zVaObb1~^G2V@{(2N?8D{SIs zCLf>y9YzD}LjyPy{T<8bXG|UnXf{&)P#ya#(12b=6G*&C!;*DiG9HZm9(03Vv@!!o z^5GYpin*j?>F1&WJ&Xoe7oRVS{gr59FUIFBXeD2=b@QDg$A+$ zZ@ipnrP?qFw?}tkI{kLEf_u>bJ23^{L*J>7&>ym6XdVLGY=1>3t diff --git a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po index 9c461a6..e32ba57 100644 --- a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po @@ -558,3 +558,7 @@ msgstr "" "Picks moves biased below the `threshold` line and plays the best " "one.Increase `line_weight` to penalize moves near the center more. Stops " "strategy after the 'endgame' fraction of the board is filled." + +#. TODO +msgid "config file path" +msgstr "All options are saved in {file}" diff --git a/katrain/i18n/locales/haha/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/haha/LC_MESSAGES/katrain.mo index a6d4aa16dc94a316e528a6bfc727f2de3f49a3c7..0ebc284cb5bd77b12c0dceadbade9d4c274a7d29 100644 GIT binary patch delta 2512 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 Y!AnM48(#Nfjo!QJx4!GM$l9F$0G+n>jsO4v delta 2455 zcmYM#3uu*P9LMqhwv+3ut?kTvZOt<~&dWRvr`c9pn^3vL%O;ws6AiYe&go_ZUGSYC zBUY(!6qQ6v(V0@9hta4-8Al}}MVW#%O_;P~5h_eY3H|i}&;NOLJhixO zv3Dgqu-*7iuN?kQ1XMC>3_do*=NihR&~xs@JjzEg8_!`DUc*!z#HaCp%*6CGzdgq} z8F@S_=dB5US3(R=bU{;OlxD}wprHvhT^*yL@ zeW;AwR6FZi5~H<)VW&2^zR z|C{pyD&W6R8yrBbdpDCippHRG%Fa+!hcIfQC@PRjRDiFevOE_xt`2!@tt+>p#e_Fh7J7i%Q97MgV;B|4=Qt6+z)$fc zuE!bKE+D(u2%FqwQ8V=lgg)u_ABj=D@=p?3N` z5}PHEp>`2VZ~#BU2!mMAj^P>XQ8|h8-#^m-kvhR_TJTr=1+SqlU&m-arQf15@Et03 z31m}t!IiJO_Is##Qh6z`eAE#X;!&KA^YJ>~(r-{1e_P=svm$;nYp{lNEWiWL(Si2+ zd1kXH|2M|$U&^KV{y!N7WBmYr#PQUhL-u0#kgk^fyk9OxWo8yC;93l0GkS_F#)l%^ zgG%)wRDCb%Z2O&qsEnjU{Q5Lhc@!!mdCnqNU+Ky-QAhPQYQ7fK?@4Qf^Vj9uO@+?v zh->&6S<8A|If4T2p72WI|bxl z5v`*_5pKXj+=1L1OW=$62Wp`Zd6q>u1m`*zVhZJ2S6+eKFKa-qgL$Zw@4`v=1L`RH z)t~_Gqb3Ya@Xss@btL0aM==GJ;xg13&q1z*)uVRQhMF*j%0vh1%;Pu@PoTz+nCP!p zfEwpb<3kJ2z#vv3f4VjwmGXMm{v|5)9axIpSc!K~6PK{9Dtr^uaGP^4Dv-mdjdr6l zb=udnGkhq3^Uh1C39dQ^Py=rxe=!!|e6-U%RKUfk`Z83%MW_tbqXOQ5Ef_: + configfile: configfile BoxLayout: size_hint: 1,9 orientation: 'horizontal' @@ -84,7 +85,7 @@ spacing: CP_SPACING Label: DescriptionLabel: - text: i18n._('General Settings') + text: i18n._('general settings') font_size: DESC_FONT_SIZE * 1.5 DescriptionLabel: text: i18n._("general:sgf_load") @@ -113,7 +114,8 @@ Label: Label: Label: - Label: + SmallDescriptionLabel: + id: configfile Label: BackgroundMixin: background_color: LIGHTGREY @@ -126,7 +128,7 @@ Label: DescriptionLabel: font_size: DESC_FONT_SIZE * 1.5 - text: i18n._('Engine Settings') + text: i18n._('engine settings') DescriptionLabel: text: i18n._("engine:katago") AnchorLayout: diff --git a/spec/KaTrain.spec b/spec/KaTrain.spec index 08f137f..7ea8808 100644 --- a/spec/KaTrain.spec +++ b/spec/KaTrain.spec @@ -3,7 +3,6 @@ from kivy_deps import sdl2, glew from kivymd import hooks_path as kivymd_hooks_path block_cipher = None -console = False # pyinstaller spec/katrain.spec --noconfirm # --upx-dir my @@ -43,60 +42,50 @@ a.datas = [ print("DATA FILTERED", len(a.datas)) -pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) -exe = EXE( - pyz, - a.scripts, - [], - exclude_binaries=True, - name="KaTrain", - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - console=console, - icon="C:\\icon.ico", -) +console_names = {True:"KaTrain",False:"KaTrainNC"} -coll = COLLECT( - exe, - a.binaries, - a.zipfiles, - a.datas, - *[Tree(p) for p in (sdl2.dep_bins + glew.dep_bins)], - strip=False, - upx=True, - upx_exclude=[], - name="KaTrain", -) - -exe = EXE( - pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - *[Tree(p) for p in (sdl2.dep_bins + glew.dep_bins)], - debug=False, - strip=False, - upx=True, - name="KaTrain", - console=False, - icon="C:\\icon.ico", -) +for console, name in console_names.items(): -exe = EXE( - pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - *[Tree(p) for p in (sdl2.dep_bins + glew.dep_bins)], - debug=False, - strip=False, - upx=True, - name="KaTrainConsole", - console=True, - icon="C:\\icon.ico", -) + pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) + exe = EXE( + pyz, + a.scripts, + [], + exclude_binaries=True, + name=name, + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=console, + icon="C:\\icon.ico", + ) + + coll = COLLECT( + exe, + a.binaries, + a.zipfiles, + a.datas, + *[Tree(p) for p in (sdl2.dep_bins + glew.dep_bins)], + strip=False, + upx=True, + upx_exclude=[], + name=name, + ) + + exe = EXE( + pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + *[Tree(p) for p in (sdl2.dep_bins + glew.dep_bins)], + debug=False, + strip=False, + upx=True, + name=name, + console=False, + icon="C:\\icon.ico", + ) +