From 8dda0ec4ff5bd0eb78a5c4672a470046e8c680d7 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 27 Dec 2020 22:40:37 +0100 Subject: [PATCH 01/47] Add: [NewGRF] new GUI sprites for 'rename' and 'go to location'. --- media/baseset/openttd.grf | Bin 510264 -> 510358 bytes media/baseset/openttd/openttdgui.nfo | 4 +++- media/baseset/openttd/openttdgui.png | Bin 26393 -> 43899 bytes src/table/sprites.h | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf index 550863ff9168cb00b997f01a329c4b4f6d05d1b8..a63bfc4e295e77a34ac22387778c534dcc1f2c3d 100644 GIT binary patch delta 132 zcmdlnNq*X7c@`Fi|F;@hT3HxdS(sW`m|Iy`wz9AqlriqwZd%5wJZJipzpMg&%nXc- z2RILKGcvvqz9ITRXb0y7p%*d}q#rn(a5^A#BJx2(4g(_>7Xt_|1Mv&y3v8?mKuthh iFL*8pKM?N_*`Tq(=z!V=t{u_s5khR+BZSx=Yy$wkhbi0u delta 48 zcmV-00MGxHlOMQ}9|Qyd|JZ>9g#-bG1OkNw1BC. // -1 * 0 0C "OpenTTD GUI graphics" - -1 * 3 05 15 \b 184 // OPENTTD_SPRITE_COUNT + -1 * 3 05 15 \b 186 // OPENTTD_SPRITE_COUNT -1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal @@ -189,3 +189,5 @@ -1 sprites/openttdgui_convert_road.png 8bpp 24 0 32 32 0 0 normal -1 sprites/openttdgui_convert_tram.png 8bpp 0 0 20 20 0 0 normal -1 sprites/openttdgui_convert_tram.png 8bpp 24 0 32 32 0 0 normal + -1 sprites/openttdgui.png 8bpp 513 440 10 10 0 0 normal + -1 sprites/openttdgui.png 8bpp 526 440 10 10 0 0 normal diff --git a/media/baseset/openttd/openttdgui.png b/media/baseset/openttd/openttdgui.png index 900a612a87f17902771a5d7ae18b6ddcf64021c4..1fc02aa61e30774b4e69fd08b21f51ef69a74a00 100644 GIT binary patch delta 19409 zcmV(%K;pld&H?+@0+1trL?L=qSaechcOY9X8&)>iQ{P)-M{rRN!=R$w};U5=FeloXl|9M^ebD073i0>1gP$8emsJ1#+FgJB z_FopS|Kkq-W$o^N@#hukpO@mg>z^0Ye_5kHe;>-fU%RtH|M`x>-@Eot|FA>)$MXG` zwcC5Pz1Q#QMy{+>z5YDZ{pS+rcf9arDbsmd<;TPS3%`HPkIs+ABYrIUWH(=ad{^ip zvf4Z3FvAEttn=#^K5j9`6(4?$@naACyOy5V<99YA`y=ds_@tiZ#a_hpv1^IHj(^=t zIG@|k=Y65^$uscE7`RyA9slLW_3!@j|K-PD7us9X4Z+1^>%(t@qXx)rxO4u@tJsjR z|Ey^_>wA7&e{JjE|GBY=9V};=8xJ_{_jif6guiVooqbNcuH5;$e})&H`R4*G5uaVS z8SFZTyM|PMLJjv5;}Zhw*w~-JoyU~p%MOH6;tbbjZ&IpkPK$mv?|H&`Z7lKk*FXy! zfpesXt?6m7SveQ%=gAEl8YPu{l~QVXN-MpLnrg14*7{U2YCP%5PkHL|JniYvXsP8^ zT5V5jt+&x*Pe54dwLe#Hz4tNr(7~k#?;gBjj5of2>CJC>>-)Uz?eF+7pD%yqtKajr zuYY64nI`T(>wK=+W}jn)g(KULlqp{@T00ckaL4x2xp;t9^_AyPdn-y8jrG_plb=+UUwqh-R^VOfdpB3sl+Gn5d@ltz;xe>T|U3Y@y^2M z631Ed^bv5L@YI1DRe-IgzesrPJ{c}E3v)%#->-S-r75S*f{&UzxrbFWwX03AoiYTO=Y$V zlzeN+v$a~@hv*9jnQ#5@?T3dWRJM)J#OI6U9oXdLjq~0RJyxf}^6LA&tzG$l!wt4p zUmC#UtsLg?%=Ol%eV=Pv7LK~#9q}!8Ww-n7^;zu3v+wnk1w!J39ejK>n{dzW6Mb#1 zIRa49ftTm&FCdg!O_ZT|qN{WIeTB4I}u z<-&{$yMUF|x2N>R&bvS%C_#^Z`P!3bSeqSik9p3gY*syd=YiYZp7ZM%-;06Hp4rpD zWh3y^%ZtkmcC@?~ABLOtx2-w`4%BAE)8i~V8fFNI@AH6h>A}n@z!Yo6zVmmSy4G@! zr@nW+0H9}VP4ERK)4oOdXT>(_0Do|I!tOgenASrEk_Wb16Sw>U*93-t$(FH=7tqIp z^)~knZ~}2{h$b!z6#Qi4oB9?m`#{YK zmccdVnq2!CAkpf47WlD$Sb+`KkLv=eC#x3v3%v3Ge9S7F{d_=Uysfnj?u{)PL85A4 zPgsFFt+}53RY32>;}TGd%L1Ychs15!xgF}pv){>WaFGaNw)PTd*-F5p=hm=M9v0NP zK`$^OfAgyGI0!LtV(+U}t^|2|D*QKM@T2+fHRCFoMIUV4`rh?_v33tnw>Az9q~L1= zn6fkAI~OJy61I=ahvqV*AtDk>2Ny{hPRbVLo6TuNu+FozRkVWVzP<>KU^#&MW<5So zCS?Nz%on$-Zv!}9fF;!rM@)EY+>xMELwmx9IX*4D3pO&14(!=e%lJfRaF+{ALK;iq zT0WU;OyV4_h;5I5dKNFojc3f~o;!!9utr@>X?%9dB>|G1OWrI303FkScH<&!U|KlV zPVN{_X1splx5CE~0ZjPXTm@zlZeYuEUKX z8NQ7DWARtRzyqe%uv~)p^MWFX2=KPD_XK+kl%-*1Snd3OJQAf3Q~OC294Q z8St|zg5`H+&@=-|p|;5q1%Nk}0U5&O2)Z}%mWYUV@)I%V4loWjzKrWz@Qv0q%E}64 z>~wudCm`~>Q7At4OK3`5w-IJ%UV7Rj1|AEOJ>g{InnZ(p7J&T?V9A%8fC5Ht?g{RM zJMUNPCRp)**PRVqS-8(}fYO4?-|2gIPfMY)ZPU4eozq@!oj#M>qh7!l!1ox zh8tEs=3`UzQfLfnETSMgPgP}xTp4XvZva&geHt-`@G#O&1v$+##)Qz%Yyz;#CVea* z0L;S8_FSOj3wgs(;!CuN9qqAr%nn}S5zw|$Ul0p_u968{??(jq4s|GOSHUvzAIR6$ zo{WF(djE-|e5?T~)~Talz>Pm(VKs!&pV>t?;0^k4w-;WMf!I26T10(mI~c66KjO&K z__z+tVh1OrVnbm3mw{E>1i+ge8Wke|k5xhH_Jn+1vn(;1#Xb>oBVO4gT!g2^MWMeR zCI-%bLCB!q*#Gxd*chSliGV`w+hz>qMghZUX(d2F!f4T2FM%4TRo*MC`PF)(-!H7IVM7gFpe;;eYd6KFO7! zIncWLbXIE_JqEP?d(y``3<$OG!K%C=_!w|!)s?tPFS!?Y4;fc?u&oG>N2wCQB`mH}!(8K;nSGp59c!hKUJdPJJa9UVYCx@Y_zPKwa_5r5YX3 zV{E>B5RuVB{VsH^Dhb2d_z!+LWqqt4;dUGzl0azp#Gr*k9M z=l5Zn@JNgTvXSxhQX=%Lu_7;j)(825PeEYiR=jQvC=I@l@EUd@|M=5osK@tG7EFL5 z_LzXX@`ngY@kPC3sE}Gb4&W*aW_%m@u~3Yappyz=xd640d?Fz>^s#a`ZVJa(MAV(R zLp}<48+~DFAm_SKfgN_qC%ikQjA7s?I4HY@@dUgGnZ~ve;opsehiF)T#`ilaDW_+7@4N=V3xPgGW0=c-8UdVUU-{&RNN1Q~ zB@kRu7)xg%h{Wwf_v1rvhv>gZ5tF~b0W5j7VA2Se!oe5&hC)f*v=8iuk7bPqrfFKL zU{S{YI+0hb++7jNxIQ!n37P;(r6`Q@>F|~eTfu+>yITp639z0qN{lyB{KkoUVB>%QqL%p=s4(G{wIgufQYqk(Pc&Mi z8StJ#pu7M9f&%vtzQRL2zaWFaMJJS_yXp+brO|rvPu7OVCYXPO0PF)IM>xG67~A_r zInQTK4U&$3c7qO172Lt&t$M*WFl?>sGkcOpK8rLo-jl0#d`X;?_Wf&h}^y z#FR&7&vGib2_gu9Z-3AZI3y7ayca|i{j2F2L~(R~Sy$}wVV_yYz&`_sE)p>Vs*4(5 z2TV{HG(%R=>Zb%WSW*?@mT!=KD;J^Z&`a>^{aS+u5QNThJU8_s?beX z$QZ!;GKvmBW*^HTZs@;N|1F9V)COi2m6IO<-|R@;HOafSiKsht;w%i4n|NX|*y1xs zjXpAeel`utHs_RKp*&GsI2hu=JOS z$ZxTfkl|<$EijzrLmS@&ifH_<3MITjQtPoq-8Y1KPI=|ab-J>=_ zm5C^0yF?1Ej;8^(X7Xw}xQO+q2ufxg0AM66x6nPWWQ({>w)K2yP8T$+LO6O41bGw= z@)KVIfo@>xZL#Dg|Hoq3M}h}&|LNwbkS)ZYN1Sq5t|*RuP_sD+Ak{<9j$eS`0fB{o z^fQxL@kjU=^dkbMpoJeTxq!E1;%C0g)g=Q^`--yqj!1&jL!|&hi3t=D|LZ*Z1RP+v zkiuthi>L*F#r$psMSu}-FA>ukQS5{6!e#JxLUbvHx3EI*pqtqrYy@N=&VJ_WIRsVGJGkWMdCLun?*$1=$Vb<}UJ3cvIFf4I1G<-M9(a>E zhR)^#u##4DjjUq@yJ0iYB(-PtK+cVnz#Ilq`nfz7$N^(vEnuz3aa#Ym4Y#C!hG)Z< zK^RbIP(~F8PE%S1Y9sLkq7wIomMC2Q*I?m1 zaUQrrdqu+*t_(bsWl#kfiqhjgTl7NPUqQ^ zP=g4eWL7d2(;RNytxzNTn5yCBcb!=h0A0t zR^`$H*Rw+Zxfogm0<$Yii9mw}AbEi;kOPV6`2x@&l#VD-=pXWm!4KZ;%?9M(BYUb_K(bn8L4Z84dy#)@Dz~=Z3)u!b;0@ymzcY~<4Xhg#MKn0*47n2b zfTaDNwC#k(6UJBU6J59E)n@&8JBybFJ7p#b8X-Lc3Sd|~%Ohid$HKG09~Q;#%)P$v z$a*5WM$IgDYu^_v2wY+@`J~3x8V1a| zO>@JLDDDc$vtSv2hsnGJxPpsEy>)r+3F`%LW4P2r^sqS^5_&+Rsj*2`7WEYRLkUXD>m>FQl9VH}xodmX?3Pi+)iU|R)ghxX; zamu$s*ej%qT~(K3@(0BrGlejUOYG^kzwd7Y43Y%l0HH*?DhxJtlVo0s{glj6<_*B9yo3qY9i1h@G- z!rkKepiV@8mKS=3DI>|S?gZm2i2&{`l1+{$$k zi_p9rOhQ9?i4HrMtKG4iiGbex&Q@*%|9+r$vK3b4Fd$asNh1Il_=qX+jR1o@5UB!N z1CM}ErF7wPO{41TtEwp8@WQPIk4kJIP#_lI6jB9$o^zU`oZDQ7;nqYKpWNRH^@9i( z&4N8K{K1wghRRZ@L2!`wBo7h6(46g&+G9fZ#eNP6D}lg7biFEUG|Aqgmw7Yr4YLK| z%NO>Ho<2m6@Zl5$5th0bvr;d$w1Pf`HQ>|tdo|51C@V7Z7^aR{NO}klP{A%&_h253 z93~TgBU%l@*$6ZrSU+C5E#9#%-1J77d}zEvKuvFyD&E61GOG=~n*@hAK=*+{d?p}y zh>+uXqpa)&U=vY<=!Aqn+7gREkhg>y4dpv$$R9YtVt^zqzDSuRj2cdlx`L23V2btU zLPd#h3INyXFjIIdriiBHs;_76o^V?#=#e{r0uo7v#X@({k8Iry%SL|naIrTZ230&@ z`v~NnP(rL?_nPDdMMl&Fcu{T8pi%jVZBDk$FS24F3$YdRy-umXJXwxVW+CjfbMqQ3 z+U$e(FN6d!=e4d3ffV3e==2D0CnOV?+WpS&!nskUs0=tgv4%(lZzXa?Ub^}Xld(L1 zAY+pFLF&soIvoET2Q}-h;J|ss_X+{S30PV&?})OpjA0Q%V1uxF!WTb~&XZSgSLlR! z52z$>hs<|$|7%VTy#|=&uRYizJdU6!DfNsn0e1bfm<3L&fQL15BT4|U3HyDaFBOor z2n1TA6B(cfij5C~xTG6>*19E3q8BcINbGrUunhKB-?XwPuQ#jVaVU2HxIsqYxC`6D z2H9~L47hxwc=u=631&FnlGmQ)F`>vdaAR6kmnowESPURmj&Jdh6{>)-H<$@iJ923+0y#LIY5c-0bpnzUBKFQDp=G)|DpUJP|tazp*Ah7iC>5cn*9|1SCR;*z?E^wn;3s@&&9CH4wrT zo#csB9?hdJpvP<=rnZqYd;;N^n;YOhf(AmuXQ4O{kRCLTauMAGm16R2dvvP8#dM97 zZ}IolV+izTCt4GN0aQ#cu-=bn$;);6jIbE>k>Q8;>UWP)gaO&G8`pOrFE ziVz@n@kxN2RYEVqpTj~nz&x#s zyoL0=*9A%T4IyFugr^A0jggRzQP-o)mq`Qmd*ulRVj!csSv)+n$=qyAo^W1(-mO6R zFg4gw&t|~k5bFLZf83UTRdNGBF3Qsck_B?G3TV%laK>~L>eb#y`ks(7AaRpHvkqWf zwFIUu@bhEOkCy?RTh_xSB5yj|0$~9R68m-XM;IIKyxv5#00ga0BKmUU?2~0+Zy?s7 zhI)G6I}xZsr5kAoBY_M-tP%loZUyUtktX*Kz1Aedb-Pp z&c<7ymP8Jo^)lrwwm^AWHZAz~mZN}yJ!`@6yi*q?#pm%njRp7XXQ59+nwUR|ag`u| zKS&ap63hgB2rnOq>q__z-J}bos#;$3gy^vgvIcz2mQz5cc7bS#KWy=%#)o;YagJLe zp7JHja5D-Crge^g%m6M+Aqd$}FW9HccgW&Qm+4{f>74@#fngrOeJYA9^LlR9#e{1U zt)|r<&B{5DC_P{O0=8T}`Sle{m2+`?eMFo$6Pm%NgvESnzN1uz;{J}$$>v+|(XBw@ zzHdAwdG@`yqoXSlF*DR5&8nbLG{ThLtQv+UdB!im#-z=E!yfgQj}XD95>Y>l_d=od za=+0OIDRd;1P6&g!4KQ!wcZ4^zLytMLla?^MKU;dkFekHRH*-zZci-`Sa^hKT-268 z6~SyklvRG~21pv~ctgR6X8{7Eo&_R3*npQ>x`2du?~h9q`40j3D^^WRaNlg?${squ z5hjMj0eJC$S78HofRgfoj~5wN$zau6QTVf2r?IU) zHk$KM$>Kwd7<|ppS{yxKCzj^yQ_$_8tGAc2T%kB%{Kegh4^ z6!oxo;%kNSAsPtE=Kg_)Q^RVx&fEkQ=*TcxZ!J#XVKH^K?FIl*oTXgl)ST3pWl0Y_ zpJ4KNLJYl{7@p_k()|?i?xZrpNK7Z1W8*=8fwK=DEoO7Kpc&wFa$l@t1(K=>REsSh zWekvyVGXM>EU$zivXaQ|(uk>^(!J5*Q!MH8d_Q{<3LwF+ONM@77r|0IL&^pwty#f+ zEolIjcYmY=2)p}a>@M7MS@1;Ihc^~NQcp(O@SPK6%z>wDx^humS|V4#3z*gu03geM z442XB64GDKx=-QZX4Aiz>lZ_g!8{8_o}mi_a|xE^cjgSC(-sB6)II>CLEbN@_`vtz z3;G8(yW)-Fx0s-6)%b*T2Lh8Oq7t?ktI1A~riB7ho>E(&7K|9#8)#gh9Hqd+@_)E* zAH*(nnF)I~VZNV!(-1zZ12cBme74qqz&-%~^jexdJn*;Na#{gC<6S+lF-V>=7ar?QUhoNX@hOzb!9M zi>GtCv}Xc3K=MX)ju0o0!F<4;-_!mq9>a*YPmfCnq!?m{pwm@RNEnMLEW#S_BX}H_4T1Q8lAf44^vWvW z4Ryhi2~>7wsRUi{=c#xaOByoF2h&6P01MYh)mk`69l94Tj4bU5sU6G_O^d5c-tEWA z3)HRkMXcRT?C7=?Xg%EoN2WqMx!;+(PVbF zzU7@}b&Kb>eO~nhF6*Gujd|yC0B7)o!VK@^4o;-w-w<>7>j(2yz1|*TXGjtvcC-s? z6EX-pkEdl>2iabOH{@SU^7K&iO~j62BFxSO(D==0_CYkTCT`xBtk~m!J9xC6Dd^H^ zeF#ee(iUOt4x^TNm|pZ8k`Q8h#z0o0x?sM@`MX^sSV{vB5{#@i_ps#jZ#*n^L@Z7= z57F#lN<3-|U1Wmgi>BvL%dF2)U#ZF*cls(C|rjM3m0aCp`O+)eIn#E?~EEE{G6jEPZqnUvf;_s zt#tZWi>OsvW1KZy1~Vr^bV_R3OVd-W+jKDxEC}~!Wv9oENohjv=*0` z2%siF@3!{xeSt_gq+x1)x}#Mlrmm8m9zYpe#9fKHaG5N_x}%;o?H{@`YJs0Jd=F&C z*H#z?Y;$m8F{J;0!J<$I4MC4%6PKf*x!lFmJ`=m#-n1z6^(4Al<^I-7&3{|*&^qt3 z!@$Bs48qnN{EkgGmuPuByk&Z%seLT#hEwn;`+FYs+7PBTK3QxQBF5qKxKZ^W*)lE| zd4=ZT33l2|^9{vpP7x4z_*O@Pq&!#6$P;zvKHU+ErwK@Z6_z>dlVUg9pPn3i&y*KOVL4ya#5Xoo}BXkcvjwmBq!i{*0lV|}{)(>vp zeM;yrI9(AU6QT!D- z&G^?Nl~Cn>y~_omNeIdcOn(_jPTaeP9Jd9@rt~f6il0e{%Y*1XK-+Iy!p)=Hcv^<| zKuUnaau1%3C@jTBIU)Cv78apy>*JKSFz1!5VP_eT+Nl35X29xTQ&0%NW_c2w7JKjq zEsvZnMsux*1xNn#akH}h&#n4~dBaE};kkK0`V8ZL--Am`k4fP_*@}8=BcM;OH67ou zwuSh@_M}{|eUjA8=8`8>^F;0@QB4e9)dD8Z_ci5gCQK(O=G{@V{9$A*3Q-$_|OO(2-zr4|?V zQ#igKkc5pe-+^eAa{;wlA<;QoT0#ux(KT8 zfbGy`Yia=gf>tYXUXR@fA^S%_zMk25wHRl`=NMFty%1~;6|op(gkbfX`b=ZVUibxFT@=t3n{EDlzl_pUaEM1 z^4|PafXCHudLp!6HEg^ubD7)+bZlEX89kIk_3I`;HfDVLt*M<74|qI*s92!|SHBTgFcickHVH#TF38q@EoaIe zc>}<#5WI*>UlzAS+l1lZO&#rd124i_x#?~XOtdx@UhrB2J@`|SK5UypJk9SGBKIo+ zj*mygm`}CG;I>|M)oLY_zu3G%V%F*dv?2~UIksaPYpm(ZnJ6eHL|1VPbv*iwO14^24n|l$^?^tZY3@Y=1BqO zbipb?=xnm7z5&1mDOuwM3ATp)w8$V0!EtN4k;9hidGwAJu9kn-ldoMDK!Gld8~-e? zr1PLBIt?e=;c<0eTbKD)1PwvdQ%dHI5-u5<6)Xf(j8L>VtPKe;*&8av6Xs-s)ogsQP{SO@1LDF2p~3kI9)~^30OVBMpM?k@ zm<`KBw9jf^PupVIS<>1N*^$xaMIe?}biY0A>!{TEGI~3rpfN8^~j`qH?oBF{7lBxXEI$ndl8e zB%Xn|ONh4d1n>y3L2}I3i~?KlB!YwEtnW9iWzZGu=Tn@I0|+lbTBN4oN$}#2E)i^ zeEit-oibWJ0lfydldNH-g8yA{))*s6-Qk_0h6K3g@H?foUX}jv|s?ovTdDQ#0wSMc?J9^IJ z9t$Pg3G)M}Xlx^_vReqD&tjf8Qis@LWq99UStcxhm3fU*RHFN9!UH{XCk2lULU!{LF^O7i5uuDL~yKFxzIe7xn;Zj-DZfHwrd=JL>tAQ|nkL7*4_>_jb**E%sK357SLn*PvZy=Xwu+vCww?}mXg{5LL zIBU{yn21j=hX_Q^9nM6K&Qo8wLGuvHn8N+rSb)X^{S=k}}*-^?ihC(4D6g`2%`gC~y#@waUPP7#1@Joc4l+p~DzCQ_aL{s^IcTk|l%!q3N=>j?j{n&QR0 ztZF30LfFuQxEl|cEYQp!l=4+{KeoYtLjRZNGmkA=pv-q#IoMJyd}hm`^KJVZkN6NA zOV4;}zX?du=39XrjJRO8Ge=u|Yejw`<8jt*5_aX-iH0YIZvG#L?N+Z4zihw(oa_X2 zdO+DDTqx}BJPiD9uQoSgnQ-ELyHQlu{rb-NoSGGETP0C^tEDTFp zJT1a70cG13KAA51J7)r_xk;Flm3C5E=%dFsx*m&VqA!t7X0~ z0tk`^bSc>_j-K{;J))h_@UTG~I+`3=s2Gc|AB+Q{#l41XFIpT0j2oA9ux=ri@+RK2Jvn|tjF zxq&muCCUa4i?uaK1p624LE=vsJ_`K{wcnX~R46zMnj ze(Gw`ZMqPOXf>998A6i?c}^o?HL5Aa?s052g2z+Ajn9YK3<&s8D<&||wCJbT*)=xe zy{GA8)nrrf<`32d64BvWs+%+W0IidG2D8RQOQ@9B@|&C!g&Rc_5iOcOUXSE29M0o^6xX0X^#sz>aq1O+Q3Vr1JG{A zY^>!(uWj2gEU6K8VGPdvu&1V&cE_98>1zM**cTed>SQQmwiyYJ&jhh)bKh??hph<+ z2C%S?)B}-Qw)J>;_ndJs3u^fGi%`}*4Z_kNd-ooH#J>$n)uJ7UWeNb3nV;v>_E{ET zGk`S~&>M@u?TDZk%Wmd89_zJPM_cQYGlNXO zf*hySY_d!9LMEA}T2CZKoZ^J;L^$?C$ahZT zEcsV&00@7|A0%HZHqvx^E4T{2FwwLKd5{o0I;e?+J<=e-Wt4#y850F!_zr}ZobbGSLKDp<5dc4*IoVMX->0uA4#l$fGH-3 z?PWzm_Y@u02mSIbC=6_Ep{bVSG#RIyIVfcWlT7S|H_gZ9!TCFX3*#!!$tbg-1nQ*F zf&TIM9(j?^%k;UCwdASML0(ghOyTARgOY?~eIzq^r?{%b8!w#5u>{ zSWE-trUy;^Dsk<7L$9?aQCufk5?X^}T3gAU5IA2j3I4e3vXjmrGkGIg&vd|TOBm|* zM#ST^-7|0)S${tVp3RSi@&;gkU8cJGk}BGiK$JcMghnNnIzi9bX6?{GOyIJIL*&Y+ zgV};9xQS+~a_V9hV}Rk<8B#`RIt}HowI-+0`+IHQ;c3$Keb&-Ji=va53C^IALw^7Q zsc3hgpS_uHI72GV&;UT)>3qa5Y&sE1z{tzGN_PtD`mFhAroZoB!m###Q`Lr$-*2_F zy$K=jtrN`VET&U?hdy+?!!wstI1Me%z;bHaK(>E@oh=<41w9}i-)l*KfoNy@ew&Bd z!6iNQmvh;e>nSBsZ#(NJ6E`ho#d4j9=wviU#tG_-!c&dfFc_=3=p`D6dn0Pss1E*ak2J`zkirbf>VBW3w3+uy>`^SS?v4n2h;_+i1)mlH4>g#!bZ-9ajcw&rJs@x9W%GN3U z!CQNdn;){BCNt3I1Zl@(5Zr?87@KGd?m-umddTCc;o}GA0a#VU2b_@xSLMS`Dc_wS z&DC;ghh19=iVaosGFB>A3*3mcgNp`S5(Kgx(n@P5m~Ql%`R~%r5|sNKU)nl+V3)wj zVmmwlT5YX=+pi>e6RAIZ$e~ih47g1-3wrECx&#wM$={)Pz6>*cZO!)B1`#m|mgBbn2!kaHK*AWNFjCI_>u{;2+CxFj(H2D3(edFehrpurx z$d(6?49-+A%VUQRC=`b?m7+XqCI_i++a9au#^t*#Vc->(l!tvp!$^_M{sib`R(4yf)2&wkK6A7UCap8X!m|~e)QJo> z{5U4LJMHAO9_Deu1*d__c}6@8(D@^SkE8O&p+dSfq>~-RIz8r&N+!H;InVIaAC_>H zne9`1P9uO>)7MJNX>QL`J=va4a?0^kc;Q8VIxQPcJ*zrLB@Rqz7gr->zm^U_=AD?U z1+Qvjgjo@LeX>IsfhQv!q5U>s_1mm4be(@6HVh1?15~xV&hg4nQwPX-Hul*UffAOs zO?wQ&8SRDk1Qk57 zo)~sv-&S|-S|@;BHxImsD+Fo~KNnd`!!Zz;ME=hd-BGT|=>Q-9v4_2P=DU@;IXdA_ydG zw==>$@rO%%D5(2#h}4-_weAuEG0pZg!q$flpU(YU$s!T%;rmSU$6JK=IAR*&A!;$3abxjVb2Zlhe+dJwN^XniB&pOhFYq^9)qX0Xktd@yM6?dDLpQ zALN0I8fNbn5W3YqglMOTMfzvNDVJ)~7G_uv@L;L89qJ{8_iFuoe}v}%Y(M)`b9!zF zuSw?is(C(C)iV&xZ?|)#;{C&aQA~ui2j4ffVXoHx!Qqhi09LWs{Y-=~nE~QwJ7Dj} zLZ;>v;&9H`3F$1YdOSw1z4-8aot|gaGLApsD;6N`}rUdp|L9o87TzqS%$>hzC1TAdwy=I2sjR0*Kg{-*^sx=W{yn%UF`z z1;m|MzGK?Ze5TVr9sv+)m&s_y4Ip`;`~XiuPg@K$LYnv+_SZKd%Z0zp!JhFhup=K3 zzXOraG$M5o(YnEarqk)I8nnd{r-{+QIJZ?+wp6lWm-Fm^!DcsKgA;@0=CjvNV)gOa zq&|Oco$pg9Fy?UJ=slxGZD?Fp@yP8&!RQ z*WFgjiFmW@@`ex?Qiur^w?_AD5V#~;6mb{R+K5JilU4eE7(Y-O7C8RDFg+siZ=9%UgX^-W!*F+?(uCdekuAflw`r~n@(24W1i|r;#o_^ zZNoVV2A#}vS4UB?^vP$x>Zho=*+hy~#B*DQKiAd2aOX`$pYhi|Tkh%A$J z6hzJgH(uj^j3~FX^ePrfl`{)=)E*T8@o}qrw>#QS$NX7?Y)78M_`7$8kvnu@z^ts^ z+WWnJMV`}=H0U~e64xna#@sB!NaY+y=;e-Ln@%hT(oP9FRA4z+pS=T*UV;f+5gmRS zP>S^tvTUyRdLMuVjEq?0v_jijkO?q-wFc&dZh+N)p!m{db<*tt3{LN~Ma=v*_Y6J% z4e&oB`aSQDw$1Zf!d&+xVt?IR#W-Ph`{EB%lniWy6`|c4d8ySatK|b7RO%Dj-@fPW zpON;l*v0cEI0ReiKzB8`WpA)^WpT_lBZ_ugUMDsEVt;`jeFvHqKhMg)<~%E9Dw1&k zyx|IeN&W3N9N_zw@a;3e>$a%Nx+vm??%^R4lmeb#+v&S-?4{NFkP)y960x0XRFM;C ziG0Sh;3DAJ2nYMke#7GnV79DpF=LP{)IOb1^`y}nq$FI?AW@prES>k_U_cWQUwkSn zwVgs?$_E*N;27PcI+{0F4vtnMph(8hnAfR)D^C{Hdt9D?H_xl1I&Y8@XY%7Dj}j@!=8aN=R~2DiA&UIm0YG#|_(fO(QSBzk8a0 zI;Z6u?_)OWb->vB5^==w!h^b>#c{3MuViudZi+Vd#v4pSwm~Z*GAq5K_ysTHgemJo z2+g*v7z6yS9Rm2Y|IGs`XYxPm6b7c~VcY|ovVbNzLz5T<@m|X>15jc*X9%_NLE~k) z%GBy%tltb{@pi2#XLIat^m~|~7I2n-t6Q$$F@Pc;JgsszKgfb!p44yCXbuxa<~XUv zcJOW9WDw-HN5i(-_KD20Zt;fEW0v;4NuHt!?6Sw{a`y``?(Y=4gkilav6$ex0-NVl zfQfJU^)ePtW{kL7_F&csZP@Z@E5Za#>#}sSJCYYB>P1a`5Nj>KpJ(Wp6REy`%VWlR z_`MBFkF9Ipt@%xd@KvX6K57hsn0n*Yuid zbs)Eq(&8g0xBX@fSeklfv<&3jAOqlZpSOD6_JgaLxXc?nk1djr;=ZL2-O zDQHYKb9kn0_UEvt+unAMSNXTwe+q-?VHEHV3lQAj?-#nASz1oL=PVA7^eYJ*{!qgy zi22Q0-j`FhAxD0bRVm%FLGX1Ccwcg~#W>>~a5MWPcnrIYY+OwTV;s`I>?g;FjsJ-FpkkMelf7t1^egE7= zvqaRB{^qE3q=KGOk>Y18$a+I^@S(H*Js7hE@LSTW|;=A)QrCc1FXvJM~o|+}UVp#Rt0pV4CFO8k-g9QLbRfeBp z*P?V6Y~44|>NhZXj&87Hf00iH5V9qY#EF*QfM?UdXFIzm@Xjwm3n`QBz_o)12}BII zoZK_+3>Kkwj)HG$5kPq+lGa2E(bPjGan|%KNCVvml9Z0L8!5eQ4Z;N1ZVc$ z$0ho5rV9M(2C^T5F|Hs75FI@HB?*{tbMx$M!te+LfH6juw@@Dnb& zQ%szJVm)K~^>#SYHCg_HVGl_`LNZ)_-;Sw=7c}J^kDbJi-@o*LK~BX`Rn>65o&@@p z{Cb~vITvmoczONmBTVP2+p|MFu9=Ga{Qe!=cZ+ijibWj`dbBV-Whcs7w{ZJKBl0Qa z8)6K)QOf|29IA^pe`B#MK5@uG$z?kPwc$~ZF^?BHs>c(_^Sk?wn648oKE<408-U6l z%@ldCQp22iWAY% z7M@65&gO!rpf(Ib1YE0$9bAWX-OgjN>C-XQtgqw#hXWUL)+QF$@k=&9zjH?gT4Obu zf;K%4HuAfUi1RHt7E{gBXYvc#;BPGwR#dF4TaEx)K*GG&q2NHN&tL6#Tvh&lo~;f`{Mc zVU1Cke=OEsSGTwL9kl=c*Jt~68uxwuFHJD375=7zWw9YQ0}AB<3lkhTuqk%Rvtk2> zTz`h_&yGxwB`N z^Pm66zy9kLnpf2cND2sj$>D6k*Gm~SQ!;%CzH(7Ysm*IQ{ueU;l1<@$e-GOihnFhJt z%*)wlZa?yX02s+v2FN*(vl$@B2V@d5R4tH?RGT;;scHcsazGFZd~;+Nz<17wNO}3s z?kv7@%l^Lgefzw9dvWpZ?b|UR1PJ*G{5!J@>W-uoEeIlFGar8dA0#~|2;m<$BuGjb zkbnN?fBs?7#iIO@WrLXkqzIF*VR(O$4>VFfh_N6lKtyL1EJ!7&)&NpxG0LAk)J!{5 zy`Q6Iewck;M$P$W+A08&IE;v>>JYpu2hmD#Tq?wB)_^2qj1`wG`rnVr2x-j77!{3h{foA4DpE(Vh znfv_eWzbBbvLJ+R#ei%T068~3s{y2MEt{ zRk!ah-n--6cJAJ~bvwnNNJxJk5K#VrhaaKfBTMmvhdDz2;o;A7fRtyq68m8QX&R(U zErcEr?KCf?$sEZr6Rg65P$!qZxw*BqwYll!Pny1jd=MWY!2kdQut`KgRHy;zJJlkVM3vzGqHvDtIgxqy*-vfhU-_4Xg@v*8F1eBkL=V*T>ihwXA1OSQo z$hlZx2ftGSgl6-W@r;%ML^sVV13(AJL5l#Spt@^9ih!J5)&bJH;~Gr!md$`yi#v}pc_Tt^eyWjujH~&}r_Jv!w?k(QCeQ&X3K@viiGe-(7Na%1ki_c*dEJ&CV z0({t6kPZ$O#!^Kb*5d6f6!$q9XCX|7pJy^aI2#aw1o0eJK72!g|9(;&p^dcbq zj}Kqqe8d)n(p!J;-n#wnyYC8@$^bGvAo9IfMj8XcW01&mA&3t0fZToWymf(nZggt& zSM0)t?}G)&TrALbv13FmspldMh|WRz`JNKa2dSL%5d5n^oCDV5-P_2=?OX5uP&iuo z#VRA+0WmU|i!~N5mhHJgkPFgp*|#p-y?gtfW4(9p-d%s^u6_6JVp-Y6o{|y<>6R-w zAYeaUco?TpVLjm65C7sXe@Mw6zxwJQn?S<=GH))HV~-<!cNg#GFenis0YvaYisv97BqoGMAh&M4`xjt6Zr!;Ol*0GZ1egu7Ud z!wMGU-FtWL-MMt{-V*!-{|f%!zSkF!gbzW8_&a|ha+~J&o0zL&0GU4*3pKM4r2pXM zAKbh5XaDU7_x|kOpWT6PNJ$=pA|X{kVm|UI86TXG$B(ZBM^Jpcdz07*qoM6N<$f)HMh82|tP delta 1767 zcmVSdF6Oa@T`jW%hfUlP_ zYNllR5`5*(ntmM#8Lk$@qN${<2C-@Y`BRia%DY?;j(b12cjwNf@7+xS@z3CUkWvWj zd~W%_gZK#`e?F6*Q{>~H{)rkunga6pu^=R|AXExSN$+(Qgz7$nX5#DN(wsmuKLW`< zpF4X7B>Vh7{`FOm^s}%ZIY7<=Ar5|>%>V&9UOIPfx;)K@`TDtYXEI>=)<u!!UfK zyw{QsR;I*xtHXQg9gsh@{}g}Z0D1Y(|J%~NrNyP&e~Wj%ckg?*@7%t4J5lzt%V(Bj zNNoE|5fDfG)rMc-Uj|6P;9qhMlK}G1|7-wh0m$Q6G7CbhfKaLeL}D@WzDU)=aLsfw z)#IA^DErJc^K|x^Yv$$bGq)dkKmd&7D+A;l$k_}KEX zK`ijiNs(ay-#H^9<>f!Sv-r*}`}@}S?eq5S#l^d~Z^wWTAml6X@60l&JCahgAc%;~ zeEb1?ko24&gn!(SASq=){`sH(`G>~EY6Fw^rFehw%sn5mCm^D;3KpaiRBHgKvl!*i z9%`nYsou{~Ge68eFQaCDE&F^0HS-mv1tDlc`2VxHARTOH)4WZB^dcbqt$*XlvprU{Aomt; z!#@X1$X)05JuoQt-AvgNa7Q7K000AfNkl2xij%K0=2tz^ukeH90iv@pn z@H+;OUemlX0Ca#Hv5O-xF^V0zz8g4TOcFqDFWz0e z`~7cz^MAE(U$}Ma-r~L6_ZCYQBq3xubEMFMgbsJJ_#9Tjf`lm{z=xd$>EK{tEM)-c zu}~STlV{Udc?-gW53!711cd+b;R~FP*n&`c>)l(o-+lL8 zG1q1Q86FV%UMwSx0pT%7w_rE#!oW*;0@7=q7_g)nc-ELkfAph|2 z1p)pQq>v8MO9ZJ!B7(fgla|j5|VmU<%0)Ev!N5FxQ z;5x|d-hc=`VnX5|{noqh{_yrK3VfJ#5Ch0u#vt6qavWB$An)G0bMMZjd-s;$C-_(J z|MtDUfFyhfLd4$@k=r!C-^5%M1IYZjSg4tWApHj~|KQ%eKl^)cKe+d2_x|h-d_zj| z7!(Pq0uu9)Ps#Y;gd~6G3x&D&Je#Xx0GXezCIkRUbrS$d6chl#`w7KOg(!C}eXjtB zs|Uob0`l;M+&Mpgp&Hg3Knx&8j2J+S7%_ktF=7BQVr2g0{|Ag@7} Date: Sun, 27 Dec 2020 22:41:06 +0100 Subject: [PATCH 02/47] Change: Relocate vehicle rename and location buttons. --- src/lang/english.txt | 18 ++++---- src/vehicle_gui.cpp | 81 ++++++++++++++++++++---------------- src/widgets/vehicle_widget.h | 5 ++- 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 6f2168f20d..f04639fd14 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3758,10 +3758,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centre main view on train's location. Ctrl+Click will follow train in main view -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre main view on vehicle's location. Ctrl+Click will follow vehicle in main view -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centre main view on ship's location. Ctrl+Click will follow ship in main view -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centre main view on aircraft's location. Ctrl+Click will follow aircraft in main view +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centre main view on train's location. Double click will follow train in main view. Ctrl+Click opens a new viewport on train's location +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centre main view on vehicle's location. Double click will follow vehicle in main view. Ctrl+Click opens a new viewport on vehicle's location +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centre main view on ship's location. Double click will follow ship in main view. Ctrl+Click opens a new viewport on ship's location +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centre main view on aircraft's location. Double click will follow aircraft in main view. Ctrl+Click opens a new viewport on aircraft's location STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send train to depot. Ctrl+Click will only service STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send vehicle to depot. Ctrl+Click will only service @@ -3793,10 +3793,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Show roa STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Show ship details STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Show aircraft details -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft. Ctrl+Click to scroll to destination +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft + +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centre main view on order destination. Ctrl+Click opens a new viewport on the order destination's location # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Loading / Unloading diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 1e558373bb..a9be8e5b82 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -2017,7 +2017,6 @@ static const NWidgetPart _nested_nontrain_vehicle_details_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY, WID_VD_CAPTION), SetDataTip(STR_VEHICLE_DETAILS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VD_RENAME_VEHICLE), SetMinimalSize(40, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_VEHICLE_NAME_BUTTON, STR_NULL /* filled in later */), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -2041,7 +2040,6 @@ static const NWidgetPart _nested_train_vehicle_details_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY, WID_VD_CAPTION), SetDataTip(STR_VEHICLE_DETAILS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VD_RENAME_VEHICLE), SetMinimalSize(40, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_VEHICLE_NAME_BUTTON, STR_NULL /* filled in later */), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -2101,8 +2099,6 @@ struct VehicleDetailsWindow : Window { this->vscroll = (v->type == VEH_TRAIN ? this->GetScrollbar(WID_VD_SCROLLBAR) : nullptr); this->FinishInitNested(window_number); - this->GetWidget(WID_VD_RENAME_VEHICLE)->tool_tip = STR_VEHICLE_DETAILS_TRAIN_RENAME + v->type; - this->owner = v->owner; this->tab = TDW_TAB_CARGO; } @@ -2366,8 +2362,6 @@ struct VehicleDetailsWindow : Window { { const Vehicle *v = Vehicle::Get(this->window_number); - this->SetWidgetDisabledState(WID_VD_RENAME_VEHICLE, v->owner != _local_company); - if (v->type == VEH_TRAIN) { this->DisableWidget(this->tab + WID_VD_DETAILS_CARGO_CARRIED); this->vscroll->SetCount(GetTrainDetailsWndVScroll(v->index, this->tab)); @@ -2390,14 +2384,6 @@ struct VehicleDetailsWindow : Window { void OnClick(Point pt, int widget, int click_count) override { switch (widget) { - case WID_VD_RENAME_VEHICLE: { // rename - const Vehicle *v = Vehicle::Get(this->window_number); - SetDParam(0, v->index); - ShowQueryString(STR_VEHICLE_NAME, STR_QUERY_RENAME_TRAIN_CAPTION + v->type, - MAX_LENGTH_VEHICLE_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS); - break; - } - case WID_VD_INCREASE_SERVICING_INTERVAL: // increase int case WID_VD_DECREASE_SERVICING_INTERVAL: { // decrease int int mod = _ctrl_pressed ? 5 : 10; @@ -2449,13 +2435,6 @@ struct VehicleDetailsWindow : Window { } } - void OnQueryTextFinished(char *str) override - { - if (str == nullptr) return; - - DoCommandP(0, this->window_number, 0, CMD_RENAME_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_RENAME_TRAIN + Vehicle::Get(this->window_number)->type), nullptr, str); - } - void OnResize() override { NWidgetCore *nwi = this->GetWidget(WID_VD_MATRIX); @@ -2496,7 +2475,9 @@ static void ShowVehicleDetailsWindow(const Vehicle *v) static const NWidgetPart _nested_vehicle_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_NULL /* filled in later */), NWidget(WWT_CAPTION, COLOUR_GREY, WID_VV_CAPTION), SetDataTip(STR_VEHICLE_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_NULL /* filled in later */), NWidget(WWT_DEBUGBOX, COLOUR_GREY), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), @@ -2509,7 +2490,6 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = { EndContainer(), EndContainer(), NWidget(NWID_VERTICAL), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CENTER_MAIN_VIEW), SetMinimalSize(18, 18), SetDataTip(SPR_CENTRE_VIEW_VEHICLE, 0x0 /* filled later */), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_VV_SELECT_DEPOT_CLONE), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_GOTO_DEPOT), SetMinimalSize(18, 18), SetDataTip(0x0 /* filled later */, 0x0 /* filled later */), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CLONE), SetMinimalSize(18, 18), SetDataTip(0x0 /* filled later */, 0x0 /* filled later */), @@ -2529,6 +2509,7 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = { EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_VV_START_STOP), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetResize(1, 0), SetFill(1, 0), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_ORDER_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_GREY), EndContainer(), }; @@ -2726,8 +2707,9 @@ public: this->owner = v->owner; this->GetWidget(WID_VV_VIEWPORT)->InitializeViewport(this, this->window_number | (1 << 31), _vehicle_view_zoom_levels[v->type]); - this->GetWidget(WID_VV_START_STOP)->tool_tip = STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP + v->type; - this->GetWidget(WID_VV_CENTER_MAIN_VIEW)->tool_tip = STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP + v->type; + this->GetWidget(WID_VV_START_STOP)->tool_tip = STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP + v->type; + this->GetWidget(WID_VV_RENAME)->tool_tip = STR_VEHICLE_DETAILS_TRAIN_RENAME + v->type; + this->GetWidget(WID_VV_LOCATION)->tool_tip = STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP + v->type; this->GetWidget(WID_VV_REFIT)->tool_tip = STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP + v->type; this->GetWidget(WID_VV_GOTO_DEPOT)->tool_tip = STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP + v->type; this->GetWidget(WID_VV_SHOW_ORDERS)->tool_tip = STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP + v->type; @@ -2773,6 +2755,7 @@ public: bool is_localcompany = v->owner == _local_company; bool refitable_and_stopped_in_depot = IsVehicleRefitable(v); + this->SetWidgetDisabledState(WID_VV_RENAME, !is_localcompany); this->SetWidgetDisabledState(WID_VV_GOTO_DEPOT, !is_localcompany); this->SetWidgetDisabledState(WID_VV_REFIT, !refitable_and_stopped_in_depot || !is_localcompany); this->SetWidgetDisabledState(WID_VV_CLONE, !is_localcompany); @@ -2783,6 +2766,8 @@ public: this->SetWidgetDisabledState(WID_VV_TURN_AROUND, !is_localcompany); } + this->SetWidgetDisabledState(WID_VV_ORDER_LOCATION, v->current_order.GetLocation(v) == INVALID_TILE); + this->DrawWidgets(); } @@ -2906,26 +2891,43 @@ public: const Vehicle *v = Vehicle::Get(this->window_number); switch (widget) { + case WID_VV_RENAME: { // rename + SetDParam(0, v->index); + ShowQueryString(STR_VEHICLE_NAME, STR_QUERY_RENAME_TRAIN_CAPTION + v->type, + MAX_LENGTH_VEHICLE_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS); + break; + } + case WID_VV_START_STOP: // start stop + StartStopVehicle(v, false); + break; + + case WID_VV_ORDER_LOCATION: { + /* Scroll to current order destination */ + TileIndex tile = v->current_order.GetLocation(v); + if (tile == INVALID_TILE) break; + if (_ctrl_pressed) { - /* Scroll to current order destination */ - TileIndex tile = v->current_order.GetLocation(v); - if (tile != INVALID_TILE) ScrollMainWindowToTile(tile); + ShowExtraViewportWindow(tile); } else { - /* Start/Stop */ - StartStopVehicle(v, false); + ScrollMainWindowToTile(tile); } break; - case WID_VV_CENTER_MAIN_VIEW: {// center main view - const Window *mainwindow = FindWindowById(WC_MAIN_WINDOW, 0); - /* code to allow the main window to 'follow' the vehicle if the ctrl key is pressed */ - if (_ctrl_pressed && mainwindow->viewport->zoom <= ZOOM_LVL_OUT_4X) { - mainwindow->viewport->follow_vehicle = v->index; + } + + case WID_VV_LOCATION: // center main view + if (_ctrl_pressed) { + ShowExtraViewportWindow(TileVirtXY(v->x_pos, v->y_pos)); } else { - ScrollMainWindowTo(v->x_pos, v->y_pos, v->z_pos); + const Window *mainwindow = FindWindowById(WC_MAIN_WINDOW, 0); + if (click_count > 1 && mainwindow->viewport->zoom <= ZOOM_LVL_OUT_4X) { + /* main window 'follows' vehicle */ + mainwindow->viewport->follow_vehicle = v->index; + } else { + ScrollMainWindowTo(v->x_pos, v->y_pos, v->z_pos); + } } break; - } case WID_VV_GOTO_DEPOT: // goto hangar DoCommandP(v->tile, v->index | (_ctrl_pressed ? DEPOT_SERVICE : 0U), 0, GetCmdSendToDepot(v)); @@ -2968,6 +2970,13 @@ public: } } + void OnQueryTextFinished(char *str) override + { + if (str == nullptr) return; + + DoCommandP(0, this->window_number, 0, CMD_RENAME_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_RENAME_TRAIN + Vehicle::Get(this->window_number)->type), nullptr, str); + } + void OnMouseOver(Point pt, int widget) override { bool start_stop = widget == WID_VV_START_STOP; diff --git a/src/widgets/vehicle_widget.h b/src/widgets/vehicle_widget.h index 0ee1b2624f..698a32bcfa 100644 --- a/src/widgets/vehicle_widget.h +++ b/src/widgets/vehicle_widget.h @@ -15,7 +15,9 @@ enum VehicleViewWidgets { WID_VV_CAPTION, ///< Caption of window. WID_VV_VIEWPORT, ///< Viewport widget. WID_VV_START_STOP, ///< Start or stop this vehicle, and show information about the current state. - WID_VV_CENTER_MAIN_VIEW, ///< Center the main view on this vehicle. + WID_VV_RENAME, ///< Rename vehicle + WID_VV_LOCATION, ///< Center the main view on this vehicle. + WID_VV_ORDER_LOCATION, ///< Center the main view on the order's target location. WID_VV_GOTO_DEPOT, ///< Order this vehicle to go to the depot. WID_VV_REFIT, ///< Open the refit window. WID_VV_SHOW_ORDERS, ///< Show the orders of this vehicle. @@ -43,7 +45,6 @@ enum VehicleRefitWidgets { /** Widgets of the #VehicleDetailsWindow class. */ enum VehicleDetailsWidgets { WID_VD_CAPTION, ///< Caption of window. - WID_VD_RENAME_VEHICLE, ///< Rename this vehicle. WID_VD_TOP_DETAILS, ///< Panel with generic details. WID_VD_INCREASE_SERVICING_INTERVAL, ///< Increase the servicing interval. WID_VD_DECREASE_SERVICING_INTERVAL, ///< Decrease the servicing interval. From 5bfcd742b8220e291f7c1e034c3771915476eb85 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 27 Dec 2020 22:45:58 +0100 Subject: [PATCH 03/47] Change: Relocate rename and location buttons in all windows. --- src/depot_gui.cpp | 8 ++++---- src/industry_gui.cpp | 2 +- src/lang/english.txt | 2 -- src/station_gui.cpp | 16 ++++++---------- src/town_gui.cpp | 26 +++++++++++--------------- src/waypoint_gui.cpp | 5 +++-- 6 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index 026382b282..9571fbea11 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -43,7 +43,11 @@ static const NWidgetPart _nested_train_depot_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), + NWidget(NWID_SELECTION, INVALID_COLOUR, WID_D_SHOW_RENAME), // rename button + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_DEPOT_RENAME_TOOLTIP), + EndContainer(), NWidget(WWT_CAPTION, COLOUR_GREY, WID_D_CAPTION), SetDataTip(STR_DEPOT_CAPTION, STR_NULL), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_NULL), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -68,10 +72,6 @@ static const NWidgetPart _nested_train_depot_widgets[] = { NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_BUILD), SetDataTip(0x0, STR_NULL), SetFill(1, 1), SetResize(1, 0), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_D_CLONE), SetDataTip(0x0, STR_NULL), SetFill(1, 1), SetResize(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_LOCATION), SetDataTip(STR_BUTTON_LOCATION, STR_NULL), SetFill(1, 1), SetResize(1, 0), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_D_SHOW_RENAME), // rename button - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_RENAME), SetDataTip(STR_BUTTON_RENAME, STR_DEPOT_RENAME_TOOLTIP), SetFill(1, 1), SetResize(1, 0), - EndContainer(), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_VEHICLE_LIST), SetDataTip(0x0, STR_NULL), SetFill(0, 1), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_STOP_ALL), SetDataTip(SPR_FLAG_VEH_STOPPED, STR_NULL), SetFill(0, 1), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_START_ALL), SetDataTip(SPR_FLAG_VEH_RUNNING, STR_NULL), SetFill(0, 1), diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 4c59105b3a..a89d4b4c50 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -1114,6 +1114,7 @@ static const NWidgetPart _nested_industry_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_CREAM), NWidget(WWT_CAPTION, COLOUR_CREAM, WID_IV_CAPTION), SetDataTip(STR_INDUSTRY_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_CREAM, WID_IV_GOTO), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP), NWidget(WWT_DEBUGBOX, COLOUR_CREAM), NWidget(WWT_SHADEBOX, COLOUR_CREAM), NWidget(WWT_DEFSIZEBOX, COLOUR_CREAM), @@ -1127,7 +1128,6 @@ static const NWidgetPart _nested_industry_view_widgets[] = { NWidget(WWT_PANEL, COLOUR_CREAM, WID_IV_INFO), SetMinimalSize(260, 2), SetResize(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_GOTO), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_DISPLAY), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_INDUSTRY_DISPLAY_CHAIN, STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_CREAM), EndContainer(), diff --git a/src/lang/english.txt b/src/lang/english.txt index f04639fd14..1076a77f30 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location -STR_BUTTON_RENAME :{BLACK}Rename STR_BUTTON_CATCHMENT :{BLACK}Coverage STR_TOOLTIP_CATCHMENT :{BLACK}Toggle coverage area display diff --git a/src/station_gui.cpp b/src/station_gui.cpp index b4507a9fc4..b4156261bc 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -787,7 +787,9 @@ void ShowCompanyStations(CompanyID company) static const NWidgetPart _nested_station_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SV_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_STATION_VIEW_RENAME_TOOLTIP), NWidget(WWT_CAPTION, COLOUR_GREY, WID_SV_CAPTION), SetDataTip(STR_STATION_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SV_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_STATION_VIEW_CENTER_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -805,18 +807,12 @@ static const NWidgetPart _nested_station_view_widgets[] = { NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_SV_SCROLLBAR), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_SV_ACCEPT_RATING_LIST), SetMinimalSize(249, 23), SetResize(1, 0), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_LOCATION), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), - SetDataTip(STR_BUTTON_LOCATION, STR_STATION_VIEW_CENTER_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ACCEPTS_RATINGS), SetMinimalSize(46, 12), SetResize(1, 0), SetFill(1, 1), - SetDataTip(STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_RENAME), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), - SetDataTip(STR_BUTTON_RENAME, STR_STATION_VIEW_RENAME_TOOLTIP), - EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ACCEPTS_RATINGS), SetMinimalSize(46, 12), SetResize(1, 0), SetFill(1, 1), + SetDataTip(STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_CLOSE_AIRPORT), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_STATION_VIEW_CLOSE_AIRPORT, STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_CATCHMENT), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_CATCHMENT), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_TRAINS), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_TRAIN, STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ROADVEHS), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_LORRY, STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SHIPS), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP), diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 0f143701c4..9ef20f5ca8 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -567,7 +567,9 @@ public: static const NWidgetPart _nested_town_game_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_BROWN), + NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP), NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetDataTip(STR_TOWN_VIEW_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), @@ -578,13 +580,9 @@ static const NWidgetPart _nested_town_game_view_widgets[] = { EndContainer(), EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_SHOW_AUTHORITY), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP), - EndContainer(), - NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), + NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_SHOW_AUTHORITY), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP), + NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT), NWidget(WWT_RESIZEBOX, COLOUR_BROWN), EndContainer(), }; @@ -599,8 +597,9 @@ static WindowDesc _town_game_view_desc( static const NWidgetPart _nested_town_editor_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_BROWN), + NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP), NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetDataTip(STR_TOWN_VIEW_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(76, 14), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP), + NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), @@ -611,13 +610,10 @@ static const NWidgetPart _nested_town_editor_view_widgets[] = { EndContainer(), EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP), - EndContainer(), - NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), + NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP), + NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT), NWidget(WWT_RESIZEBOX, COLOUR_BROWN), EndContainer(), }; diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index 34f7785f14..701fb736ae 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -146,7 +146,9 @@ public: static const NWidgetPart _nested_waypoint_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_W_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_BUOY_VIEW_CHANGE_BUOY_NAME), NWidget(WWT_CAPTION, COLOUR_GREY, WID_W_CAPTION), SetDataTip(STR_WAYPOINT_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_W_CENTER_VIEW), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -157,8 +159,7 @@ static const NWidgetPart _nested_waypoint_view_widgets[] = { EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_CENTER_VIEW), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_RENAME), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_BUOY_VIEW_CHANGE_BUOY_NAME), + NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), SetResize(1, 0), EndContainer(), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_SHOW_VEHICLES), SetMinimalSize(15, 12), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_GREY), EndContainer(), From 1432dbac53aba7c71d12633a0272d64190551d6e Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 27 Dec 2020 23:18:25 +0100 Subject: [PATCH 04/47] Add: another go-to-location button to the sign window. --- src/lang/english.txt | 1 + src/signs_gui.cpp | 13 +++++++++++++ src/widgets/sign_widget.h | 1 + 3 files changed, 15 insertions(+) diff --git a/src/lang/english.txt b/src/lang/english.txt index 1076a77f30..99025ae627 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3100,6 +3100,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Toggle m # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Edit sign text +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centre the main view on sign location. Ctrl+Click opens a new viewport on sign location STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Go to next sign STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Go to previous sign diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 39f209a36b..e3b270fbfd 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -25,6 +25,7 @@ #include "core/geometry_func.hpp" #include "hotkeys.h" #include "transparency.h" +#include "gui.h" #include "widgets/sign_widget.h" @@ -486,6 +487,17 @@ struct SignWindow : Window, SignList { void OnClick(Point pt, int widget, int click_count) override { switch (widget) { + case WID_QES_LOCATION: { + const Sign *si = Sign::Get(this->cur_sign); + TileIndex tile = TileVirtXY(si->x, si->y); + if (_ctrl_pressed) { + ShowExtraViewportWindow(tile); + } else { + ScrollMainWindowToTile(tile); + } + break; + } + case WID_QES_PREVIOUS: case WID_QES_NEXT: { const Sign *si = this->PrevNextSign(widget == WID_QES_NEXT); @@ -523,6 +535,7 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY, WID_QES_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_QES_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_EDIT_SIGN_LOCATION_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), NWidget(WWT_EDITBOX, COLOUR_GREY, WID_QES_TEXT), SetMinimalSize(256, 12), SetDataTip(STR_EDIT_SIGN_SIGN_OSKTITLE, STR_NULL), SetPadding(2, 2, 2, 2), diff --git a/src/widgets/sign_widget.h b/src/widgets/sign_widget.h index 2225eb8b1c..1a05dd349b 100644 --- a/src/widgets/sign_widget.h +++ b/src/widgets/sign_widget.h @@ -24,6 +24,7 @@ enum SignListWidgets { /** Widgets of the #SignWindow class. */ enum QueryEditSignWidgets { WID_QES_CAPTION, ///< Caption of the window. + WID_QES_LOCATION, ///< Scroll to sign location. WID_QES_TEXT, ///< Text of the query. WID_QES_OK, ///< OK button. WID_QES_CANCEL, ///< Cancel button. From e339188dedbb0a99c56536380aa0f32b31959327 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 27 Dec 2020 23:25:43 +0100 Subject: [PATCH 05/47] Add: a go-to-location button to the LandInfo window. --- src/lang/english.txt | 1 + src/misc_gui.cpp | 15 +++++++++++++++ src/widgets/misc_widget.h | 1 + 3 files changed, 17 insertions(+) diff --git a/src/lang/english.txt b/src/lang/english.txt index 99025ae627..8ec1250b89 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2630,6 +2630,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Select t # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Land Area Information +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centre the main view on tile location. Ctrl+Click opens a new viewport on tile location STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Cost to clear: {LTBLUE}N/A STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Cost to clear: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Revenue when cleared: {LTBLUE}{CURRENCY_LONG} diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 1c7b768bd8..e5da5f3a12 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -25,6 +25,7 @@ #include "newgrf_debug.h" #include "zoom_func.h" #include "guitimer_func.h" +#include "viewport_func.h" #include "rev.h" #include "widgets/misc_widget.h" @@ -46,6 +47,7 @@ static const NWidgetPart _nested_land_info_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_LI_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP), NWidget(WWT_DEBUGBOX, COLOUR_GREY), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(), @@ -361,6 +363,19 @@ public: ::ShowNewGRFInspectWindow(GetGrfSpecFeature(this->tile), this->tile); } + void OnClick(Point pt, int widget, int click_count) override + { + switch (widget) { + case WID_LI_LOCATION: + if (_ctrl_pressed) { + ShowExtraViewportWindow(this->tile); + } else { + ScrollMainWindowToTile(this->tile); + } + break; + } + } + /** * Some data on this window has become invalid. * @param data Information about the changed data. diff --git a/src/widgets/misc_widget.h b/src/widgets/misc_widget.h index 0fdfc8c605..f62234405f 100644 --- a/src/widgets/misc_widget.h +++ b/src/widgets/misc_widget.h @@ -12,6 +12,7 @@ /** Widgets of the #LandInfoWindow class. */ enum LandInfoWidgets { + WID_LI_LOCATION, ///< Scroll to location. WID_LI_BACKGROUND, ///< Background of the window. }; From 3e7c75739878bf46450de3b47aedafd95ffbe4fd Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 11 Jan 2021 21:23:47 +0000 Subject: [PATCH 06/47] Update: Translations from eints spanish (mexican): 1 change by absay --- src/lang/afrikaans.txt | 11 +---------- src/lang/arabic_egypt.txt | 11 +---------- src/lang/basque.txt | 11 +---------- src/lang/belarusian.txt | 11 +---------- src/lang/brazilian_portuguese.txt | 11 +---------- src/lang/bulgarian.txt | 11 +---------- src/lang/catalan.txt | 11 +---------- src/lang/croatian.txt | 11 +---------- src/lang/czech.txt | 11 +---------- src/lang/danish.txt | 11 +---------- src/lang/dutch.txt | 11 +---------- src/lang/english_AU.txt | 11 +---------- src/lang/english_US.txt | 11 +---------- src/lang/esperanto.txt | 11 +---------- src/lang/estonian.txt | 11 +---------- src/lang/faroese.txt | 3 +-- src/lang/finnish.txt | 11 +---------- src/lang/french.txt | 11 +---------- src/lang/gaelic.txt | 11 +---------- src/lang/galician.txt | 11 +---------- src/lang/german.txt | 11 +---------- src/lang/greek.txt | 11 +---------- src/lang/hebrew.txt | 11 +---------- src/lang/hungarian.txt | 11 +---------- src/lang/icelandic.txt | 11 +---------- src/lang/indonesian.txt | 11 +---------- src/lang/irish.txt | 11 +---------- src/lang/italian.txt | 11 +---------- src/lang/japanese.txt | 11 +---------- src/lang/korean.txt | 11 +---------- src/lang/latin.txt | 11 +---------- src/lang/latvian.txt | 11 +---------- src/lang/lithuanian.txt | 11 +---------- src/lang/luxembourgish.txt | 11 +---------- src/lang/malay.txt | 11 +---------- src/lang/norwegian_bokmal.txt | 11 +---------- src/lang/norwegian_nynorsk.txt | 11 +---------- src/lang/polish.txt | 11 +---------- src/lang/portuguese.txt | 11 +---------- src/lang/romanian.txt | 11 +---------- src/lang/russian.txt | 11 +---------- src/lang/serbian.txt | 11 +---------- src/lang/simplified_chinese.txt | 11 +---------- src/lang/slovak.txt | 11 +---------- src/lang/slovenian.txt | 11 +---------- src/lang/spanish.txt | 11 +---------- src/lang/spanish_MX.txt | 12 ++---------- src/lang/swedish.txt | 11 +---------- src/lang/tamil.txt | 9 +-------- src/lang/thai.txt | 11 +---------- src/lang/traditional_chinese.txt | 11 +---------- src/lang/turkish.txt | 11 +---------- src/lang/ukrainian.txt | 11 +---------- src/lang/unfinished/chuvash.txt | 2 +- src/lang/unfinished/frisian.txt | 7 +------ src/lang/unfinished/ido.txt | 3 +-- src/lang/unfinished/macedonian.txt | 5 +---- src/lang/unfinished/maltese.txt | 3 +-- src/lang/unfinished/marathi.txt | 3 +-- src/lang/unfinished/persian.txt | 9 +-------- src/lang/unfinished/urdu.txt | 3 +-- src/lang/vietnamese.txt | 11 +---------- src/lang/welsh.txt | 11 +---------- 63 files changed, 64 insertions(+), 567 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 26f7db3cc0..d579d59153 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Kies hoe STR_TOOLTIP_SORT_CRITERIA :{BLACK}Kies kriterea om volgens te rangskik STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Kies kriteria om volgens te filter STR_BUTTON_SORT_BY :{BLACK}Sorteer volgens -STR_BUTTON_LOCATION :{BLACK}Ligging -STR_BUTTON_RENAME :{BLACK}Hernoem STR_BUTTON_CATCHMENT :{BLACK}Dekking STR_TOOLTIP_CATCHMENT :{BLACK}Wissel dekking van die vertoonarea @@ -3683,10 +3681,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Maak aut # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Skuif skerm na trein. Ctrl+klik om die skerm die trein te laat volg -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Skuif skerm na voertuig. Ctrl+klik om die skerm die voertuig te laat volg -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Skuif skerm na skip. Ctrl+klik om die skerm die skip te laat volg -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Skuif skerm na vliegtuig. Ctrl+klik om die skerm die vliegtuig te laat volg STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur trein na diensstasie. Ctrl+klik om net te diens STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur voertuig na diensstasie. Ctrl+klik om net te diens @@ -3718,10 +3712,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Wys pad STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Wys skip se aanwyse STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Toon vliegtuig aanwyse -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Huidige treinaksie - klik hier om trein te stop/aanskakel. Ctrl+klik om na bestemming te skuif. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Huidige voertuigaksie - klik hier om voertuig to stop/aanskakel. Ctrl+klik om na bestemming te skuif. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Huidige skipaksie - klik hier om skip te stop/aanskakel. Ctrl+klik om na bestemming te skuif. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Huidige vliegtuigaksie - klik hier om vliegtuig te stop/aanskakel. Ctrl+klik om na bestemming te skuif. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laai / Aflaai diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index d224c42494..66ad4f00e6 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -225,8 +225,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK} اخت STR_TOOLTIP_SORT_CRITERIA :{BLACK} اختر نوع الترتيب STR_TOOLTIP_FILTER_CRITERIA :{BLACK}حدد معايير المُرَشِح STR_BUTTON_SORT_BY :{BLACK} رتب بـ -STR_BUTTON_LOCATION :{BLACK}الموقع -STR_BUTTON_RENAME :{BLACK}اعادة تسمية STR_BUTTON_CATCHMENT :{BLACK}مدى التغطية STR_TOOLTIP_CLOSE_WINDOW :{BLACK}اغلاق الاطار @@ -3089,10 +3087,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK} الم # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}ضع القطار في مركز شاشة العرض. مفتاح كنترول لمتابعة حركة القطار. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}وضع العربة في مركز شاشة العرض. مفتاح كنترول سيتابع حركة العربة. -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}عرض السفينة في مركز الشاشة. مفتاح كنترول سيتابع حركة السفينة. -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}وضع الطائرة في مركز الشاشة. مفتاح كنترول سيتابع حركة الطائرة STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK} ارسل القطار للورشة - مفتاح التحكم (كنترول) + الضغط سيرسله لصيانة فقط STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}ارسل العربة الى الورشة. مفتاح التحكم (كنترول) + الضغط ترسل للصيانة فقط @@ -3124,10 +3118,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}عرض STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}عرض تفاصيل السفينة STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}عرض تفاصيل الطائرة -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}حركة القطار الحالية - اضغط هنا لايقاف / تشغيل القطار -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}حركة العربة الحالية - اضغط هنا لايقاف / تشغيل العربة -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}امر السفينة الحالي - اضغط لايقاف / تشغيل السفينة -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}وضع الطائرة الحالي - اضغط هنا لايقاف / تشغيل الطائرة + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}تحميل / تفريغ diff --git a/src/lang/basque.txt b/src/lang/basque.txt index ec1c6892d2..91e211a01c 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -232,8 +232,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Hautatu STR_TOOLTIP_SORT_CRITERIA :{BLACK}Aukeratu ordenatze irizpideak STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Aukeratu iragazki irizpideak STR_BUTTON_SORT_BY :{BLACK}Ordenatu -STR_BUTTON_LOCATION :{BLACK}Kokapena -STR_BUTTON_RENAME :{BLACK}Berrizendatu STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lehioa itxi STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Leiho izena - Arrastatu hau leihoa mugitzeko @@ -3430,10 +3428,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ordezkat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia trenean kokatu. Ktrl+klik trena ikuspegi nagusiarekin jarraitzeko -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia errepide ibilgailuan kokatu. Ktrl+klik errepide ibilgailua ikuspegi nagusiarekin jarraitzeko -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia itsasontzian kokatu. Ktrl+klik itsasontzia ikuspegi nagusiarekin jarraitzeko -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia hegazkinean kokatu. Ktrl+klik hegazkina ikuspegi nagusiarekin jarraitzeko STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Trena gordailura bidali. Ktrl+klik bakarrik mantenimendua egiteko STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Errepide ibilgailua gordailura bidali. Ktrl+klik bakarrik mantenimendua egiteko @@ -3465,10 +3459,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Errepide STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Itsasontziaren xehetasunak ikusi STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Hegazkinaren xehetasunak ikusi -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trena orain egiten ari den ekitza - Klik trena gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Ibilgailua orain egiten ari duen ekitza - Klik ibilgailua gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Itsasontzia orain egiten ari duen ekitza - Klik itsasontzia gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Hegazkina orain egiten ari duen ekitza - Klik hegazkina gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Kargatzen/Deskargatzen diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index e08d93aa9b..b0e219302a 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -545,8 +545,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Зьме STR_TOOLTIP_SORT_CRITERIA :{BLACK}Зьмена крытэрыю сартаваньня STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выберыце фiльтр STR_BUTTON_SORT_BY :{BLACK}Сартаваньне -STR_BUTTON_LOCATION :{BLACK}Агляд -STR_BUTTON_RENAME :{BLACK}Перайменаваць STR_BUTTON_CATCHMENT :{BLACK}Ахоп STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрыць вакно @@ -4011,10 +4009,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Дазв # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Паказаць цягнiк у галоўным вакне. Ctrl+клік — сачыць за цягнiком у галоўным вакне. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Паказаць аўтамабiль у галоўным вакне. Ctrl+клік — сачыць за ім у галоўным вакне. -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Паказаць карабель у галоўным вакне. Ctrl+клік будзе сачыць за караблём у галоўным вакне. -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Паказаць паветранае судна у галоўным вакне. Ctrl+клік — сачыць за ім у галоўным вакне. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Паслаць цягнiк у дэпо. Ctrl+клік — толькі для абслугоўваньня. STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Паслаць аўтамабiль у гараж. Ctrl+клік — толькі для абслугоўваньня. @@ -4046,10 +4040,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пака STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Паказаць зьвесткі аб караблi STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Паказаць зьвесткі аб авiятранспарце -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне цягнiка; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне аўтамабiля; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне карабля; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне паветранага судна; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Разгрузка / Пагрузка diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index c628cf2829..1c471f759e 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selecion STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecione critério de classificação STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecione critério para filtração STR_BUTTON_SORT_BY :{BLACK}Classificar por -STR_BUTTON_LOCATION :{BLACK}Local -STR_BUTTON_RENAME :{BLACK}Renomear STR_BUTTON_CATCHMENT :{BLACK}Cobertura STR_TOOLTIP_CATCHMENT :{BLACK}Alternar a visão da área de cobertura @@ -3719,10 +3717,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Faz auto # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar visão no local do trem. Ctrl+Clique seguirá o trem na visão principal. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centralizar visualização na localização do veículo. Ctrl+Clique segue o veículo -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar visão no local da embarcação. Ctrl+Clique seguirá o navio na visão -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar visão no local da aeronave. Ctrl+Clique seguirá a aeronave na visão STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar trem para o depósito STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar veículo para a garagem. CTRL+clique irá apenas reparar @@ -3754,10 +3748,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Exibir d STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Exibir detalhes da embarcação STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Exibir detalhes da aeronave -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual do trem - clique aqui para iniciar/parar o trem. Ctrl+Clique para mostrar o destino -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual do veículo - clique aqui para iniciar/parar veículo. Ctrl+Clique para mostrar o destino. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual da embarcação - clique aqui para iniciar/parar embarcação. Ctrl+Clique para mostrar o destino. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual da aeronave - clique aqui para iniciar/parar a aeronave. Ctrl+Clique para mostrar o destino. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Carregando / descarregando diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index f8c7065075..0821dc0c9a 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Избе STR_TOOLTIP_SORT_CRITERIA :{BLACK}Избери критерий за сортиране STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Избери критерии за филтриране STR_BUTTON_SORT_BY :{BLACK}Сортирай по -STR_BUTTON_LOCATION :{BLACK}Позиция -STR_BUTTON_RENAME :{BLACK}Преименувай STR_BUTTON_CATCHMENT :{BLACK}Покритие STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори прозореца @@ -3512,10 +3510,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Авто # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Позициониране на главният изглед върху влака.При Ctrl+Click ще проследява влака в главният изглед -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Позициониране на главния изглед върху МПС-то. При Ctrl+Click МПС-то ще бъде проследявано в главния изглед -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Фокусирай общия план върху местонахождението на кораба -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Позициониране на главния изглед върху летателната машина. При Ctrl-click летателната машина ще бъде проследяван в главния изглед STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Изпращане влака в депо STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Изпращане на ПС в депо. CTRL+натискане ще изпрати само за преглед @@ -3547,10 +3541,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пока STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Покажи детайлите за кораба STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Информация за самолета -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Текущо състояние на влака - натиснете за спиране/пускане. Ctrl-click за да скролирате до целта -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Текущо действие - натиснете за спиране/пускане на превозното средство. С Ctrl-click можеш да скролираш до целта -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Настоящо корабно действие - натисни тук, за да спреш/задвижиш кораба. С Ctrl-click можеш да скролираш до целта -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Състояние на самолета - натиснете за спиране/пускане. С Ctrl-click можете да скролирате до целта + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Товарене/ Разтоварване diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 1f64363a1a..d0b30b28d6 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona el criteri per ordenar la llista STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filtra per tipus de càrrega STR_BUTTON_SORT_BY :{BLACK}Ordena per: -STR_BUTTON_LOCATION :{G=Masculin}{BLACK}Lloc -STR_BUTTON_RENAME :{BLACK}Canvia el nom STR_BUTTON_CATCHMENT :{BLACK}Cobertura STR_TOOLTIP_CATCHMENT :{BLACK}Mostra/Amaga l'àrea de cobertura @@ -3758,10 +3756,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fer que # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc del tren. Ctrl+Clic per seguir el tren a la vista principal -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc del vehicle. Ctrl+Clic per seguir el vehicle a la vista principal -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc del vaixell. Ctrl+Clic per seguir el vaixell a la vista principal -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc de l'avió. Ctrl+Clic per seguir l'avió a la vista principal STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia el tren a cotxera STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia el vehicle a cotxera @@ -3793,10 +3787,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra e STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra els detalls del vaixell STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra els detalls de l'avió -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Acció sobre el tren actual - clica aquí per parar/engegar el tren. Ctrl+Clic per saltar a la destinació -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/engegar el vehicle. Ctrl+Clic per saltar a la destinació -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Accions sobre el vaixell actual - clica aquí per parar/engegar el vaixell. Ctrl+Clic per saltar a la destinació -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Accions sobre l'avió actual - clica aquí per parar/engegar l'avió. Ctrl+Clic per saltar a la destinació + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Carregant / Descarregant diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index d11109fc0b..b6aae3ed19 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -329,8 +329,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Odaberi STR_TOOLTIP_SORT_CRITERIA :{BLACK}Odaberi kriterij za sortiranje STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Odaberi kriterij filtriranja STR_BUTTON_SORT_BY :{BLACK}Sortiraj prema -STR_BUTTON_LOCATION :{BLACK}Lokacija -STR_BUTTON_RENAME :{BLACK}Preimenuj STR_BUTTON_CATCHMENT :{BLACK}Područje pokrivanja STR_TOOLTIP_CATCHMENT :{BLACK}Uključi prikaz područja pokrivanja @@ -3814,10 +3812,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automats # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju vlaka. Ctrl+klik slijedi vlak u glavni prozor -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju vozila. Ctrl+klik slijedi vozilo u glavni prozor -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju broda. Ctrl+klik slijedi brod u glavni prozor -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju zrakoplova. Ctrl+klik slijedi zrakoplov u glavni prozor STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošalji vlak u spremište. CTRL+klik će samo servisirati STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošalji vozilo u spremište. Ctrl+klik će samo servisirati @@ -3849,10 +3843,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaži STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaži detalje broda STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaži detalje zrakoplova -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja vlaka - pritisni za zaustavljanje/pokretanje vlaka. Ctrl+klik za odlazak do odredišta. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja vozila - pritisni za zaustavljanje/pokretanje vozila. Ctlr+klik za odlazak do odredišta. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja broda - pritisni za zaustavljanje/pokretanje broda. Ctrl+klik za odlazak do odredišta. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja zrakoplova - pritisni za zaustavljanje/pokretanje zrakoplova. Ctrl+klik za odlazak do odredišta. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ukrcaj / Iskrcaj diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 97d31253b4..8d8ee07251 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -308,8 +308,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vyber zp STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vyber, podle čeho se má třídit STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vyber třídící podmínku STR_BUTTON_SORT_BY :{BLACK}Řadit podle -STR_BUTTON_LOCATION :{BLACK}Umístění -STR_BUTTON_RENAME :{BLACK}Přejmenovat STR_BUTTON_CATCHMENT :{BLACK}Pokrytí STR_TOOLTIP_CATCHMENT :{BLACK}Zapnout/vypnout zvýrazňování oblasti pokrytí @@ -3812,10 +3810,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Funkce a # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na vlak. Ctrl+Klik otevře nový pohled -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na vozidlo. Ctrl+Klik otevře nový pohled -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na loď. Ctrl+Klik otevře nový pohled -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na letadlo. Ctrl+Klik otevře nový pohled STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslat vlak do depa. Ctrl+Klik pouze pro provedení oprav STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošli vozidlo do garáže. Ctrl+Klik pouze provede opravy @@ -3847,10 +3841,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Ukaž de STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Ukázat detaily lodi STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Ukázat detaily letadla -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost vlaku - když sem klikneš, vlak se zastaví nebo rozjede. Když ještě podržíš Ctrl, pohled se posune na cílovou stanici -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost vozidla - klikni sem pro zastavení/rozjetí -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost plavidla - pro zastavení či rozjetí, klikni sem -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Činnost letadla - stiskni pro rozjetí/zastavení letadla + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Nakládá nebo vykládá diff --git a/src/lang/danish.txt b/src/lang/danish.txt index f3158e0932..0f5286a7f4 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vælg so STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vælg sorteringskriterie STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vælg filtreringskriterier STR_BUTTON_SORT_BY :{BLACK}Sortér på -STR_BUTTON_LOCATION :{BLACK}Lokalitet -STR_BUTTON_RENAME :{BLACK}Omdøb STR_BUTTON_CATCHMENT :{BLACK}Dækning STR_TOOLTIP_CATCHMENT :{BLACK}Aktiver visning af dækningsområde @@ -3718,10 +3716,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Få auto # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over togets lokalitet. Ctrl-Klik vil følge toget i hovedvinduet -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over køretøjets lokalitet. Ctrl-Klik vil følge køretøjet i hovedvinduet -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over skibets lokalitet. Ctrl-Klik vil følge skibet i hovedvinduet -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over flyets lokalitet. Ctrl+Klik vil følge flyet i hovedvinduet STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til remise. CTRL+klik vil kun servicere STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send køretøjet til værksted. CTRL+klik vil kun servicere @@ -3753,10 +3747,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Vis kør STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer omkring skibet STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljet omkring flyet -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe toget. Ctrl+Click for at scrolle til destinationen -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at stoppe/starte køretøjet. Ctrl+Click for at scrolle til destinationen -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe skibet. Ctrl+Click for at scrolle til destinationen -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe flyet. Ctrl+Click for at scrolle til destinationen + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Læsser / Aflæsser diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 461b66c03e..5a543a50ed 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selectee STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecteer de sorteercriteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecteer de filtercriteria STR_BUTTON_SORT_BY :{BLACK}Sorteren op -STR_BUTTON_LOCATION :{BLACK}Locatie -STR_BUTTON_RENAME :{BLACK}Hernoemen STR_BUTTON_CATCHMENT :{BLACK}Dekking STR_TOOLTIP_CATCHMENT :{BLACK}Schakelt weergave van dekkingsgebied om @@ -3756,10 +3754,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}De te ve # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van de trein. Ctrl+klik volgt de trein in het hoofdscherm -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van het wegvoertuig. Ctrl+klik volgt het voertuig in het hoofdscherm -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van het schip. Ctrl+klik volgt het schip op het hoofdscherm -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van het vliegtuig. Ctrl+klik volgt het vliegtuig op het hoofdscherm STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur trein naar depot. Ctrl+klik voor alleen onderhoud STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur wegvoertuig naar garage. Ctrl+klik voor alleen onderhoud @@ -3791,10 +3785,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Details STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Details van schip weergeven STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Details van vliegtuig weergeven -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van trein - klik hier om de trein te starten-stoppen. Ctrl+klik om naar bestemming te verplaatsen. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van wegvoertuig - klik hier om voertuig te starten-stoppen. Ctrl+klik om naar bestemming te verplaatsen. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van schip - klik hier om te starten-stoppen. Ctrl+klik om naar bestemming te verplaatsen. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van vliegtuig - klik hier om het vliegtuig te stoppen-starten. Ctrl+klik om naar bestemming te verplaatsen. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}In- en uitladen diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 2fe4e02be8..aaa368d28d 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location -STR_BUTTON_RENAME :{BLACK}Rename STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Window title - drag this to move window @@ -3484,10 +3482,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centre main view on train's location. Ctrl+Click will follow train in main view -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre main view on vehicle's location. Ctrl+Click will follow vehicle in main view -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centre main view on ship's location. Ctrl+Click will follow ship in main view -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centre main view on aircraft's location. Ctrl+Click will follow aircraft in main view STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send train to depot. Ctrl+Click will only service STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send vehicle to depot. Ctrl+Click will only service @@ -3519,10 +3513,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Show roa STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Show ship details STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Show aircraft details -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft. Ctrl+Click to scroll to destination + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Loading / Unloading diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 7f910c8e07..4c63f3c29f 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location -STR_BUTTON_RENAME :{BLACK}Rename STR_BUTTON_CATCHMENT :{BLACK}Coverage STR_TOOLTIP_CATCHMENT :{BLACK}Toggle coverage area display @@ -3705,10 +3703,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Center main view on train's location. Ctrl+Click will follow train in main view -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Center main view on vehicle's location. Ctrl+Click will follow vehicle in main view -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Center main view on ship's location. Ctrl+Click will follow ship in main view -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Center main view on aircraft's location. Ctrl+Click will follow aircraft in main view STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send train to depot. Ctrl+Click will only service STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send vehicle to depot. Ctrl+Click will only service @@ -3740,10 +3734,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Show roa STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Show ship details STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Show aircraft details -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship. Ctrl+Click to scroll to destination -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft. Ctrl+Click to scroll to destination + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Loading / Unloading diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 73d20fde5f..51c4abf76d 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -232,8 +232,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Elektu v STR_TOOLTIP_SORT_CRITERIA :{BLACK}Elektu ordigaj kondiĉoj STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selektu kriteriojn por filtrado STR_BUTTON_SORT_BY :{BLACK}Ordigu laŭ -STR_BUTTON_LOCATION :{BLACK}Loko -STR_BUTTON_RENAME :{BLACK}Alinomi STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fermu fenestron STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Fenestra titolo - tiru por movi la fenestron @@ -2964,10 +2962,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ĉe aŭt # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centre vidu trajnan lokon en la ĉefvido. Ctrl+klak sekvas trajnon en la ĉefvido -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre vidu la veturilon en la ĉefvido. Ctrl+klak sekvas veturlilon en la ĉefvido -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centre vidu ŝipon en ĉefvido. Ctrl+klak sekvas ŝipon en la ĉefvido -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centre vidu aviadilon en la ĉefvido. Ctrl-klak sekvas aviadilon en la ĉefvido STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sendi trajnon al garaĝo. Stir+Klak nur prizorgos STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sendi veturilon al garaĝo. Stir+Klak nur prizorgos @@ -2999,10 +2993,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Montru s STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Montru ŝipajn detalojn STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Montru aviadilajn detalojn -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Nuna trajna ago - klaku por haltigi/starti la trajnon. Ctrl+klak rulumas al trajncelo -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nuna veturila ago - klaku ĉi tie por haltigi/starti veturilon. Ctrl+klak rulumas al veturilcelo -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuna ŝipa ago - klaku ĉi tie por haltigi/starti ŝipon. Ctrl+klak rulumas al ŝipcelo -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nuna aviadila ago - klaku ĉi tie por haltigi/starti aviadilon. Ctrl+klak rulumas al aviadilcelo + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ŝarĝante / Deŝarĝante diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 704e745e1c..09a055c13e 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -288,8 +288,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vali jä STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vali järjekord STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vali sõelumisalused STR_BUTTON_SORT_BY :{BLACK}Järjekord: -STR_BUTTON_LOCATION :{BLACK}Asukoht -STR_BUTTON_RENAME :{BLACK}Nimevahetus STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulge aken STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Akna pealkiri. Liigutamiseks lohista seda hiirega. @@ -3638,10 +3636,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Sunni au # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Vaate viimine rongi asukohale -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskenda vaade veovahendile -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Vii vaade laeva asukohale -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Vii peavaade lennukile STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Saada rong depoosse STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Saada sõiduk garaaži. Ctrl+klõps, et ainult teenindada @@ -3673,10 +3667,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Näita m STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Näita laeva täpsustusi STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Näita lennuki täpsustusi -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Praegune rongi tegevus - rongi käivitamiseks või peatamiseks vajuta siia. Ctrl+klõps näitab sihtkohta -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Transpordivahendi praegune tegevus - sõiduki peatamiseks või startimiseks klõpsa siia. Ctrl+klõps näitab sihtkohta -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Praegune laeva tegevus - Laeva käivitamiseks või peatamiseks vajuta siia. Ctrl+klõps näitab sihtkohta -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Praegune lennuki tegevus - lennuki peatamiseks või käivitamiseks vajuta siia. Ctrl+klõps näitab sihtkohta + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Veose ümberlaadimine diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 4b6dcfb6d4..6bda8e5bf3 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -224,8 +224,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vel rað STR_TOOLTIP_SORT_CRITERIA :{BLACK}Set raðfestingar treytir STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Set filtrerings treytir STR_BUTTON_SORT_BY :{BLACK}Sortera eftur -STR_BUTTON_LOCATION :{BLACK}Stað -STR_BUTTON_RENAME :{BLACK}Endurdoyp STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lat glugga aftur STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Glugga heiti - drag her fyri at fyta glugga @@ -3159,6 +3157,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lessar / Avlessar STR_VEHICLE_STATUS_LEAVING :{LTBLUE}Fer avstað diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 233c2be9d0..c48180137a 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Valitse STR_TOOLTIP_SORT_CRITERIA :{BLACK}Valitse järjestyskriteeri STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Valitse suodatuskriteerit STR_BUTTON_SORT_BY :{BLACK}Lajittele -STR_BUTTON_LOCATION :{BLACK}Sijainti -STR_BUTTON_RENAME :{BLACK}Nimeä uudelleen STR_BUTTON_CATCHMENT :{BLACK}Vaikutusalue STR_TOOLTIP_CATCHMENT :{BLACK}Valitse, näytetäänkö vaikutusalue @@ -3758,10 +3756,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automaat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä junan sijaintiin. Ctrl+Klik seuraa junaa näkymässä -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä ajoneuvon sijaintiin. Ctrl+Klik seuraa ajoneuvoa päänäkymässä -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä laivan sijaintiin. Ctrl+Click seuraa laivaa näkymässä -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä ilma-aluksen sijaintiin. Ctrl+Klik seuraa ilma-alusta päänäkymässä STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä juna veturitalliin. Ctrl+Klik suorittaa vain huollon STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ajoneuvo varikolle. Ctrl+Klik suorittaa vain huollon @@ -3793,10 +3787,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä laivan tiedot STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä ilma-aluksen tiedot -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Valitun junan toiminnot – napsauta pysäyttääksesi/käynnistääksesi junan. Ctrl+Klik vierittääksesi kohteeseen -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen ajoneuvon toiminnot – napsauta pysäyttääksesi/käynnistääksesi ajoneuvon. Ctrl+Klik vierittääksesi kohteeseen -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen laivat toiminnot – napsauta pysäyttääksesi/käynnistääksesi laivan. Ctrl+Klik vierittääksesi kohteeseen -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen lentokoneen toiminnot – napsauta pysäyttääksesi/käynnistääksesi lentokoneen. Ctrl+Klik vierittääksesi kohteeseen + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastataan/puretaan diff --git a/src/lang/french.txt b/src/lang/french.txt index d57a4b4d78..155bef221e 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Choisir STR_TOOLTIP_SORT_CRITERIA :{BLACK}Choisir le critère de tri STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Choisir le critère de filtrage STR_BUTTON_SORT_BY :{BLACK}Trier par -STR_BUTTON_LOCATION :{BLACK}Emplacement -STR_BUTTON_RENAME :{BLACK}Renommer STR_BUTTON_CATCHMENT :{BLACK}Couverture STR_TOOLTIP_CATCHMENT :{BLACK}Basculer l'affichage de la zone couverte @@ -3759,10 +3757,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Si l'aut # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le train. Ctrl-clic pour le suivre dans la vue principale. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le véhicule. Ctrl-clic pour le suivre dans la vue principale. -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le navire. Ctrl-clic pour le suivre dans la vue principale. -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur l'aéronef. Ctrl-clic pour le suivre dans la vue principale. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envoyer le train au dépôt.{}Ctrl-clic pour un entretien seul. STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envoyer le véhicule au dépôt.{}Ctrl-clic pour un entretien seul. @@ -3794,10 +3788,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher les détails du navire STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher les détails de l'aéronef -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du train - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du véhicule routier - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du navire - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Action courante de l'aéronef - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Chargement/Déchargement diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 016ec60869..c5af3d2a5e 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -419,8 +419,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Tagh òr STR_TOOLTIP_SORT_CRITERIA :{BLACK}Tagh cuspairean-deuchainn an t-seòrsachaidh STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Tagh cuspairean-deuchainn a' chriathraidh STR_BUTTON_SORT_BY :{BLACK}Seòrsaich a-rèir -STR_BUTTON_LOCATION :{BLACK}Ionad -STR_BUTTON_RENAME :{BLACK}Thoir ainm ùr air STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Dùin an uinneag STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Tiotal na h-uinneige - slaod seo gus an uinneag a ghluasad @@ -3826,10 +3824,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Glèidh # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air an trèan. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad na trèan -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air a' charbad. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad a' charbaid -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air an long. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad na luinge -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air a' charbad-adhair. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad a' charbaid-adhair STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Cuir an trèan dhan trèan-lann. Cha dèan Ctrl+briogadh ach obair-ghlèidhidh STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Cuir carbad dhan gharaids. Cha dèan Ctrl+briogadh ach obair-ghlèidhidh @@ -3861,10 +3855,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Seall mi STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Seall mion-fhiosrachadh na luinge STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Seall mion-fhiosrachadh a' charbaid -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh na trèan seo - briog gus an trèan a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh a' charbaid seo - briog gus an carbad a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh na luinge seo - briog gus an long a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh a' charbaid-adhair seo - briog gus an carbad a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}A' luchdadh / dì-luchdadh diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 2d4f193a67..754a2e998b 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona o criterio de ordenación STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona o criterio de filtrado STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Situación -STR_BUTTON_RENAME :{BLACK}Renomear STR_BUTTON_CATCHMENT :{BLACK}Cobertura STR_TOOLTIP_CATCHMENT :{BLACK}Alternar amosar área de cobertura @@ -3705,10 +3703,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Facer qu # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar a vista principal na situación do tren. Ctrl+click seguirá ao tren na vista principal -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar a vista principal na situación do vehículo. Ctrl+click seguirá ao vehículo na vista principal -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar a vista principal na situación do barco. Ctrl+click seguirá ao barco na vista principal -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra-la vista principal na situación do avión. Ctrl+click seguirá ao avión na vista principal STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren ao depósito. Ctrl+click para facer só servizo STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia-lo vehículo ao depósito. Ctrl click para facer só servizo @@ -3740,10 +3734,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra-l STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra-los detalles do barco STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra-los detalles do avión -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do tren - pincha para deter/arrancar o tren. Ctrl+click para desprazarse ao destino -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do vehículo - pincha para parar/arrancar o vehículo. Ctrl+click para desprazarse ao destino -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do barco - pincha para parar/arrancar o barco. Ctrl+click para desprazarse ao destino -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do avión - pincha para parar/arrancar o avión. Ctrl+click para desprazarse ao destino + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando / Descargando diff --git a/src/lang/german.txt b/src/lang/german.txt index 5e81d55270..8b9760bace 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Sortierr STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sortierkriterien auswählen STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filterkriterien auswählen STR_BUTTON_SORT_BY :{BLACK}Sortieren nach -STR_BUTTON_LOCATION :{BLACK}Standort -STR_BUTTON_RENAME :{BLACK}Umbenennen STR_BUTTON_CATCHMENT :{BLACK}Einzugsgebiet STR_TOOLTIP_CATCHMENT :{BLACK}Anzeige des Einzugsgebietes umschalten @@ -3754,10 +3752,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ursprün # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Zug scrollen. Strg+Klick, um dem Zug zu folgen -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Fahrzeug scrollen. Strg+Klick, um dem Fahrzeug zu folgen -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Schiff scrollen. Strg+Klick, um dem Schiff zu folgen -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Flugzeug scrollen. Strg+Klick, um dem Flugzeug zu folgen STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Zug ins Depot schicken. Strg+Klick, um dort nur Wartung durchzuführen STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Das Fahrzeug ins Depot schicken. Strg+Klick, um dort nur Wartung durchzuführen @@ -3789,10 +3783,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Einzelhe STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Zeige Einzelheiten des Schiffes STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Zeige Einzelheiten des Flugzeuges -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Zugbewegung - Klicke hier, um den Zug anzuhalten / zu starten. Strg + Klick scrollt zum Bestimmungsort -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Fahrzeugbewegung - Klick zum Anhalten bzw. Losschicken. Strg + Klick scrollt zum Bestimmungsort -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Schiffsbewegung - Klicke hier, um das Schiff anzuhalten / zu starten. Strg + Klick scrollt zum Bestimmungsort -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Flugzeugbewegung - Klick zum Anhalten bzw. Losschicken. Strg + Klick scrollt zum Bestimmungsort + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laden / Entladen diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 7f949089ad..cbef805221 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -294,8 +294,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Επιλ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Επιλογή κριτηρίου ταξινόμησης STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Επιλέξτε κριτήρια φιλτραρίσματος STR_BUTTON_SORT_BY :{BLACK}Ταξινόμηση κατά -STR_BUTTON_LOCATION :{BLACK}Τοποθεσία -STR_BUTTON_RENAME :{BLACK}Μετονομασία STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Κλείσιμο παραθύρου STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Τίτλος παραθύρου - σύρετε το για να το μετακινήσετε @@ -3776,10 +3774,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Υποχ # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στην τοποθεσία του τρένου. Με Ctrl+Κλικ ακολουθεί το τρένο στην κύρια προβολή -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στην τοποθεσία του οχήματος δρόμου. Με Ctrl+Κλικ ακολουθεί το όχημα στην κύρια προβολή -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στη τοποθεσία του πλοίου. Με Ctrl+Κλικ ακολουθεί το πλοίο στην κύρια προβολή -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στην τοποθεσία του αεροσκάφους. Με Ctrl+Κλικ ακολουθεί το αεροσκάφος στην κύρια προβολή STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Στέλνει το τρένο στο αμαξοστάσιο. Με Ctrl+Κλικ κάνει μόνο επισκευή STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Στέλνει το όχημα στο αμαξοστάσιο. Με Ctrl+Κλικ κάνει μόνο επισκευή @@ -3811,10 +3805,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Εμφά STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Εμφάνιση λεπτομερειών πλοίου STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Εμφάνιση λεπτομερειών αεροσκάφους -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια τρένου - πατήστε εδώ για ξεκινήσετε/σταματήσετε το τρένο. Με Ctrl+Κλικ πηγαίνετε στον προορισμό -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια οχήματος - πατήστε εδώ για ξεκινήσετε/σταματήσετε το όχημα. Με Ctrl+Κλικ πηγαίνετε στον προορισμό -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια πλοίου - πατήστε εδώ για ξεκινήσετε/σταματήσετε το πλοίο. Με Ctrl+Κλικ πηγαίνετε στον προορισμό -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια αεροσκάφους - πατήστε εδώ για ξεκινήσετε/σταματήσετε το πλοίο. Με Ctrl+Κλικ πηγαίνετε στον προορισμό + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Φόρτωση / Εκφόρτωση diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index e233592807..f6522af9e5 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -245,8 +245,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}(בחר( STR_TOOLTIP_SORT_CRITERIA :{BLACK}בחר\י קרטריון מיון STR_TOOLTIP_FILTER_CRITERIA :{BLACK}בחר קריטריון סינון STR_BUTTON_SORT_BY :{BLACK}מיון לפי -STR_BUTTON_LOCATION :{BLACK}מיקום -STR_BUTTON_RENAME :{BLACK}שנה שם STR_TOOLTIP_CLOSE_WINDOW :{BLACK}סגור חלון STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}כותרת החלון - גרור להזזה @@ -3604,10 +3602,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}שמור # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}מרכז את התצוגה על מיקום הרכבת. Ctrl+לחיצה יעקוב אחרי הרכבת בתצוגה הראשית -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}מרכז את התצוגה על מיקומו של כלי הרכב. Ctrl+לחיצה יעקוב אחרי כלי הרכב בתצוגה הראשית -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}מקד את התצוגה הראשית על כלי השייט. Ctrl+לחיצה יעקוב אחרי כל השייט בתצוגה הראשית -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}מקד את התצוגה הראשית על כלי הטייס. Ctrl+לחיצה יעקוב אחרי כלי הטייס בתצוגה הראשית STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}.שלח את הרכבת למוסך STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}.שלח את כלי הרכב למוסך @@ -3639,10 +3633,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}הצג STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}הצג פרטי כלי שייט STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}הצג פרטי כלי טייס -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}פעולה רכבת נוכחית - לחץ כדי לעצור/להפעיל את הרכבת. Ctrl+לחיצה על מנת לגרור ליעד -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}פעולת כלי רכב נוכחי - לחץ כדי לעצור/להפעיל את כלי הרכב. Ctrl+לחיצה כדי לגלול ליעד -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}פעולת כלי שייט נוכחי - לחץ כדי לעצור/להפעיל את כלי השייט. Ctrl+לחיצה כדי לגלול ליעד -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}פעולת כלי טייס נוכחי - לחץ כדי לעצור/להפעיל את כלי השייט. Ctrl+לחיצה כדי לגלול ליעד + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}טעינה / פריקה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 6f2fb4c835..369d534b2e 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -296,8 +296,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Csökken STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sorbarendezési feltétel STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Szűrési feltétel kiválasztása STR_BUTTON_SORT_BY :{BLACK}Rendezés -STR_BUTTON_LOCATION :{BLACK}Megnéz -STR_BUTTON_RENAME :{BLACK}Átnevez STR_BUTTON_CATCHMENT :{BLACK}Lefedett terület STR_TOOLTIP_CATCHMENT :{BLACK}Az állomás által lefedett terület mutatása @@ -3782,10 +3780,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Az autom # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Közelítés a vonat jelenlegi helyzetére. Ctrl+kattintással a vonat követése a fő nézetben -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Közelítés a jármű jelenlegi helyzetére. Ctrl+kattintással a jármű követése a fő nézetben -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Közelítés a hajó jelenlegi helyzetére. Ctrl+kattintással a hajó követése a fő nézetben -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Közelítés a repülőgép jelenlegi helyzetére. Ctrl+kattintással a repülőgép követése a fő nézetben STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}A járműtelepre küldi a vonatot. Ctrl+kattintással csak javításra STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Garázsba küldi a járművet. Ctrl+kattintással csak javításra @@ -3817,10 +3811,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}A közú STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}A hajó adatai STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}A repülőgép adatai -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális vonatmozgás - kattints ide a vonat elindításához vagy megállításához. Ctrl+kattintással az utasítások váltása -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális járműmozgás - kattints ide a jármű elindításához vagy megállításához. Ctrl+kattintással az utasítások váltása -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális hajómozgás - kattints ide a hajó elindításhoz vagy megállításhoz. Ctrl+kattintással az utasítások váltása -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális repülőgépmozgás - kattints ide a repülőgép elindításához vagy megállításához. Ctrl+kattintással az utasítások váltása + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Berakodás / Kirakodás diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index fa03f937ff..28379e1870 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -224,8 +224,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Velja up STR_TOOLTIP_SORT_CRITERIA :{BLACK}Velja uppröðun STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Veldu hvers kyns farartæki þú vilt kaupa STR_BUTTON_SORT_BY :{BLACK}Flokka eftir -STR_BUTTON_LOCATION :{BLACK}Staðsetning -STR_BUTTON_RENAME :{BLACK}Endurnefna STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Loka glugga STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Haus glugga - dragðu með músinni til að færa gluggann @@ -3308,10 +3306,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Heldur l # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Miðstilla sjónarhorn á staðsetningu lestar. Ctrl+smella til að fylgja lestina í aðal sjónarhorni -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Miðja aðalsjónarhornið á bifreið. Ctrl smelltu til að fylgja bifreiðina í aðalglugga -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Miðja aðalsjónarhorn á staðsetningu skips. Ctrl smelltu til að fylgja skipi í aðalglugga -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Miðja aðalsjónarhorn á flugvélina. Ctrl smelltu til að fylgja flugvél í aðalglugga STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Senda lest í skýli. Ctrl+smella til þjóna lestinni einungis STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Senda bifreið í skýli @@ -3343,10 +3337,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Sýna up STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Sýna nánari upplýsingar um skip STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Sýna nánari upplýsingar um skip -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð lestar - smelltu hér til að stöðva/ræsa lestina. Ctrl+smella til að fara á áfangastað -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð bifreiðar - smelltu hér til að stöðva/ræsa bifreið. Ctrl+Smella til að fara á áfangastað -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð skips - smelltu hér til að stöðva/ræsa skipið. Ctrl+Smella til at fara á áfangastað -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð - smelltu hér til að stöðva/ræsa flugvél. Ctrl+Smella til at fara á áfangastað + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ferma / Afferma diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 2e34f13026..abb7413a50 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Pilih mo STR_TOOLTIP_SORT_CRITERIA :{BLACK}Pilih kriteria pengurutan STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Pilih kriteria STR_BUTTON_SORT_BY :{BLACK}Urutkan -STR_BUTTON_LOCATION :{BLACK}Lokasi -STR_BUTTON_RENAME :{BLACK}Ubah nama STR_BUTTON_CATCHMENT :{BLACK}Jangkauan STR_TOOLTIP_CATCHMENT :{BLACK}Tombol tampilan area cakupan @@ -3743,10 +3741,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Membuat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan pada lokasi kereta. Ctrl+Click akan mengikuti kereta pada pandangan utama. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan utama pada lokasi kendaraan. Ctrl+Click akan mengikuti kendaraan pada pandangan utama -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan utama pada lokasi kapal. Ctrl+Click akan mengikuti kapal pada pandangan utama -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan utama pada lokasi pesawat. Ctrl+Click akan mengikuti pesawat pada pandangan utama STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kereta berhenti di depo. CTRL+klik untuk memerintahkan perbaikan saja STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kendaraan berhenti di bengkel. CTRL+klik hanya akan memerintahkan perbaikan di bengkel @@ -3778,10 +3772,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilka STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail kapal STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail pesawat -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aksi kereta saat ini - klik untuk menjalankan/menghentikan kereta. Ctrl-Click untuk melihat tujuan. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Kegiatan kendaraan saat ini - klik untuk menghentikan/menjalankan kendaraan. Ctrl-Click untuk melihat tujuan. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aksi kapal saat ini - klik untuk menghentikan / menjalankan kapal. Ctrl-Click untuk melihat tujuan. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Aksi pesawat saat ini - klik untuk menghentikan/menjalankan pesawat. Ctrl-Click untuk melihat tujuan. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Bongkar/Muat diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 25fbad2efe..e8710e27cf 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Roghnaig STR_TOOLTIP_SORT_CRITERIA :{BLACK}Roghnaigh critéir sórtála STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Roghnaigh critéir scagtha STR_BUTTON_SORT_BY :{BLACK}Sórtáil de réir -STR_BUTTON_LOCATION :{BLACK}Suíomh -STR_BUTTON_RENAME :{BLACK}Athainmnigh STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Dún an fhuinneog STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Teideal fuinneoige - tarraing é seo chun fuinneog a bhogadh @@ -3533,10 +3531,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ceangail # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh na traenach. Leanfar an traein sa phríomhamharc le Ctrl+Cliceáil -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh na feithicle. Leanfar an fheithicil sa phríomhamharc le Ctrl+Cliceáil -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh na loinge. Leanfar an long sa phríomhamharc le Ctrl+Cliceáil -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh an aerárthaigh. Leanfar an t-aerárthach sa phríomhamharc le Ctrl+Cliceáil STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Seol an traein chuig an iosta. Ní dhéanfar ach seirbhísiú le Ctrl+Cliceáil STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Seol an fheithicil chuig an iosta. Ní dhéanfar ach seirbhísiú le Ctrl+Cliceáil @@ -3568,10 +3562,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Taispeá STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Taispeáin sonraí na loinge STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Taispeáin sonraí an aerárthaigh -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don traein reatha - cliceáil chun an traein a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don fheithicil reatha - cliceáil chun an fheithicil a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don long reatha - cliceáil chun an long a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don aerárthach reatha - cliceáil chun an t-aerárthach a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ag Lódáil / Dílódáil diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 4348e3335f..3fc2e1c8f3 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selezion STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleziona il criterio di ordinamento STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleziona il criterio di filtraggio STR_BUTTON_SORT_BY :{BLACK}Ordina per -STR_BUTTON_LOCATION :{BLACK}Posizione -STR_BUTTON_RENAME :{BLACK}Rinomina STR_BUTTON_CATCHMENT :{BLACK}Copertura STR_TOOLTIP_CATCHMENT :{BLACK}Attiva/disattiva la visualizzazione dell'area di copertura @@ -3748,10 +3746,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fa sì c # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione del treno. CTRL+clic attiva l'inseguimento della visuale. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione dell'automezzo. CTRL+clic attiva l'inseguimento della visuale. -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione della nave. CTRL+clic attiva l'inseguimento della visuale. -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione dell'aeromobile. CTRL+clic attiva l'inseguimento della visuale. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Manda il treno al deposito. CTRL+clic per eseguire solo una manutenzione STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Manda l'automezzo al deposito. CTRL+clic per eseguire solo una manutenzione @@ -3783,10 +3777,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra i STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra i dettagli sulla nave STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra i dettagli sull'aeromobile -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente del treno - fare clic per fermarlo/avviarlo. CTRL+clic visualizza la destinazione -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente del veicolo - fare clic per fermarlo/avviarlo. CTRL+clic visualizza la destinazione -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente della nave - fare clic per fermarla/avviarla. CTRL+clic visualizza la destinazione -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente dell'aeromobile - fare clic per fermare/avviare l'aeromobile. CTRL+clic visualizza la destinazione + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Caricamento / Scaricamento diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 8144d10619..2e80121219 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}並べ STR_TOOLTIP_SORT_CRITERIA :{BLACK}並べ替えの基準を選択します STR_TOOLTIP_FILTER_CRITERIA :{BLACK}フィルタリングの基準を選択します STR_BUTTON_SORT_BY :{BLACK}並べ替え -STR_BUTTON_LOCATION :{BLACK}所在地に移動 -STR_BUTTON_RENAME :{BLACK}名前を変更 STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ウィンドウを閉じます STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}ウィンドウのタイトルです。ドラッグでウィンドウが移動できます @@ -3536,10 +3534,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}機関 # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}メイン画面を列車の場所に移動します。Ctrl+クリックで、そのまま列車を追跡します -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}メイン画面を車両の場所に移動します。Ctrl+クリックで、そのまま車両を追跡します -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}メイン画面を船舶の場所に移動します。Ctrl+クリックで、そのまま船舶を追跡します -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}メイン画面を航空機の場所に移動します。Ctrl+クリックで、そのまま航空機を追跡します STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}列車を列車庫へ回送します。Ctrl+クリックすると点検後、再出庫します STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}車両を車庫へ回送します。Ctrl+クリックすると点検後、再出庫します @@ -3571,10 +3565,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}車両 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}船舶の情報を表示 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}航空機の情報を表示します -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}列車の現在の動作 - 運用開始/運用停止するにはここをクリックします。Ctrl+クリックで目的地に移動します -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}車両の現在の動作 - 運用開始/運用停止するにはここをクリックします。Ctrl+クリックで目的地に移動します -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}船舶の現在の動作 - 運用開始/運用停止するにはここをここへクリックします。Ctrl+クリックで目的地に移動します -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}航空機の現在の動作 - 運用開始/運用停止するにはここをクリックします。Ctrl+クリックで目的地に移動します + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}積み降ろし中 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index d01ed11d12..326bec0f05 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}정렬 STR_TOOLTIP_SORT_CRITERIA :{BLACK}정렬 기준을 선택하십시오. STR_TOOLTIP_FILTER_CRITERIA :{BLACK}검색 기준 선택 STR_BUTTON_SORT_BY :{BLACK}정렬 -STR_BUTTON_LOCATION :{BLACK}위치 -STR_BUTTON_RENAME :{BLACK}이름 바꾸기 STR_BUTTON_CATCHMENT :{BLACK}역세권 STR_TOOLTIP_CATCHMENT :{BLACK}이 역의 역세권을 표시하거나 끕니다. @@ -3759,10 +3757,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}자동 # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}이 열차가 있는 곳으로 이동합니다. CTRL+클릭하면 이 열차를 따라갑니다 -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}이 차량이 있는 곳으로 이동합니다. CTRL+클릭하면 이 차량을 따라갑니다 -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}이 선박이 있는 곳으로 이동합니다. CTRL+클릭하면 이 선박을 따라갑니다 -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}이 항공기가 있는 곳으로 이동합니다. CTRL+클릭하면 이 항공기를 따라갑니다 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}열차를 차량기지로 보냅니다. CTRL+클릭하면 정비를 하러 차량기지에 들르기만 합니다 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}차량을 차고지로 보냅니다. CTRL+클릭하면 정비를 하러 차고지에 들르기만 합니다 @@ -3794,10 +3788,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}차량 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}선박의 상세정보를 보여줍니다 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}항공기의 상세정보를 보여줍니다 -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}현재 열차 행동 - 열차를 운행/정지시키려면 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}현재 차량 행동 - 운행/정지시키려면 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}현재 선박 행동 - 선박을 운행/중지시키려면 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}현재 항공기 행동 - 항공기를 운행/중지시키려면 여기를 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}싣는 중 / 내리는 중 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index c15bc1d944..93fccc773f 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -421,8 +421,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Eligere STR_TOOLTIP_SORT_CRITERIA :{BLACK}Eligere criteria separandi STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Eligere criteria colandi STR_BUTTON_SORT_BY :{BLACK}Ordinare -STR_BUTTON_LOCATION :{BLACK}Locus -STR_BUTTON_RENAME :{BLACK}Renominare STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Claudere fenestram STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titulus fenestrae - hunc trahe ut fenestra moveatur @@ -3822,10 +3820,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Facere u # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hoc tramen. Ctrl+Preme ut conspectus tramen sequatur -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hoc vehiculum. Ctrl+Preme ut conspectus vechiculum sequatur -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hanc navem. Ctrl+Preme ut conspectus navem sequatur -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hoc aeroplanum. Ctrl+Preme ut conspectus aeroplanum sequatur STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mittere tramen ad receptaculum. Ctrl+Preme ut modo ministretur STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mittere vehiculum ad receptaculum. Ctrl+Preme ut modo ministretur @@ -3857,10 +3851,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Monstrar STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Monstrare indicia navis STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Monstrare indicia aeroplani -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Actio traminis currens - preme ut tramen sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Actio vehiculi currens - preme ut vehiculum sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Actio navis currens - preme ut navis sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Actio aeroplani currens - preme ut aeroplanum sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Onerans / Exonerans diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index f1264ca036..6932176c9a 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -236,8 +236,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Izvēlē STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izvēlēties kārtošanas pazīmes STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izvēlēties filtrēšanas pazīmes STR_BUTTON_SORT_BY :{BLACK}Kārtot pēc -STR_BUTTON_LOCATION :{BLACK}Atrašanās vieta -STR_BUTTON_RENAME :{BLACK}Pārdēvēt STR_BUTTON_CATCHMENT :{BLACK}Pārklājums STR_TOOLTIP_CATCHMENT :{BLACK}Pārslēgt pārklājuma laukuma rādīšanu @@ -3764,10 +3762,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automāt # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz vilcienu. Ctrl+klikšķis sekos vilcienam galvenajā skatā -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz transportlīdzekli. Ctrl+klikšķis sekos transportlīdzeklim galvenajā skatā -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz kuģi. Ctrl+klikšķis sekos kuģim galvenajā skatā -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz lidaparātu. Ctrl+klikšķis sekos lidaparātam galvenajā skatā STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sūtīt vilcienu uz depo. Ctrl+klikšķis - izvēlēties tikai apkopi STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sūtīt autotransporta līdzekli uz depo. Ctrl+klikšķis - izvēlēties tikai apkopi @@ -3799,10 +3793,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Rādīt STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Rādīt kuģa informāciju STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Rādīt lidaparāta informāciju -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Vilciena pašreizējā darbība - klikšķināt šeit, lai apturētu/palaistu vilcienu. Ctrl+klikšķis, lai ritinātu līdz galamērķim -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Transportlīdzekļa pašreizējā darbība - klikšķināt šeit, lai to apturētu/palaistu. Ctrl+klikšķis, lai ritinātu līdz galamērķim -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Kuģa pašreizējā darbība - klikšķināt šeit, lai apturētu/palaistu kuģi. Ctrl+klikšķis, lai ritinātu līdz galamērķim -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Lidaparāta pašreizējā darbība - klikšķināt šeit, lai apturētu/palaistu lidaparātu. Ctrl+klikšķis, lai ritinātu līdz galamērķim + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Iekraušana / Izkraušana diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 5f5df17ab3..da44c882b3 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -427,8 +427,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Rikiavim STR_TOOLTIP_SORT_CRITERIA :{BLACK}Rikiavimo raktas STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filtravimo raktas STR_BUTTON_SORT_BY :{BLACK}Rikiuoti pagal -STR_BUTTON_LOCATION :{BLACK}Vieta -STR_BUTTON_RENAME :{BLACK}Pervadinti STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Užverti langą STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Lango antraštė — tempkite ją, jei norite perkelti langą į kitą ekrano vietą @@ -3826,10 +3824,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Pakeitim # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centruoti traukinį pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su traukiniu -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centruoti automobilį pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su automobiliu -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centruoti laivą pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su laivu -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centruoti lėktuvą pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su lėktuvu STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Nukreipti traukinį į depą. Spragtelėjus laikant nuspaustą Ctrl klavišą, traukinys bus nukreiptas tik techninei apžiūrai STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Nukreipti automobilį į garažą. Spragtelėjus laikant nuspaustą Ctrl klavišą, automobilis bus nukreiptas tik techninei apžiūrai @@ -3861,10 +3855,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Parodyti STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Parodyti išsamią laivo informaciją STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Parodyti išsamią lėktuvo informaciją -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Traukinio būsena. Spragtelkite, jei norite sustabdyti ar paleisti traukinį. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Automobilio būsena. Spragtelkite, jei norite sustabdyti ar paleisti automobilį. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Laivo būsena. Spragtelkite, jei norite sustabdyti ar paleisti laivą. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Lėktuvo būsena. Spragtelkite, jei norite sustabdyti ar paleisti lėktuvą. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Pakraunamas / iškraunamas diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 597daf7adb..8e74345451 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Richtung STR_TOOLTIP_SORT_CRITERIA :{BLACK}Argument fir ze sortéieren STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filterkritère wielen STR_BUTTON_SORT_BY :{BLACK}Sortéier no -STR_BUTTON_LOCATION :{BLACK}Plaz -STR_BUTTON_RENAME :{BLACK}Ëmbenennen STR_BUTTON_CATCHMENT :{BLACK}Reechwäit STR_TOOLTIP_CATCHMENT :{BLACK}Reechwäit uweisen un/ausschalten @@ -3717,10 +3715,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Mécht d # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op den Zuch. Ctrl+Klick follegt dem Zuch an der Haaptusiicht -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op d'Gefier. Ctrl+Klick follegt dem Gefier an der Haaptusiicht -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op d'Schëff. Ctrl+Klick follegt dem Schëff an der Haaptusiicht -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op de Fliger. Ctrl+Klick follegt dem Fliger an der Haaptusiicht STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Schéckt den Zuch an de Schapp. Ctrl+Klick fir nëmmen Revisioun STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Schéckt d'Gefier an den Depot. Ctrl+Klick fir nëmmen Revisioun @@ -3752,10 +3746,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Weist St STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Weis Schëffsdetailer STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Weist d'Fligerdetailer -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - klick hei fir den Zuch ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - klick hei fir d'Gefier ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - Klick hei fir d'Schëff ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - Klick hei fir de Fliger ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lueden / Entlueden diff --git a/src/lang/malay.txt b/src/lang/malay.txt index eba44af687..0cb03e48ec 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -225,8 +225,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Pilih be STR_TOOLTIP_SORT_CRITERIA :{BLACK}Pilih cara susunan STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Pilih cara penapisan STR_BUTTON_SORT_BY :{BLACK}Menyusun mengikuti -STR_BUTTON_LOCATION :{BLACK}Lokasi -STR_BUTTON_RENAME :{BLACK}Tukar Nama STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tutup tetingkap STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Tajuk tetingkap - seret untuk menggerakkan tetingkap @@ -3228,10 +3226,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Membuat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Pusatkan paparan utama kepada lokasi kereta api. Ctrl+Klik akan mengikuti keretapi di paparan utama -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Pusatkan paparan utama kepada lokasi kenderaan. Ctrl+Klik akan mengikuti kenderaan di paparan utama -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Pusatkan pemandangan utama ke lokasi kapal. Ctrl+Klik akan mengikuti kapal di paparan utama -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Pusatkan paparan utama di lokasi pesawat. Ctrl+Klik akan mengikuti pesawat di paparan utama STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Hantar keretapi ke depoh. Ctrl+Klik akan hanya selenggara STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Hantar kenderaan ke depoh. Ctrl+Klik untuk selenggara sahaja @@ -3263,10 +3257,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Tunjukka STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Tunjukkan butiran kapal STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Tunjukkan butiran pesawat -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa keretapi - klik untuk menghentikan/menggerakkan keretapi. Ctrl+Klik untuk skrol ke destinasi -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa kenderaan - klik untuk menghentikan/menggerakkan kenderaan. Ctrl+Klik untuk skrol ke destinasi -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa kapal - klik untuk menghentikan/menggerakkan kapal. Ctrl+Klik untuk skrol ke destinasi -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa pesawat - klik untuk menghentikan/menggerakkan pesawat. Ctrl+Klik untuk skrol ke destinasi + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Punggah naik / Punggah turun diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index ef821268ec..c06adf072e 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Velg sor STR_TOOLTIP_SORT_CRITERIA :{BLACK}Velg sorteringskriterier STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Velg filtreringskriterier STR_BUTTON_SORT_BY :{BLACK}Sorter etter -STR_BUTTON_LOCATION :{BLACK}Gå til -STR_BUTTON_RENAME :{BLACK}Gi nytt navn STR_BUTTON_CATCHMENT :{BLACK}Dekning STR_TOOLTIP_CATCHMENT :{BLACK}Veksle mellom visning av dekningsområde @@ -3719,10 +3717,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}La autoe # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Gå til tog. Ctrl+klikk vil følge toget i hovedvinduet -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Gå til kjøretøy. Ctrl+klikk vil følge kjøretøyet i hovedvinduet -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Gå til skip. Ctrl+klikk vil følge skipet i hovedvinduet -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Gå til luftfartøy. Ctrl+klikk vil følge luftfartøyet i hovedvinduet STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til en togstall. Ctrl+klikk for kun å utføre vedlikehold STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send kjøretøyet til en garasje. Ctrl+klikk for kun å utføre vedlikehold @@ -3754,10 +3748,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Vis deta STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om skipet STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om luftfartøyet -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende togstatus - klikk her for å stoppe/starte toget. Ctrl+klikk ruller til destinasjonen -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende kjøretøystatus - klikk her for å stoppe/starte kjøretøyet. Ctrl+klikk ruller til destinasjonen -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende skipsstatus - klikk her for å stoppe/starte skipet. Ctrl+klikk ruller til destinasjonen -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende luftfartøystatus - klikk her for å stoppe/starte luftfartøyet. Ctrl+klikk ruller til destinasjonen + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laster / Losser diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 4b35078727..9668d85d9b 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vel sort STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vel sorteringskriterium STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vel filtreringskriterium STR_BUTTON_SORT_BY :{BLACK}Sorter etter -STR_BUTTON_LOCATION :{BLACK}Stad -STR_BUTTON_RENAME :{BLACK}Gje nytt namn STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lukk vindauge STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Tittel på vindauget - dra for å flytte vindauget @@ -3453,10 +3451,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Lat den # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Syne toget sin gjeldande posisjon. CTRL+klikk vil følgja toget i hovudvindauget -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Syne køyretøyet sin gjeldande posisjon. CTRL+klikk vil følgja køyretøyet i hovudvindauget -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Syne skipet sin gjeldande posisjon. CTRL+klikk vil følgja skipet i hovudvindauget -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Syne luftfartøyet sin gjeldande posisjon. CTRL+klikk vil følgja luftfartøyet i hovudvindauget STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til togstallen. CTRL+klikk for å berre utføre vedlikehald STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send køyretøyet til garasjen. CTRL+klikk for å berre sende til vedlikehald @@ -3488,10 +3482,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Syne kø STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Syne skipsdetaljar STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Syne detaljar om luftfartøy -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldande togstatus - klikk her for å stoppe/starte tog. CTRL+klikk ruller til destinasjonen -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldande køyretøystatus - klikk her for å stoppa/starta køyretøy. CTRL+klikk ruller til destinasjonen -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende skipsstatus - klikk her for å stoppe/starte skip. CTRL+klikk ruller til destinasjonen -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldande luftfartøystatus - klikk her for å stoppe/starte luftfartøy. CTRL+klikk ruller til destinasjonen + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastar / Lossar diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 1a3c4af434..4709659e3a 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -613,8 +613,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Wybierz STR_TOOLTIP_SORT_CRITERIA :{BLACK}Wybierz kryterium sortowania STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Wybierz kryteria filtrowania STR_BUTTON_SORT_BY :{BLACK}Sortuj wg -STR_BUTTON_LOCATION :{BLACK}Położenie -STR_BUTTON_RENAME :{BLACK}Zmień nazwę STR_BUTTON_CATCHMENT :{BLACK}Zasięg STR_TOOLTIP_CATCHMENT :{BLACK}Przełącz wyświetlanie zasięgu @@ -4144,10 +4142,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Autowymi # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centruj główny widok na pozycji pociągu. Ctrl+klik by podążać za pociągiem w głównym oknie -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centruj główne okno na pozycji pojazdu. Ctrl+klik by podążać za pojazdem w głównym oknie -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centruj główny widok na pozycji statku. Ctrl+klik by podążać za statkiem w głównym oknie -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centruj główny widok na pozycji samolotu. Ctrl+klik by podążać za samolotem w głównym oknie STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Wyślij pociąg do warsztatów. Ctrl - tylko serwis STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Wyślij pojazd do zajezdni. Ctrl - tylko serwis @@ -4179,10 +4173,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż s STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż szczegóły statku STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż szczegóły samolotu -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan pociągu - kliknij aby zatrzymać/ruszyć pociąg. Ctrl+klik by przejść do punktu docelowego -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan pojazdu - kliknij aby zatrzymać/ruszyć pojazd. Ctrl+klik by przejść do punktu docelowego -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan statku - kliknij aby zatrzymać/ruszyć statek. Ctrl+klik by przejść do punktu docelowego -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan samolotu - kliknij aby zatrzymać/ruszyć samolot. Ctrl+klik by przejść do punktu docelowego + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Załadunek / Wyładunek diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 3adf8fe222..6674699629 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleccione critério de ordenação STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleccione o critério de filtragem/procura STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Localização -STR_BUTTON_RENAME :{BLACK}Renomear STR_BUTTON_CATCHMENT :{BLACK}Cobertura STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fechar janela @@ -3690,10 +3688,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Forçar # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização do comboio. Ctrl+Clique segue o comboio na visualização -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização do veículo. Ctrl+Clique segue o veículo na visualização -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização do navio. Ctrl+Clique segue o navio na visualização -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização da aeronave. Ctrl+Clique segue a aeronave na visualização STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mandar comboio para o depósito STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mandar veículo para o depósito @@ -3725,10 +3719,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalhes do navio STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalhes da aeronave -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual do comboio - clique aqui para iniciar/parar comboio. Ctrl+Clique para deslocar-se ao destino -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual do veículo - clique aqui para iniciar/parar veículo. Ctrl+Clique para deslocar-se ao destino -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual do navio - clique aqui para iniciar/parar navio. Ctrl+Clique para deslocar-se ao destino -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual da aeronave - clique aqui para iniciar/parar a aeronave. Ctrl+Clique para deslocar-se ao destino + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}A carregar / descarregar diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 2ee2c7081e..328e53fb0e 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -232,8 +232,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Alegeți STR_TOOLTIP_SORT_CRITERIA :{BLACK}Alegeți criteriul de sortare STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Alegeți criteriul de filtrare STR_BUTTON_SORT_BY :{BLACK}Ordonează -STR_BUTTON_LOCATION :{BLACK}Locație -STR_BUTTON_RENAME :{BLACK}Nume nou STR_BUTTON_CATCHMENT :Arie de acoperire STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Închide fereastra @@ -3543,10 +3541,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fă opti # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a trenului. Ctrl-click va urmări trenul -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a autovehiculului. Ctrl-click va urmări autovehiculul -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a navei. Ctrl-click va urmări nava -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a aeronavei. Ctrl-click va urmări aeronava STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Trimite trenul într-un depou STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Trimite autovehiculul la autobază. Ctrl+clic pentru service @@ -3578,10 +3572,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Afişeaz STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Afişează detaliile navei STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Afişează detaliile aeronavei -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a trenului - clic aici pentru a opri/porni trenul. Ctrl+Click pentru a vedea destinaţia -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a autovehiculului - clic aici pentru a opri/porni autovehiculul. Ctrl+Click pentru a vedea destinatia -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a navei - clic aici pentru a opri/porni nava. Ctrl+Click pentru a vedea destinaţia -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a aeronavei - clic aici pentru a opri/porni aeronava + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Încărcare / Descărcare diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 54275c7285..003630f320 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -360,8 +360,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Смен STR_TOOLTIP_SORT_CRITERIA :{BLACK}Смена критерия сортировки STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выберите фильтр STR_BUTTON_SORT_BY :{BLACK}Сортировка -STR_BUTTON_LOCATION :{BLACK}Обзор -STR_BUTTON_RENAME :{BLACK}Переименовать STR_BUTTON_CATCHMENT :{BLACK}Охват STR_TOOLTIP_CATCHMENT :{BLACK}Переключить подсветку участков, находящихся в зонах обслуживания станциями игрока, а также не попадающих в эти зоны. @@ -3936,10 +3934,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Разр # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Показать поезд в основном окне. Ctrl+щелчок включит слежение за поездом в главном окне. -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Показать автомобиль в главном окне. Ctrl+щелчок включит слежение за автомобилем в главном окне. -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Показать корабль в главном окне. Ctrl+Click будет следить за кораблем в главном окне -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Показать самолёт в главном окне. Ctrl+щелчок включит слежение за самолётом в главном окне. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить поезд в депо. Ctrl+щелчок - только для обслуживания. STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить автомобиль в гараж. Ctrl+щелчок - только для обслуживания. @@ -3971,10 +3965,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пока STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о корабле STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Показать сведения об авиатранспорте. -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие поезда; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие автомобиля; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие корабля; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения. -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие воздушного судна; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения. + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Разгрузка/Погрузка diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 499d3986f9..5785dfbd99 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -419,8 +419,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Odaberit STR_TOOLTIP_SORT_CRITERIA :{BLACK}Odaberite kriterijum za sortiranje STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izaberite način filtriranja STR_BUTTON_SORT_BY :{BLACK}Sortiraj po -STR_BUTTON_LOCATION :{BLACK}Mesto -STR_BUTTON_RENAME :{BLACK}Preimenuj STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Naslov - povucite mišem da biste pomerili prozor @@ -3773,10 +3771,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ukoliko # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju voza. Ctrl+Klik će pratiti voz u glavnom pogledu -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju vozila. Ctrl+Klik će pratiti vozilo u glavnom pogledu -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju broda. Ctrl+Klik će pratiti brod u glavnom pogledu -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju letilice. Ctrl+Klik će pratiti letelicu u glavnom pogledu STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošaljite voz u depo. Sa Ctrl+Klik će otići samo na servis STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošaljite vozilo u depo. Sa Ctrl+Klik će otići samo na servis @@ -3808,10 +3802,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Prikazuj STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Prikazuje podatke o brodu STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Prikazuje podatke o letilici -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje voza - kliknite ovde za zaustavljanje/pokretanje voza. Ctrl+Klik pomera pogled na odredište -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje vozila - kliknite ovde za zaustavljanje/pokretanje vozila. Ctrl+Klik pomera pogled na odredište -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje broda - kliknite ovde za zaustavljanje/pokretanje broda. Ctrl+Klik pomera pogled na odredište -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje letilice - kliknite ovde za zaustavljanje/pokretanje letilice. Ctrl+Klik pomera pogled na odredište + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Utovarivanje / Istovarivanje diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 97c0977d49..b41e4d2ea2 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}选择 STR_TOOLTIP_SORT_CRITERIA :{BLACK}选择排序标准 STR_TOOLTIP_FILTER_CRITERIA :{BLACK}选择过滤标准 STR_BUTTON_SORT_BY :{BLACK}排序 -STR_BUTTON_LOCATION :{BLACK}定位 -STR_BUTTON_RENAME :{BLACK}重命名 STR_BUTTON_CATCHMENT :{BLACK}覆盖范围 STR_TOOLTIP_CATCHMENT :{BLACK}显示覆盖范围 @@ -3718,10 +3716,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}当车 # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到列车所在的位置. 单击的同时按住Ctrl则主窗口会跟踪列车的路线 -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到车辆所在的位置. 单击的同时按住Ctrl则主窗口会跟踪车辆的路线 -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到船只所在的位置. 单击的同时按住Ctrl则主窗口会跟踪船只的航线 -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到飞机所在的位置. 单击的同时按住Ctrl则主窗口会跟踪飞机的航线 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}命令列车返回车库 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}命令汽车前往车库{}Ctrl+单击 时汽车只进行保养 @@ -3753,10 +3747,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}显示 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}显示船只的详情 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}显示飞机的详情 -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}当前列车状态{}点击可以 启动/停止 列车。Ctrl+点击切换至目的地。 -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}当前车辆的任务{}单击这里可以 停止/启动 车辆。Ctrl+点击切换至目的地。 -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}当前船只的任务{}点击可以 启动/停止 船只。Ctrl+点击切换至目的地。 -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}飞机当前的状态{}点击可以 停止/启动 飞机。 Ctrl+点击 切换至目的地 + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}装载/卸货 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 237ffb37b0..3beaea3e02 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -298,8 +298,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Spôsob STR_TOOLTIP_SORT_CRITERIA :{BLACK}Zvoľ kritérium triedenia STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vybrať kritériá filtrovania STR_BUTTON_SORT_BY :{BLACK}Usporiadať -STR_BUTTON_LOCATION :{BLACK}Poloha -STR_BUTTON_RENAME :{BLACK}Premenovať STR_BUTTON_CATCHMENT :{BLACK}Pokrytie STR_TOOLTIP_CATCHMENT :{BLACK}Prepnúť zobrazenie oblasti pokrytia @@ -3818,10 +3816,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Zachovan # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu vlaku. Ctrl+klik bude sledovať vlak -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu vozidla. Ctrl+klik bude sledovať vozidlo -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu lode. Ctrl+klik bude sledovať loď -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu lietadla. Ctrl+klik bude sledovať lietadlo STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslať vlak do depa. Ctrl+klik iba servis STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslať vozidlo do garáže. Ctrl+klik iba servis. @@ -3853,10 +3847,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Zobrazi STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Zobraziť detaily o lodi STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Zobraziť detaily o lietadle -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť vlaku - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť vozidla - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť lode - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť lietadla - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Nakláda / Vykláda diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 9df575f685..6aa341378f 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -384,8 +384,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Izberite STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izberite kriterij razvrščanja STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izberite kriterij filtriranja STR_BUTTON_SORT_BY :{BLACK}Razvrsti po -STR_BUTTON_LOCATION :{BLACK}Mesto -STR_BUTTON_RENAME :{BLACK}Preimenuj STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zapri okno STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Naziv okna - s tem lahko premaknete okno @@ -3690,10 +3688,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Dovoli s # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo vlaka. Ctrl+Klik odpre nov pogled na lokaciji vlaka -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo vozila. Ctrl+Klik odpre nov pogled na lokaciji vozila -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo ladje. Ctrl+Klik odpre nov pogled na lokaciji ladje -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo letala. Ctrl+Klik odpre nov pogled na lokaciji letala STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošlji vlak v železniško garažo. Ctrl+Klik samo na servis STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošlji vozilo v garažo. Ctrl+Klik samo na servis @@ -3725,10 +3719,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Prikaži STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Prikaži podrobnosti ladje STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Prikaži podrobnosti letala -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Dejanje trenutnega vlaka - klikni za izklop/zagon vlaka. Ctrl+Klik za premik na destinacijo -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Dejanja trenutnega vozila - klikni za ustavitev/zagon vozila. Ctrl+Klik za premik na destinacijo -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Dejanje trenutne ladje - klikni za ustavitev/zagon ladje. Ctrl+Klik za premik na destinacijo -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Dejanje trenutnega letala - klikni za ustavitev/zagon letala. Ctrl+Klik za premik na destinacijo + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Natovarjanje / Raztovarjanje diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 9464ec1533..c7e6c20dcc 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona orden de clasificación STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona criterio de filtrado STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Sitio -STR_BUTTON_RENAME :{BLACK}Renombrar STR_BUTTON_CATCHMENT :{BLACK}Cobertura STR_TOOLTIP_CATCHMENT :{BLACK}Mostrar u ocultar área de cobertura @@ -3757,10 +3755,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Hacer qu # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del tren. Ctrl+Clic sigue al tren en la vista principal -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del vehículo. Ctrl+Clic sigue al vehículo en la vista principal -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del barco. Ctrl+Clic sigue al barco en la vista principal -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición de la aeronave. Ctrl+Clic sigue a la aeronave en la vista principal STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento @@ -3792,10 +3786,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalles del barco STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalles de la aeronave -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del tren - Clic para detener/arrancar el tren. Ctrl+Clic para desplazarse hasta el destino -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo - Clic para detener/arrancar vehículo. Ctrl+Clic para desplazarse hasta el destino -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del barco - Clic para detener/arrancar barco. Ctrl+Clic para desplazarse hasta el destino -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual de la aeronave - Clic para detener/arrancar aeronave. Ctrl+Clic para desplazarse hasta el destino + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando / Descargando diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 648f1a7ac0..0f8963f35b 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -235,8 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Elegir o STR_TOOLTIP_SORT_CRITERIA :{BLACK}Elegir criterio de orden STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Elegir criterio de filtrado STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Ubicación -STR_BUTTON_RENAME :{BLACK}Cambiar nombre STR_BUTTON_CATCHMENT :{BLACK}Cobertura STR_TOOLTIP_CATCHMENT :{BLACK}Mostrar u ocultar área de cobertura @@ -1836,6 +1834,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}¿Está # Cheat window STR_CHEATS :{WHITE}Trucos STR_CHEATS_TOOLTIP :{BLACK}Las casillas marcadas indican que ya se usó este truco +STR_CHEATS_NOTE :{BLACK}Nota: todo uso de esta configuración se guardará en el archivo de juego STR_CHEAT_MONEY :{LTBLUE}Añadir {CURRENCY_LONG} en efectivo STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jugar como la empresa: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Excavadora mágica (elimina industrias y objetos inamovibles): {ORANGE}{STRING} @@ -3755,10 +3754,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Hacer qu # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la ubicación del tren. Ctrl+Clic sigue al tren en la vista principal -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del vehículo. Ctrl+Clic sigue al vehículo en la vista principal -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del barco. Ctrl+Clic sigue al barco en la vista principal -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación de la aeronave. Ctrl+Clic sigue a la aeronave en la vista principal STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento @@ -3790,10 +3785,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Ver deta STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Ver detalles del barco STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Ver detalles de la aeronave -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Actividad del tren. Clic para detener o poner en marcha. Ctrl+Clic para desplazarse hasta el destino -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Actividad del vehículo. Clic para detener o poner en marcha. Ctrl+Clic para desplazarse hasta el destino -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Actividad del barco. Clic para detener o poner en marcha. Ctrl+Clic para desplazarse hasta el destino -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Actividad de la aeronave. Clic para aterrizar o despegar. Ctrl+Clic para desplazarse hasta el destino + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando/Descargando diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 6aa165a8d0..ee03cc5546 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Välj so STR_TOOLTIP_SORT_CRITERIA :{BLACK}Välj sortering STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Angre kriterier för filtrering STR_BUTTON_SORT_BY :{BLACK}Sortera efter -STR_BUTTON_LOCATION :{BLACK}Plats -STR_BUTTON_RENAME :{BLACK}Byt namn STR_BUTTON_CATCHMENT :{BLACK}Upptagningsområde STR_TOOLTIP_CATCHMENT :{BLACK}Växla visning av upptagningsområde @@ -3718,10 +3716,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gör så # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför tåget. Ctrl+klick följer tåget i huvudvyn -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför fordonet. Ctrl+klick följer fordonet i huvudvyn -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför skeppet. Ctrl+klick följer skeppet i huvudvyn -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför flygplanet. Ctrl+klick följer flygplanet i huvudvyn STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Skicka tåg till depå. Ctrl+klick skickar tåget enbart på service STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Skicka fordon till depå. Ctrl+klick servar endast @@ -3753,10 +3747,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Visa vä STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Visa skeppdetaljer STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Visa flygplan detaljer -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aktuell tåghandling - klicka här för att stoppa/starta tåg. Ctrl+klick för att scrolla till destination. -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nuvarande fordonsaktivitet - Klicka här för att stoppa/starta fordon. Ctrl+Klick för att scrolla till destination. -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuvarande skeppshandling - Klicka här för att stoppa/starta skepp. Ctrl+Klick för att scrolla till destination -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nuvarande flygplanshandling - Klicka här för att stoppa/starta flygplan. Ctr+klick för att scrolla till destinationen + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastar / lastar av diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index bb3e7b2df0..2034b535aa 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location -STR_BUTTON_RENAME :{BLACK}Rename STR_TOOLTIP_CATCHMENT :{BLACK}தழுவு பகுதி காட்சியை நிலைமாற்று STR_TOOLTIP_CLOSE_WINDOW :{BLACK}சாளரத்தை மூடு @@ -3298,8 +3296,6 @@ STR_REPLACE_REMOVE_WAGON :{BLACK}பெ # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}வாகனத்தின் இருப்பிடத்தினை மையமாகக் கொள். Ctrl + Click முக்கிய பார்வையில் வாகனத்தைப் பின்தொடரும் -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}விமானத்தின் இருப்பிடத்தினை மையமாகக் கொள். Ctrl + Click முக்கிய பார்வையில் விமானத்தைப் பின்தொடரும் STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}இரயிலினை பணிமனைக்கு அனுப்பவும். Ctrl+Click அழுத்தினால் பழுதுபார்த்தல் மட்டுமே நடக்கும் STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}வாகனத்தினை பணிமனைக்கு அனுப்பவும். Ctrl+Click அழுத்தினால் பழுதுபார்த்தல் மட்டுமே நடக்கும் @@ -3331,10 +3327,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}சா STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}கப்பலின் விவரங்களைக் காட்டு STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}விமானத்தின் விவரங்களைக் காட்டு -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய இரயில்வே செயல் - இரயிலினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும் -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய வாகனங்கள் செயல் - வாகனத்தினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும் -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய கப்பல் செயல் - கப்பலினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும் -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய விமான செயல் - விமானத்தினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும் + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}சரக்கு ஏற்றம் / இறக்கம் diff --git a/src/lang/thai.txt b/src/lang/thai.txt index e483e12aa9..37f2f493d8 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}เล STR_TOOLTIP_SORT_CRITERIA :{BLACK}เลือกเกณฑ์การเรียงลำดับ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}เลือกเกณฑ์การกรอง STR_BUTTON_SORT_BY :{BLACK}เรียงตาม -STR_BUTTON_LOCATION :{BLACK}ที่ตั้ง -STR_BUTTON_RENAME :{BLACK}เปลี่ยนชื่อ STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ปิดหน้าต่าง STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}ชื่อของหน้าต่าง - คลิกค้างแล้วลากเพื่อเลื่อนหน้าต่าง @@ -3452,10 +3450,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}ทำ # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของขบวนรถ -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของพาหนะ -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของเรือ -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของอากาศยาน STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}ส่งขบวนรถไปยังโรงซ่อมบำรุง STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}ส่งยานพาหนะไปยังโรงซ่อมบำรุง @@ -3487,10 +3481,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}แส STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}{BLACK}แสดงรายละเอียดของเรือลำนี้ STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}{BLACK}แสดงรายละเอียดของอากาศยานลำนี้ -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของขบวนรถนี้ -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของรถคันนี้ -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของเรือลำนี้ -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของเครื่องบินลำนี้ + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}อยู่ระหว่างการขนถ่าย diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 2cde78a06a..3f2a205896 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}選擇 STR_TOOLTIP_SORT_CRITERIA :{BLACK}選擇排序項目 STR_TOOLTIP_FILTER_CRITERIA :{BLACK}選擇過濾條件 STR_BUTTON_SORT_BY :{BLACK}排序依照 -STR_BUTTON_LOCATION :{BLACK}位置 -STR_BUTTON_RENAME :{BLACK}重新命名 STR_TOOLTIP_CLOSE_WINDOW :{BLACK}關閉視窗 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}視窗標題 - 點此拖曳可移動視窗 @@ -3540,10 +3538,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}如果 # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}將列車置於畫面中央。按住 Ctrl 點選可於畫面中央追蹤該列車 -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}將車輛置於畫面中央。 按住 Ctrl 點選可於畫面中央追蹤該車輛 -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}將船舶置於畫面中央。按住 Ctrl 點選可於畫面中央追蹤該船舶 -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}將飛機置於畫面中央。按住 Ctrl 點選可於畫面中央追蹤該飛機 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}將列車送回機廠，按住 CTRL 點選機廠則僅做維護 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}將車輛送到車庫，按住 CTRL 點選則只做維護 @@ -3575,10 +3569,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}顯示 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}顯示船舶詳細資料 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}顯示飛機詳細資料 -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}列車目前的動作 - 按此可停止／起動列車。按住 Ctrl 點選可以捲動到目的地。 -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}目前車輛動作 - 點選這裡可停止／起動車輛。按住 Ctrl 點選可以捲動到目的地。 -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}目前船舶動作 - 按此可停止／起動船舶。按住 Ctrl 點選可以捲動到目的地。 -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}目前飛機動作 - 按此可停止／起動飛機。按住 Ctrl 點選可以捲動到目的地。 + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}正在裝卸貨物 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index a054f0823b..fa69875740 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -234,8 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Sıralam STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sıralama kriterini seçin STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Süzme kriterini seçin STR_BUTTON_SORT_BY :{BLACK}Sırala -STR_BUTTON_LOCATION :{BLACK}Göster -STR_BUTTON_RENAME :{BLACK}Yeni ad STR_BUTTON_CATCHMENT :{BLACK}Kapsama alanı STR_TOOLTIP_CATCHMENT :{BLACK}Kapsama alanını göstermeyi aç/kapa @@ -3719,10 +3717,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Otomatik # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Treni göster. Ctrl ile tıklama trenin konumunu gösteren yeni bir pencere açar -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Aracı göster. Ctrl ile tıklama aracın konumunu gösteren yeni bir pencere açar -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Gemiyi göster. Ctrl ile tıklama geminin konumunu gösteren yeni bir pencere açar -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Ana görüntüyü uçağın olduğu yere alır. Ctrl-tık ana görüntüde uçağı takip eder STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Treni garaja gönder STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Aracı garaja gönder @@ -3754,10 +3748,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Karayolu STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Gemi ayrıntılarını göster STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Uçak ayrıntılarını göster -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trenin mevcut hareketi - treni durdurmak/başlatmak için buraya tıklayın. Hedefe gitmek için CTRL+Tıkla -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Aracın mevcut hareketi - durdurmak/başlatmak için tıklayın. Hedefe gitmek için CTRL+Tıklama -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Geminin mevcut hareketi - durdurmak/başlatmak için buraya tıklayın. Hedefe gitmek için CTRL+Tıklama -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Uçağın durumu - uçağı durdurmak/başlatmak için tıklayın. Ctrl+Tıklama ile hedefe gidin + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Yükleme / Boşaltma diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 219edef8a2..d9180b2390 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -358,8 +358,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Обер STR_TOOLTIP_SORT_CRITERIA :{BLACK}Оберіть критерій сортування STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Оберіть критерій фільтру STR_BUTTON_SORT_BY :{BLACK}Сортувати -STR_BUTTON_LOCATION :{BLACK}Показати -STR_BUTTON_RENAME :{BLACK}Назва STR_BUTTON_CATCHMENT :{BLACK}Покриття STR_TOOLTIP_CATCHMENT :{BLACK}Вкл./викл. відображення області покриття @@ -3849,10 +3847,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Дозв # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Показати поїзд у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Показати автомобіль у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Показати корабель у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Показати літак у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Направити поїзд у депо STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Направити авто в депо @@ -3884,10 +3878,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пока STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показати корабель детально STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Показати літак детально -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія поїзда - натисніть для руху/зупинки поїзда. Утримуйте Ctrl, щоб показати пункт призначення -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія автомобіля - натисніть для руху/зупинки автомобіля. Утримуйте Ctrl, щоб показати пункт призначення -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія корабля - натисніть для руху/зупинки корабля. Утримуйте Ctrl, щоб показати пункт призначення -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія літака - натисніть для руху/зупинки літака. Утримуйте Ctrl, щоб показати пункт призначення + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Вантаження diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index e7c04c6acf..af6448e0eb 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -165,7 +165,6 @@ STR_UNITS_POWER_SI :{COMMA}кВт # Common window strings -STR_BUTTON_RENAME :{BLACK}Ята улӑштар STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Чӳречене хуп @@ -1190,6 +1189,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE + # Messages in the start stop button in the vehicle view diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 1773c94fa9..8dec86a345 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selektea STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selektear skiftnoarm STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selekear filternoarm STR_BUTTON_SORT_BY :{BLACK}Skifte op -STR_BUTTON_LOCATION :{BLACK}Lokaasje -STR_BUTTON_RENAME :{BLACK}op 'e nij neamme STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Slút finster STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Finstertitel - hjirmei kinst it finster ferslepe @@ -3216,10 +3214,6 @@ STR_REPLACE_MAGLEV_VEHICLES :Maglev treinen # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje fan disse trein. bij Ctrl+Click bliuwst it skip folgjen -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje van dizze wein. Brûk Ctrl+klik om dizze wein te folgjen -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje fan dit skip. bij Ctrl+Click bliuwst it skip folgjen -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje fan dit fleantúch STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer trein nei depot. Brûk Ctrl+Klik om allinich ûnderhâld te jaan STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer wein nei garaazje. Brûk Ctrl+Klik om allinich ûnderhâld te jaan @@ -3241,6 +3235,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Lit oard STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Fleantúch details sjen litte + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laden / Losse STR_VEHICLE_STATUS_LEAVING :{LTBLUE}fuortsette diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 9079e02fa1..2c0511af34 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -216,8 +216,6 @@ STR_UNITS_HEIGHT_SI :{COMMA} m # Common window strings STR_BUTTON_SORT_BY :{BLACK}Ordinas per -STR_BUTTON_LOCATION :{BLACK}Loko -STR_BUTTON_RENAME :{BLACK}Rinomizar STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Klozas fenestro STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Baskulas granda/mikra fenestro grandeso @@ -1044,6 +1042,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL :{LTBLUE}Servado ad {DEPOT}, {VELOCITY} diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 85a61f3b5d..774ac60b0c 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -222,8 +222,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Избе STR_TOOLTIP_SORT_CRITERIA :{BLACK}Изберете критериум за сортирање STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Изберете филтрирање критериуми STR_BUTTON_SORT_BY :{BLACK}Сортирање според -STR_BUTTON_LOCATION :{BLACK}Локација -STR_BUTTON_RENAME :{BLACK}Преименувај STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори го прозорецот STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Наслов на прозорец - влечи тука за да го поместиш прозорецот @@ -1515,7 +1513,6 @@ STR_REPLACE_VEHICLE_AIRCRAFT :Летало # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Центар главниот приказ на локација авионот. Ctrl + клик ќе го следат авион во главниот приказ STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис @@ -1528,7 +1525,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Прик STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Прикажи детали за авионот -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Сега авиони акција - кликни за да се запре / проектот авиони. Ctrl + Кликнете да дојдете до дестинацијата + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR :{ORANGE}Премногу далеку за да следната дестинација diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index 00865a5255..fcb0cebb34 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -175,8 +175,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Għazel STR_TOOLTIP_SORT_CRITERIA :{BLACK}Għazel il-kriterju biex tissortja STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Għazel il-kriterju biex tiffilterja STR_BUTTON_SORT_BY :{BLACK}Issortja b'dan -STR_BUTTON_LOCATION :{BLACK}Lokal -STR_BUTTON_RENAME :{BLACK}Semmi mil-ġdid STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Għalaq it-tieqa STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titlu tat-Tieqa - iddregja din biex tmexxi it-tieqa @@ -914,6 +912,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE + # Messages in the start stop button in the vehicle view diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 17ae83698d..34e71bbdb7 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -222,8 +222,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}वर STR_TOOLTIP_SORT_CRITERIA :{BLACK}वर्गीकरण निकष निवडा STR_TOOLTIP_FILTER_CRITERIA :{BLACK}फिल्टरिंग निकष निवडा STR_BUTTON_SORT_BY :{BLACK}यानुसार क्रमवारी लावा -STR_BUTTON_LOCATION :{BLACK}जागा -STR_BUTTON_RENAME :{BLACK}नाव बदला STR_TOOLTIP_CLOSE_WINDOW :{BLACK}खिडकी बंद करा STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}खिडकीचं नाव - खिडकी हलवण्यासाठी हे पकडून ओढा. @@ -1384,6 +1382,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE + # Messages in the start stop button in the vehicle view diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 5dda198e4d..ddce793777 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -223,8 +223,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}انتخ STR_TOOLTIP_SORT_CRITERIA :{BLACK}انتخاب معیار مرتب کردن STR_TOOLTIP_FILTER_CRITERIA :{BLACK}انتخاب معیار پایش STR_BUTTON_SORT_BY :{BLACK}مرتب کردن بر اساس -STR_BUTTON_LOCATION :{BLACK}مختصات -STR_BUTTON_RENAME :{BLACK}نام گزاری STR_BUTTON_CATCHMENT :{BLACK}تحت پوشش STR_TOOLTIP_CLOSE_WINDOW :{BLACK}بستن پنجره @@ -3057,9 +3055,6 @@ STR_REPLACE_ELRAIL_VEHICLES :وسایل نق # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}نمای اصلی جایگاه قطار. برای دنبال کردن قطار Ctrl+Click کنید -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}نمای اصلی از جایگاه کشتی. برای دنبال کردن کشتی Ctrl+Click کنید -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}نمای اصلی از جایگاه هواپیما. برای دنبال کردن هواپیما Ctrl+click کنید STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}این قطار را به ایستگاه راه آهن بفرست. Ctrl+Click فقط قطار را سرویس میکند STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}فرستادن کشتی به لنگرگاه. ctrl+click فقط سرویس میکند @@ -3081,9 +3076,7 @@ STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}نمای STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}نمایش ویژگی های کشتی STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}نمایش ویژگی های هوا پیما -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}فعالیت فعلی قطار - برای توقف/شروع حرکت قطار کلیک کن.Ctrl+Click برای رفتن به مقضد -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}عمل فعلی کشتی - برای شروع/توقف کشتی اینجا کلیک کنید.Ctrl+Click برای رفتن به مقضد -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}عمل فعلی هواپیما - برای توقف/شروع کار هواپیما کلیک کنید.Ctrl+Click برای رفتن به مقصد + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}پر / خالی کردن diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 668b38c217..955e27eddd 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -223,8 +223,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK} (ترت STR_TOOLTIP_SORT_CRITERIA :{BLACK}ترتیب کا طریقہ منتخب کریں STR_TOOLTIP_FILTER_CRITERIA :{BLACK} چھاننے کے اصول چنیئے STR_BUTTON_SORT_BY :{BLACK}سے ترتیب دو -STR_BUTTON_LOCATION :{BLACK}جگہ -STR_BUTTON_RENAME :{BLACK} تبادلھء نام STR_TOOLTIP_CLOSE_WINDOW :{BLACK}کھڑکی بند کرو STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}کھڑکی کا نام - کھڑکی کو ہلانے کیلیے اسے پکڑ کر ہلاو @@ -2406,6 +2404,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR :{ORANGE}اگلی منزل بہت دور ہے diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 93158dec8d..d402d93d0d 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -233,8 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Chọn t STR_TOOLTIP_SORT_CRITERIA :{BLACK}Chọn tiêu chí sắp xếp STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Chọn tiêu chí lọc bỏ STR_BUTTON_SORT_BY :{BLACK}Sắp xếp bởi -STR_BUTTON_LOCATION :{BLACK}Vị trí -STR_BUTTON_RENAME :{BLACK}Đổi tên STR_BUTTON_CATCHMENT :{BLACK}Vùng che phủ STR_TOOLTIP_CATCHMENT :{BLACK}Đổi ẩn/hiện vùng che phủ @@ -3720,10 +3718,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Tự đ # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Xem vị trí đoàn tàu. Ctrl+Click mở cửa sổ mới để theo dõi -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Xem vị trí ôtô. Ctrl+Click mở cửa sổ mới để theo dõi -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Xem vị trí tàu thuỷ. Ctrl+Click mở cửa sổ mới để theo dõi -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Xem vị trí máy bay. Ctrl+Click mở cửa sổ mới để theo dõi STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Đưa tàu về xưởng. Ctrl+Click sẽ gửi về bảo trì thôi STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Đưa ôtô về xưởng. Ctrl+Click sẽ gửi về bảo trì thôi @@ -3755,10 +3749,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Hiện c STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Hiện chi tiết tàu thuỷ STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Hiện chi tiết máy bay -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với đoàn tàu - bấm để dừng/chạy tàu. Ctrl+Click để chuyển điểm đến -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với ôtô - bấm để dừng/chạy ôtô. Ctrl+Click để chuyển điểm đến -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với tàu thuỷ - bấm để dừng/chạy tàu. Ctrl+Click để chuyển điểm đến -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với máy bay - bấm để dừng/chạy máy bay. Ctrl+Click để chuyển điểm đến + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Bốc/dỡ hàng diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 9af53f9432..8750e590c3 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -231,8 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Dewiswch STR_TOOLTIP_SORT_CRITERIA :{BLACK}Dewiswch drefn trefnu STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Dewis criteria hidlydd STR_BUTTON_SORT_BY :{BLACK}Trefnu yn ôl -STR_BUTTON_LOCATION :{BLACK}Lleoliad -STR_BUTTON_RENAME :{BLACK}Ailenwi STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Cau ffenestr STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Teitl ffenestr - llusgwch hwn i symud ffenestr @@ -3566,10 +3564,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gwneud i # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} -STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad y trên. Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf -STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad y cerbyd, Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf -STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Canol'r prif olygfa ar leoliad yr long. Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf -STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad yr awyren. Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Anfon trên i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Anfon cerbyd i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig @@ -3601,10 +3595,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos m STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos manylion llong STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos manylion awyren -STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y trên - cliciwch yma stopio/cychwyn y trên. Ctrl+Clic i sgrolio i'r gyrchfan -STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y cerbyd - cliciwch yma stopio/cychwyn y cerbyd. Ctrl+Clic i sgrolio i'r gyrchfan -STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y llong - cliciwch yma stopio/cychwyn y llong. Ctrl+Clic i sgrolio i'r gyrchfan -STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred yr awyren - cliciwch yma stopio/cychwyn yr awyren. Ctrl+Clic i sgrolio i'r gyrchfan + # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Llwytho / Dadlwytho From 57c45a2c010639ff06eab60346642b11cb4b7bfa Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 12 Jan 2021 18:38:08 +0000 Subject: [PATCH 07/47] Update: Translations from eints spanish (mexican): 64 changes by absay indonesian: 7 changes by dimaspaf14 finnish: 94 changes by hpiirai slovak: 25 changes by gpalino french: 11 changes by glx22 polish: 11 changes by yazalo --- src/lang/finnish.txt | 177 +++++++++++++++++++++------------------- src/lang/french.txt | 11 +++ src/lang/indonesian.txt | 7 ++ src/lang/polish.txt | 11 +++ src/lang/slovak.txt | 47 ++++++----- src/lang/spanish_MX.txt | 111 ++++++++++++++----------- 6 files changed, 213 insertions(+), 151 deletions(-) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index c48180137a..c5bcba20e1 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -241,8 +241,8 @@ STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulje ik STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Ikkunan otsake – siirrä ikkunaa vetämällä tästä STR_TOOLTIP_SHADE :{BLACK}Pienennä ikkuna – näytä vain otsikko STR_TOOLTIP_DEBUG :{BLACK}Näytä NewGRF-vianmääritystiedot -STR_TOOLTIP_DEFSIZE :{BLACK}Palauta ikkunan oletuskoko. Ctrl+Klik tallentaa nykyisen koon oletukseksi -STR_TOOLTIP_STICKY :{BLACK}Aseta ikkuna säilymään "Sulje kaikki ikkunat" -napista huolimatta. Ctrl+Klik tallentaa tilan oletukseksi +STR_TOOLTIP_DEFSIZE :{BLACK}Palauta ikkunan oletuskoko. Ctrl+napsautus tallentaa nykyisen koon oletukseksi. +STR_TOOLTIP_STICKY :{BLACK}Aseta ikkuna säilymään ”Sulje kaikki ikkunat” -napista huolimatta. Ctrl+napsautus tallentaa tilan oletukseksi. STR_TOOLTIP_RESIZE :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Suurenna/pienennä ikkuna STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Vierityspalkki – luettelon vieritys ylös/alas @@ -339,10 +339,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST :{BLACK}Näytä STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Näytä kuvaajat STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Näytä yhtiökilpataulukko STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Rahoita uuden teollisuuden rakentamista ja näytä teollisuushakemisto -STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Näytä luettelo yhtiön junista. Ctrl+Klik avaa ryhmä/kulkuneuvolistan -STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Näytä luettelo yhtiön ajoneuvoista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan -STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Näytä luettelo yhtiön laivoista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan -STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Näytä luettelo yhtiön ilma-aluksista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan +STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Näytä luettelo yhtiön junista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa. +STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Näytä luettelo yhtiön ajoneuvoista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa. +STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Näytä luettelo yhtiön laivoista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa. +STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Näytä luettelo yhtiön ilma-aluksista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa. STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}Lähennä näkymää STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}Loitonna näkymää STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Rakenna rautateitä @@ -724,9 +724,9 @@ STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP :{BLACK}Näytä STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON :{BLACK}Näytä kuljetusreitit kartalla STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP :{BLACK}Näytä kasvillisuus kartalla STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP :{BLACK}Näytä maanomistajat kartalla -STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION :{BLACK}Napsauta teollisuustyyppiä näyttääksesi sen. Ctrl+Klik näyttää valitun tyypin. Ctrl+Klik uudestaan näyttää kaikki teollisuustyypit -STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION :{BLACK}Napsauta yhtiötä näyttääksesi sen omaisuuden. Ctrl+Klik näyttää ainoastaan valitun yhtiön. Ctrl+Klik uudestaan näyttää kaikki yhtiöt -STR_SMALLMAP_TOOLTIP_CARGO_SELECTION :{BLACK}Napsauta rahtia näyttääksesi tai piilottaaksesi sen. Ctrl+Klik piilottaa kaikki paitsi valitun rahdin. Ctrl+Klik uudelleen palauttaa kaikki rahdit näkyviin +STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION :{BLACK}Napsauta teollisuustyyppiä piilottaaksesi tai näyttääksesi sen. Ctrl+napsautus näyttää vain valitun tyypin. Ctrl+napsautus uudestaan näyttää kaikki teollisuustyypit. +STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION :{BLACK}Napsauta yhtiötä piilottaaksesi tai näyttääksesi yhtiön maaomistuksen. Ctrl+napsautus näyttää ainoastaan valitun yhtiön. Ctrl+napsautus uudestaan näyttää kaikki yhtiöt. +STR_SMALLMAP_TOOLTIP_CARGO_SELECTION :{BLACK}Napsauta rahtityyppiä näyttääksesi tai piilottaaksesi sen. Ctrl+napsautus piilottaa kaikki paitsi valitun rahdin. Ctrl+napsautus uudelleen palauttaa kaikki rahdit näkyviin. STR_SMALLMAP_LEGENDA_ROADS :{TINY_FONT}{BLACK}Tiet STR_SMALLMAP_LEGENDA_RAILROADS :{TINY_FONT}{BLACK}Rautatiet @@ -1378,7 +1378,7 @@ STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Siirrä karttaa STR_CONFIG_SETTING_SCROLLMODE_RMB :Siirrä karttaa hiiren oikealla painikkeella STR_CONFIG_SETTING_SCROLLMODE_LMB :Siirrä karttaa hiiren vasemmalla painikkeella STR_CONFIG_SETTING_SMOOTH_SCROLLING :Näkymän tasainen vieritys: {STRING} -STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Hallitse miten päänäkymä siirtyy valittuun paikkaan karttaa klikattaessa tai käytettäessä komentoa joka muuttaa näkymän sijaintia. Mikäli käytössä, päänäkymä siirtyy uuteen sijaintiin pehmeäesti, muutoin se hyppää suoraan valittuun sijaintiin +STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Hallitse, kuinka päänäkymä siirtyy valittuun paikkaan napsautettaessa karttaa tai käytettäessä näkymän sijaintia muuttavaa komentoa. Mikäli käytössä, päänäkymä siirtyy uuteen sijaintiin pehmeästi, muutoin se hyppää suoraan valittuun sijaintiin. STR_CONFIG_SETTING_MEASURE_TOOLTIP :Näytä mittauksen työkaluvihje, kun käytetään rakennustyökaluja: {STRING} STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT :Näytä etäisyydet ja korkeuserot vedettäessä rakennustoimintojen aikana STR_CONFIG_SETTING_LIVERIES :Näytä kulkuneuvotyypille ominaiset tunnukset: {STRING} @@ -1404,8 +1404,8 @@ STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK :Yksi napsautus STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU :Oikean painikkeen emulointi: {STRING} STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT :Valitse, miten hiiren oikean painikkeen painalluksia emuloidaan -STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Command -STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+Klik +STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Komento+napsautus +STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+napsautus STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Pois STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Sulje ikkuna hiiren oikealla painikkeella napsauttamalla: {STRING} @@ -1798,7 +1798,7 @@ STR_INTRO_ONLINE_CONTENT :{BLACK}Tarkista STR_INTRO_SCRIPT_SETTINGS :{BLACK}Tekoälyn/peliskriptin asetukset STR_INTRO_QUIT :{BLACK}Sulje -STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}Aloita uusi peli. Ctrl+Klik ohittaa kartan asetukset +STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}Aloita uusi peli. Ctrl+napsautus ohittaa kartan asetusten valinnan. STR_INTRO_TOOLTIP_LOAD_GAME :{BLACK}Lataa tallennettu peli STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP :{BLACK}Aloita uusi peli, käyttäen korkeuskarttaa maastona STR_INTRO_TOOLTIP_PLAY_SCENARIO :{BLACK}Aloita uusi peli käyttäen omaa skenaariota @@ -1859,8 +1859,8 @@ STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Näytä STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Näytä tieajoneuvojen väriteemat STR_LIVERY_SHIP_TOOLTIP :{BLACK}Näytä laivojen väriteemat STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Näytä ilma-alusten väriteemat -STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Valitse valitulle teemalle ensisijainen väri. Ctrl+Klik asettaa tämän värin jokaiselle teemalle -STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Valitse valitulle teemalle toissijainen väri. Ctrl+Klik asettaa tämän värin jokaiselle teemalle +STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Valitse valitun kaavan ensisijainen väri. Ctrl+napsautus asettaa tämän värin kaikille kaavoille. +STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Valitse valitun kaavan toissijainen väri. Ctrl+napsautus asettaa tämän värin kaikille kaavoille. STR_LIVERY_PANEL_TOOLTIP :{BLACK}Valitse muutettava väriteema, tai valitse useita Ctrl pohjassa. Paina valintalaatikkoa valitaksesi teeman STR_LIVERY_DEFAULT :Normaalit tunnusvärit @@ -2312,15 +2312,15 @@ STR_MISSING_GRAPHICS_NO_QUIT :{BLACK}Ei, sulj # Transparency settings window STR_TRANSPARENCY_CAPTION :{WHITE}Läpinäkyvyysasetukset -STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Muuta kylttien läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Muuta sähköradan johtimien läpinäkyvyyttä. Ctrl+Klik lukitaksesi -STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Klik lukitaksesi +STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Muuta kylttien läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Muuta tuotantolaitosten läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Muuta majakoiden ja lähetysmastojen tapaisten rakennelmien läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Muuta sähköratarakenteiden läpinäkyvyyttä. Ctrl+napsautus lukitsee. +STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+napsautus lukitsee. STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Tee kohteista läpinäkyvyyden sijaan näkymättömiä # Linkgraph legend window @@ -2415,7 +2415,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Poistumi STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Yhdistelmäopastin (valo-opastin){}Yhdistelmäopastin toimii yhtä aikaa tulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita" STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Reittiopastin (valo-opastin){}Reittiopastin varmistaa junille turvallisen reitin ja siten mahdollistaa useampien junien yhtäaikaisen liikenteen moniraiteisissa risteyksissä. Tavalliset reittiopastimet voi ohittaa takakautta STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Yksisuuntainen reittiopastin (valo-opastin){}Reittiopastin varmistaa junille turvallisen reitin ja siten mahdollistaa useampien junien yhtäaikaisen liikenteen moniraiteisissa risteyksissä. Yksisuuntaisia opastimia ei voi ohittaa takakautta -STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen napsauttaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Klik vaihtaa nykyistä opastimen muotoa. Shift+Klik näyttää muuntamisen kustannusarvion +STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen napsauttaminen muuntaa sen valituntyyppiseksi ja -muotoiseksi. Ctrl+napsautus vaihtaa nykyistä opastimen muotoa. Vaihto+napsautus näyttää muuntamisen kustannusarvion. STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Opastimien väli vetämällä lisättäessä STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Pienennä opastimien väliä vetämällä lisättäessä STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Suurenna opastimien väliä vetämällä lisättäessä @@ -2572,7 +2572,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT :{WHITE}Haluatko # Town generation window (SE) STR_FOUND_TOWN_CAPTION :{WHITE}Luo kuntia STR_FOUND_TOWN_NEW_TOWN_BUTTON :{BLACK}Uusi kunta -STR_FOUND_TOWN_NEW_TOWN_TOOLTIP :{BLACK}Perusta uusi kunta. Shift+Klik näyttää vain kustannusarvion +STR_FOUND_TOWN_NEW_TOWN_TOOLTIP :{BLACK}Perusta uusi kunta. Vaihto+napsautus näyttää vain kustannusarvion. STR_FOUND_TOWN_RANDOM_TOWN_BUTTON :{BLACK}Satunnainen kunta STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP :{BLACK}Perusta kunta satunnaiseen paikkaan STR_FOUND_TOWN_MANY_RANDOM_TOWNS :{BLACK}Monta satunnaista kuntaa @@ -2630,6 +2630,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Valitse # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Maa-aluetiedot +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä ruudun sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan ruudun sijaintiin. STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Raivaamisen hinta: {LTBLUE}- STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Raivaamisen hinta: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Tulo kun tyhjennetty: {LTBLUE}{CURRENCY_LONG} @@ -3007,7 +3008,7 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP :{BLACK}Mene val STR_SPRITE_ALIGNER_PREVIOUS_BUTTON :{BLACK}Edelinen sprite STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP :{BLACK}Jatka edelliseen tavalliseen spriteen ja hyppää yli kaikki pseudo-/uudelleenväritetyt/fontti- spritet ja mene loppuun kun päästään ensimmäiseen STR_SPRITE_ALIGNER_SPRITE_TOOLTIP :{BLACK}Valitun spriten näyttö. Sijaintia ei huomioida spriteä piirrettäessä -STR_SPRITE_ALIGNER_MOVE_TOOLTIP :{BLACK}Liikuta spriteä ympäriinsä, muuttaen X- ja Y-sijainteja. Ctrl+Klik siirtää spriteä kahdeksan yksikköä kerralla +STR_SPRITE_ALIGNER_MOVE_TOOLTIP :{BLACK}Liikuta spriteä ympäriinsä, muuttaen X- ja Y-sijainteja. Ctrl+napsautus siirtää spriteä kahdeksan yksikköä kerralla. STR_SPRITE_ALIGNER_RESET_BUTTON :{BLACK}Nollaa suhteelliset STR_SPRITE_ALIGNER_RESET_TOOLTIP :{BLACK}Nollaa suhteelliset erotukset STR_SPRITE_ALIGNER_OFFSETS_ABS :{BLACK}X-erotus: {NUM}, Y-erotus: {NUM} (absoluuttinen) @@ -3100,6 +3101,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Kytke ki # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Muokkaa kyltin tekstiä. +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä kyltin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan kyltin sijaintiin. STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Siirry seuraavaan kylttiin STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Siirry edelliseen kylttiin @@ -3110,7 +3112,7 @@ STR_TOWN_DIRECTORY_CAPTION :{WHITE}Kunnat STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ei mitään - STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA}) STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (kaupunki){BLACK} ({COMMA}) -STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Kuntien nimet – keskitä päänäkymä kuntaan napsauttamalla nimeä. Ctrl+Klik avaa uuden näkymäikkunan kunnan sijaintiin +STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Kuntien nimet – keskitä päänäkymä kuntaan napsauttamalla nimeä. Ctrl+napsautus avaa uuden näkymäikkunan kunnan sijaintiin. STR_TOWN_POPULATION :{BLACK}Maailman asukasluku: {COMMA} # Town view window @@ -3128,7 +3130,7 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}Kunta ka STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Kunta kasvaa {ORANGE}{COMMA}{BLACK}{NBSP}päivän{P "" ""} välein (rahoitettu) STR_TOWN_VIEW_TOWN_GROW_STOPPED :{BLACK}Kunta {RED}ei{BLACK} kasva STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Meluraja kunnassa: {ORANGE}{COMMA}{BLACK} maks.: {ORANGE}{COMMA} -STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä näkymä kunnan sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan kunnan sijaintiin +STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä kunnan sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan kunnan sijaintiin. STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON :{BLACK}Viranomaiset STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP :{BLACK}Näytä tietoja paikallisviranomaisista STR_TOWN_VIEW_RENAME_TOOLTIP :{BLACK}Vaihda kunnan nimeä. @@ -3180,7 +3182,7 @@ STR_GOALS_SPECTATOR_NONE :{ORANGE}- Ei sa STR_GOALS_PROGRESS :{ORANGE}{STRING} STR_GOALS_PROGRESS_COMPLETE :{GREEN}{STRING} STR_GOALS_COMPANY_TITLE :{BLACK}Yhtiön tavoitteet: -STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Keskitä päänäkymä laitokseen/kuntaan/ruutuun napsauttamalla tavoitetta. Ctrl+Klik avaa uuden näkymän laitoksen/kunnan/ruudun sijaintiin +STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Keskitä päänäkymä laitokseen/kuntaan/ruutuun napsauttamalla tavoitetta. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen/kunnan/ruudun sijaintiin. # Goal question window STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Kysymys @@ -3216,7 +3218,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO :{ORANGE}{STRING STR_SUBSIDIES_NONE :{ORANGE}- Ei mitään - STR_SUBSIDIES_SUBSIDISED_TITLE :{BLACK}Käytetyt tuet: STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING} välille {STRING}-{STRING}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} asti) -STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Napsauta palvelua keskittääksesi päänäkymän teollisuuteen/kuntaan. Ctrl+Klik avaa uuden näkymäikkunan teollisuuden/kunnan sijaintiin +STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Napsauta kuljetusyhteyttä keskittääksesi päänäkymän laitokseen/kuntaan. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen/kunnan sijaintiin. # Story book window STR_STORY_BOOK_CAPTION :{WHITE}{COMPANY}: historia @@ -3232,7 +3234,7 @@ STR_STORY_BOOK_NEXT_PAGE_TOOLTIP :{BLACK}Siirry s STR_STORY_BOOK_INVALID_GOAL_REF :{RED}Virheellinen viittaus tavoitteeseen # Station list window -STR_STATION_LIST_TOOLTIP :{BLACK}Asemien nimet – napsauta nimeä keskittääksesi päänäkymän asemaan. Ctrl+Klik avaa uuden näkymäikkunan aseman sijaintiin +STR_STATION_LIST_TOOLTIP :{BLACK}Asemien nimet – napsauta nimeä keskittääksesi päänäkymän asemaan. Ctrl+napsautus avaa uuden näkymäikkunan aseman sijaintiin. STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE :{BLACK}Pidä Ctrl-näppäin painettuna valitaksesi useamman kuin yhden vaihtoehdon STR_STATION_LIST_CAPTION :{WHITE}{COMPANY} – {COMMA} asema{P "" a} STR_STATION_LIST_STATION :{YELLOW}{STATION} {STATION_FEATURES} @@ -3294,7 +3296,7 @@ STR_CARGO_RATING_EXCELLENT :Mainio STR_CARGO_RATING_OUTSTANDING :Loistava ############ range for rating ends -STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä näkymä aseman sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan aseman sijaintiin +STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä aseman sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan aseman sijaintiin. STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Muuta aseman nimi STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Näytä kaikki junat, joilla on tämä asema käskyissään @@ -3309,9 +3311,9 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}Estä il # Waypoint/buoy view window STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT} -STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä ruutu reittipisteen sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan reittipisteen sijaintiin +STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä reittipisteen sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan reittipisteen sijaintiin. STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Muuta reittipisteen nimeä -STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä ruutu poijun sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan poijun sijaintiin +STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä poijun sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan poijun sijaintiin. STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Vaihda poijun nimeä STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa reittipisteen nimeä @@ -3341,9 +3343,9 @@ STR_FINANCES_LOAN_TITLE :{WHITE}Laina STR_FINANCES_MAX_LOAN :{WHITE}Laina enintään: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Nosta lainaa {CURRENCY_LONG} -STR_FINANCES_BORROW_TOOLTIP :{BLACK}Ota lisää lainaa. Ctrl+Klik nostaa lainaa niin paljon kuin mahdollista +STR_FINANCES_BORROW_TOOLTIP :{BLACK}Ota lisää lainaa. Ctrl+napsautus nostaa lainaa niin paljon kuin mahdollista. STR_FINANCES_REPAY_BUTTON :{BLACK}Lyhennä lainaa {CURRENCY_LONG} -STR_FINANCES_REPAY_TOOLTIP :{BLACK}Lyhennä lainaa. Ctrl+Klik lyhentää lainaa niin paljon kuin mahdollista +STR_FINANCES_REPAY_TOOLTIP :{BLACK}Lyhennä lainaa. Ctrl+napsautus lyhentää lainaa niin paljon kuin mahdollista. STR_FINANCES_INFRASTRUCTURE_BUTTON :{BLACK}Infrastruktuuri # Company view @@ -3373,7 +3375,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Rakenna STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Näytä päämaja STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}Näytä yhtiön päämaja STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Siirrä päämaja -STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rakenna yhtiön päärakennus muualle, kustannus 1{NBSP}% yhtiön arvosta. Shift+Klik näyttää kustannusarvion sijoittamatta päärakennusta uudelleen +STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rakenna yhtiön pääkonttori muualle, kustannus 1{NBSP}% yhtiön arvosta. Vaihto+napsautus näyttää kustannusarvion sijoittamatta pääkonttoria uudelleen. STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Yksityiskohdat STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Näytä tarkka infrastruktuurin määrä STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Anna rahaa @@ -3390,8 +3392,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP :{BLACK}Muuta p STR_COMPANY_VIEW_BUY_SHARE_BUTTON :{BLACK}Osta 25{NBSP}%:n osuus yhtiöstä STR_COMPANY_VIEW_SELL_SHARE_BUTTON :{BLACK}Myy 25{NBSP}%:n osuus yhtiöstä -STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää kustannusarvion ostamatta osuuksia -STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Myy 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää tuottoarvion myymättä osuuksia +STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä. Vaihto+napsautus näyttää kustannusarvion ostamatta osuuksia. +STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Myy 25{NBSP}%:n osuus tästä yhtiöstä. Vaihto+napsautus näyttää tuottoarvion myymättä osuuksia. STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Yhtiön nimi STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Pääjohtajan nimi @@ -3421,7 +3423,7 @@ STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUST STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} ja {NUM} muuta -STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Teollisuusmuotojen nimet - kohdista päänäkymä teollisuuslaitokseen napsauttamalla nimeä. Ctrl+Klik avaa uuden näkymäikkunan teollisuuslaitoksen sijaintiin +STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Teollisuusmuotojen nimet – kohdista päänäkymä tuotantolaitokseen napsauttamalla nimeä. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen sijaintiin. STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER :{BLACK}Vastaanotettava rahti: {SILVER}{STRING} STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER :{BLACK}Tuotettu rahti: {SILVER}{STRING} STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES :Kaikki rahtityypit @@ -3431,7 +3433,7 @@ STR_INDUSTRY_DIRECTORY_FILTER_NONE :Ei mitään STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY} STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Tuotto viime kuussa: STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}{NBSP}% kuljetettu) -STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä teollisuuden sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan teollisuuden sijaintiin +STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä tuotantolaitoksen sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen sijaintiin. STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Tuotantotaso: {YELLOW}{COMMA}{NBSP}% STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Teollisuuslaitos ilmoittaa pikaisesta sulkeutumisestaan! @@ -3555,10 +3557,10 @@ STR_PURCHASE_INFO_MAX_TE :{BLACK}Suurin v STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Toimintasäde: {GOLD}{COMMA} ruutua STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Ilma-alustyyppi: {GOLD}{STRING} -STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Junien valintaluettelo. Lisää tietoja junaa napsauttamalla. Ctrl+Klik näyttää tai piilottaa kulkuneuvon tyypin -STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Ajoneuvojen valintaluettelo. Napsauta ajoneuvoa saadaksesi lisää tietoja. Ctrl+Klik näyttää tai piilottaa ajoneuvon tyypin -STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Laivojen valintaluettelo. Napsauta laivaa saadaksesi lisää tietoja. Ctrl+Klik näyttää tai piilottaa laivan tyypin -STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Ilma-alusten valintaluettelo. Napsauta ilma-alusta saadaksesi lisää tietoja. Ctrl+Klik näyttää tai piilottaa ilma-aluksen tyypin +STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Raideliikennevälineiden valintaluettelo. Napsauta kulkuneuvoa saadaksesi lisää tietoa. Ctrl+napsautus näyttää tai piilottaa kulkuneuvon tyypin. +STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Ajoneuvojen valintaluettelo. Napsauta ajoneuvoa saadaksesi lisää tietoja. Ctrl+napsautus näyttää tai piilottaa ajoneuvon tyypin. +STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Laivojen valintaluettelo. Napsauta laivaa saadaksesi lisää tietoja. Ctrl+napsautus näyttää tai piilottaa laivan tyypin. +STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Ilma-alusten valintaluettelo. Napsauta ilma-alusta saadaksesi lisää tietoja. Ctrl+napsautus näyttää tai piilottaa ilma-aluksen tyypin. STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Osta yksikkö STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Osta ajoneuvo @@ -3570,15 +3572,15 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Osta ja STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Osta ja sovita laiva STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Osta ja sovita ilma-alus -STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu yksikkö. Shift+Klik näyttää kustannusarvion ostamatta -STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu ajoneuvo. Shift+Klik näyttää kustannusarvion ostamatta -STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu laiva. Shift+Klik näyttää kustannusarvion ostamatta -STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Osta korostettu ilma-alus. Shift+Klik näyttää kustannusarvion ostamatta +STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu raideliikenneväline. Vaihto+napsautus näyttää kustannusarvion ostamatta. +STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu ajoneuvo. Vaihto+napsautus näyttää kustannusarvion ostamatta. +STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu laiva. Vaihto+napsautus näyttää kustannusarvion ostamatta. +STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu ilma-alus. Vaihto+napsautus näyttää kustannusarvion ostamatta. -STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu yksikkö. Shift+Klik näyttää kustannusarvion ostamatta -STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ajoneuvo. Shift+Klik näyttää kustannusarvion ostamatta -STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu laiva. Shift+Klik näyttää kustannusarvion ostamatta -STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ilma-alus. Shift+Klik näyttää kustannusarvion ostamatta +STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu raideliikenneväline. Vaihto+napsautus näyttää kustannusarvion ostamatta. +STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ajoneuvo. Vaihto+napsautus näyttää kustannusarvion ostamatta. +STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu laiva. Vaihto+napsautus näyttää kustannusarvion ostamatta. +STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ilma-alus. Vaihto+napsautus näyttää kustannusarvion ostamatta. STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Nimeä STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Nimeä @@ -3658,15 +3660,15 @@ STR_DEPOT_CLONE_ROAD_VEHICLE :{BLACK}Kloonaa STR_DEPOT_CLONE_SHIP :{BLACK}Kloonaa laiva STR_DEPOT_CLONE_AIRCRAFT :{BLACK}Kloonaa ilma-alus -STR_DEPOT_CLONE_TRAIN_DEPOT_INFO :{BLACK}Tämä ostaa kopion junasta ja kaikista sen vaunuista. Napsauta tätä painiketta ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota -STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Napsauta tätä painiketta ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota -STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Tämä ostaa kopion laivasta. Napsauta tätä painiketta ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota -STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tämä ostaa kopion lentokoneesta. Napsauta tätä painiketta ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota +STR_DEPOT_CLONE_TRAIN_DEPOT_INFO :{BLACK}Tämä ostaa kopion junasta kaikkine vaunuineen. Napsauta tätä painiketta ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. +STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Napsauta tätä painiketta ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. +STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Tämä ostaa kopion laivasta. Napsauta tätä painiketta ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. +STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tämä ostaa kopion lentokoneesta. Napsauta tätä painiketta ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. -STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä veturitallin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan veturitallin sijaintiin -STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä varikon sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan varikon sijaintiin -STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä telakan sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan telekan sijaintiin -STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä lentokonehallin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan lentokonehallin sijaintiin +STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä veturitallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan veturitallin sijaintiin. +STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvovarikon sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan varikon sijaintiin. +STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä telakan sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan telakan sijaintiin. +STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä lentokonehallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan lentokonehallin sijaintiin. STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Näytä tällä asemalla olevien junien käskyt STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Näytä tässä terminaalissa olevien ajoneuvojen käskyt @@ -3756,16 +3758,20 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automaat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä junan sijaintiin. Kaksoisnapsauta seurataksesi junaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan junan sijaintiin. +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvon sijaintiin. Kaksoisnapsauta seurataksesi ajoneuvoa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ajoneuvon sijaintiin. +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä laivan sijaintiin. Kaksoisnapsauta seurataksesi laivaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan laivan sijaintiin. +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ilma-aluksen sijaintiin. Kaksoisnapsauta seurataksesi ilma-alusta päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ilma-aluksen sijaintiin. -STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä juna veturitalliin. Ctrl+Klik suorittaa vain huollon -STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ajoneuvo varikolle. Ctrl+Klik suorittaa vain huollon -STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä laiva telakalle. Ctrl+Klik suorittaa vain huollon -STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ilma-alus lentokonehalliin. Ctrl+Klik suorittaa vain huollon +STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä juna veturitalliin. Ctrl+napsautus suorittaa vain huollon. +STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ajoneuvo varikolle. Ctrl+napsautus suorittaa vain huollon. +STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä laiva telakalle. Ctrl+napsautus suorittaa vain huollon. +STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ilma-alus lentokonehalliin. Ctrl+napsautus suorittaa vain huollon. -STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Tämä ostaa kopion junasta vaunuineen. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota -STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota -STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Tämä ostaa kopion laivasta. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota -STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Tämä ostaa kopion lentokoneesta. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota +STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Tämä ostaa kopion junasta kaikkine vaunuineen. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. +STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. +STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Tämä ostaa kopion laivasta. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. +STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Tämä ostaa kopion lentokoneesta. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota. STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Anna junalle lupa ohittaa punainen opastin @@ -3777,17 +3783,22 @@ STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Sovita i STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP :{BLACK}Käännä junan suunta STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Pakota ajoneuvo kääntymään ympäri -STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Näytä junan käskyt. Ctrl+Klik näyttää junan aikataulun -STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Näytä ajoneuvon käskyt. Ctrl+Klik näyttää ajoneuvon aikataulun +STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Näytä junan käskyt. Ctrl+napsautus näyttää junan aikataulun. +STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Näytä ajoneuvon käskyt. Ctrl+napsautus näyttää ajoneuvon aikataulun. STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Näytä laivan käskyt. Ctrl+Click näyttää laivan aikataulun -STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Näytä ilma-aluksen käskyt. Ctrl+Klik näyttää ilma-aluksen aikataulun +STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Näytä ilma-aluksen käskyt. Ctrl+napsautus näyttää ilma-aluksen aikataulun. STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä junan tiedot STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä ajoneuvon tiedot STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä laivan tiedot STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä ilma-aluksen tiedot +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Nykyisen junan toiminnot – napsauta pysäyttääksesi/käynnistääksesi +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Nykyisen ajoneuvon toiminnot – napsauta pysäyttääksesi/käynnistääksesi +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Nykyisen laivan toiminnot – napsauta pysäyttääksesi/käynnistääksesi +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Nykyisen ilma-aluksen toiminnot – napsauta pysäyttääksesi/käynnistääksesi +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä käskyn kohteeseen. Ctrl+napsautus avaa uuden näkymäikkunan käskyn kohteen sijaintiin. # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastataan/puretaan @@ -3845,8 +3856,8 @@ STR_VEHICLE_INFO_FEEDER_CARGO_VALUE :{BLACK}Siirron STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Huoltoväli: {LTBLUE}{COMMA}{NBSP}päivää{BLACK} Viimeisin huolto: {LTBLUE}{DATE_LONG} STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Huoltoväli: {LTBLUE}{COMMA}{NBSP}%{BLACK} Viime huolto: {LTBLUE}{DATE_LONG} -STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Kasvata huoltoväliä kymmenellä. Ctrl+Klik kasvattaa huoltoväliä viidellä -STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Pienennä huoltoväliä kymmenellä. Ctrl+Klik vähentää huoltoväliä viidellä +STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Kasvata huoltoväliä kymmenellä. Ctrl+napsautus kasvattaa huoltoväliä viidellä. +STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Pienennä huoltoväliä kymmenellä. Ctrl+napsautus pienentää huoltoväliä viidellä. STR_SERVICE_INTERVAL_DROPDOWN_TOOLTIP :{BLACK}Muuta huoltovälien tyyppiä STR_VEHICLE_DETAILS_DEFAULT :Oletus @@ -3888,7 +3899,7 @@ STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Uusi kap STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO_LONG}{}{BLACK}Tulot sovittamisesta: {GREEN}{CURRENCY_LONG} STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Sovituksen kustannus: {RED}{CURRENCY_LONG} STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Tulot sovittamisesta: {GREEN}{CURRENCY_LONG} -STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Valitse sovitettavat kulkuneuvot. Hiirellä vetäminen sallii useamman kulkuneuvon valinnan. Tyhjän alueen napsautus valitsee koko kulkuneuvon. Ctrl+Klik valitsee kulkuneuvon ja sitä seuraavan ketjun +STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Valitse sovitettavat kulkuneuvot. Hiirellä vetämällä voit valita useamman kulkuneuvon. Tyhjän alueen napsautus valitsee koko kulkuneuvon. Ctrl+napsautus valitsee kulkuneuvon ja sitä seuraavan ketjun. STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}Valitse junan rahtityyppi STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Valitse ajoneuvolla kuljetettava rahti @@ -3910,7 +3921,7 @@ STR_ORDERS_CAPTION :{WHITE}{VEHICLE STR_ORDERS_TIMETABLE_VIEW :{BLACK}Aikataulu STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näytä aikataulu -STR_ORDERS_LIST_TOOLTIP :{BLACK}Käskyt – napsauta käskyä korostaaksesi sen. Ctrl+Klik siirtää näkymän kohteeseen +STR_ORDERS_LIST_TOOLTIP :{BLACK}Käskyt – napsauta käskyä korostaaksesi sen. Ctrl+napsautus siirtää näkymän käskyn kohteeseen. STR_ORDER_INDEX :{COMMA}:{NBSP} STR_ORDER_TEXT :{STRING} {STRING} {STRING} @@ -3940,9 +3951,9 @@ STR_ORDER_DROP_NO_UNLOADING :Ei rahdinpurkua STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Muuta korostetun käskyn purkamiskäyttäytymistä STR_ORDER_REFIT :{BLACK}Sovita -STR_ORDER_REFIT_TOOLTIP :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Klik poistaa sovituskäskyn +STR_ORDER_REFIT_TOOLTIP :{BLACK}Valitse, mille rahtityypille kulkuneuvo sovitetaan tässä käskyssä. Ctrl+napsautus poistaa sovitusmääräyksen. STR_ORDER_REFIT_AUTO :{BLACK}Uudelleensovitus asemalla -STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Valitse tällä määräyksellä sovitettava rahtityyppi. Ctrl+Klik poistaaksesi sovitusmääräyksen. Sovitus suoritetaan vain, jos kulkuneuvo sallii sen +STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Valitse, mille rahtityypille kulkuneuvo sovitetaan tässä käskyssä. Ctrl+napsautus poistaa sovitusmääräyksen. Uudelleensovittamisen edellytyksenä on, että kulkuneuvo sallii sen. STR_ORDER_DROP_REFIT_AUTO :Määrätty rahti STR_ORDER_DROP_REFIT_AUTO_ANY :Saatavilla oleva rahti @@ -3978,13 +3989,13 @@ STR_ORDER_CONDITIONAL_VALUE_TOOLTIP :{BLACK}Arvo, jo STR_ORDER_CONDITIONAL_VALUE_CAPT :{WHITE}Syötä arvo, johon verrataan STR_ORDERS_SKIP_BUTTON :{BLACK}Ohita -STR_ORDERS_SKIP_TOOLTIP :{BLACK}Ohita nykyinen käsky ja aloita seuraava. Ctrl+Klik hyppää valittuun käskyyn +STR_ORDERS_SKIP_TOOLTIP :{BLACK}Ohita nykyinen käsky ja aloita seuraava. Ctrl+napsautus hyppää valittuun käskyyn. STR_ORDERS_DELETE_BUTTON :{BLACK}Poista STR_ORDERS_DELETE_TOOLTIP :{BLACK}Poista korostettu käsky STR_ORDERS_DELETE_ALL_TOOLTIP :{BLACK}Poista kaikki käskyt STR_ORDERS_STOP_SHARING_BUTTON :{BLACK}Lopeta jakaminen -STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Lopeta käskyjen jakaminen. Ctrl+Klik poistaa lisäksi kaikki tämän kulkuneuvon käskyt +STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Lopeta käskyjen jakaminen. Ctrl+napsautus poistaa lisäksi kaikki tämän kulkuneuvon käskyt. STR_ORDERS_GO_TO_BUTTON :{BLACK}Mene STR_ORDER_GO_TO_NEAREST_DEPOT :Mene lähimmälle varikolle @@ -4094,7 +4105,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Tämä a STR_TIMETABLE_STATUS_START_AT :{BLACK}Tämä aikataulu alkaa {STRING} STR_TIMETABLE_STARTING_DATE :{BLACK}Aloituspäivä -STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Valitse päivämäärä aikataulun aloituspäiväksi. Ctrl+Klik määrittää aikataulun aloituspäivän ja jakaa aikataulun tasaisesti kaikkien sitä käyttävien kulkuneuvojen kesken niiden järjestyksen mukaan. +STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Valitse päivämäärä aikataulun aloitusajankohdaksi. Ctrl+napsautus asettaa aikataulun aloituspäivän ja levittää kaikki tämän käskyjoukon jakavat kulkuneuvot tasaisesti niiden keskinäisen järjestyksen mukaan, mikäli käskyjoukko on kokonaan aikataulutettu. STR_TIMETABLE_CHANGE_TIME :{BLACK}Muuta aikaa STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Aseta kuinka kauan käskyn tulisi kestää @@ -4112,7 +4123,7 @@ STR_TIMETABLE_RESET_LATENESS :{BLACK}Nollaa m STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Nollaa myöhästymislaskuri, jotta vaunu olisi taas aikataulussa STR_TIMETABLE_AUTOFILL :{BLACK}Automaattinen -STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+Klik: yritä säilyttää odotusajat) +STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+napsautus: yritä säilyttää odotusajat) STR_TIMETABLE_EXPECTED :{BLACK}Odotettu STR_TIMETABLE_SCHEDULED :{BLACK}Aikataulu diff --git a/src/lang/french.txt b/src/lang/french.txt index 155bef221e..823145c10f 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2631,6 +2631,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Choisir # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informations sur le terrain +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur la case. Ctrl-clic pour ouvrir une nouvelle vue sur la case STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Coût si démolition{NBSP}: {LTBLUE}N/D STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Coût si démolition{NBSP}: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Gain si démolition{NBSP}: {LTBLUE}{CURRENCY_LONG} @@ -3101,6 +3102,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Activer # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Éditer le texte du panneau +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le panneau. Ctrl-clic pour ouvrir une nouvelle vue sur le panneau STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Aller au panneau suivant STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Aller au panneau précédent @@ -3757,6 +3759,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Si l'aut # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centrer la vue sur le train. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur le train +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centrer la vue sur le véhicule. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur le véhicule +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centrer la vue sur le navire. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur le navire +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centrer la vue sur l'aéronef. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur l'aéronef STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envoyer le train au dépôt.{}Ctrl-clic pour un entretien seul. STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envoyer le véhicule au dépôt.{}Ctrl-clic pour un entretien seul. @@ -3788,7 +3794,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher les détails du navire STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher les détails de l'aéronef +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Action courante du train - cliquer pour le démarrer/l'arrêter +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Action courante du véhicule - cliquer pour le démarrer/l'arrêter +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Action courante du navire - cliquer pour le démarrer/l'arrêter +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Action courante de l'aéronef - cliquer pour le démarrer/l'arrêter +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur la destination. Ctrl-clic pour ouvrir une nouvelle vue sur la destination # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Chargement/Déchargement diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index abb7413a50..75163bbb99 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1615,6 +1615,7 @@ STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Penempatan poho STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Mengendalikan kemunculan pohon dalam permainan. Ini akan berefek pada industri yang memerlukan pohon, contohnya pengolahan kayu gelondongan STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Tumbuh tapi jangan menyebar {RED}(memecahkan pabrik kayu) STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Tumbuh tetapi hanya tersebar di hutan hujan +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Tumbuh dan menyebar ke mana-mana STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Jangan tumbuh, jangan menyebar {RED}(menghancurkan pabrik kayu) STR_CONFIG_SETTING_TOOLBAR_POS :Posisi toolbar utama: {STRING} @@ -3088,6 +3089,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Hidup ma # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Ubah tulisan di tanda pengenal +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Pusatkan tampilan utama pada lokasi tanda tangan. Ctrl+Klik membuka viewport baru pada lokasi tanda tangan STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Pergi sampai rambu berikutnya STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Pergi ke rambu sebelumnya @@ -3364,6 +3366,8 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Pindah K STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Membangun kembali kantor pusat perusahaan di tempat lain dengan 1% ongkos dari nilai perusahaan. Shift untuk menampilkan perkiraan biaya STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detail STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Lihat jumlah infrastruktur lebih detail +STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Berikan uang +STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Berikan uang kepada perusahaan ini STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Ganti Wajah STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Pilih wajah baru pimpinan @@ -3741,6 +3745,7 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Membuat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Tampilan utama pusat di lokasi kapal. Klik ganda akan mengikuti kapal dalam tampilan utama. Ctrl+Click membuka viewport baru di lokasi kapal STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kereta berhenti di depo. CTRL+klik untuk memerintahkan perbaikan saja STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kendaraan berhenti di bengkel. CTRL+klik hanya akan memerintahkan perbaikan di bengkel @@ -3772,6 +3777,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilka STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail kapal STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail pesawat +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi kereta saat ini - klik untuk menghentikan/memulai kereta # Messages in the start stop button in the vehicle view @@ -4453,6 +4459,7 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Jenis bengkel s STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} jadi terlalu panjang setelah diganti STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Tidak ada aturan peremajaan otomatis yang berlaku STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(batas min. uang) +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Kendaraan baru tidak bisa membawa {STRING} STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Kendaraan baru tidak dapat melakukan perbaikan dalam urutan {NUM} # Rail construction errors diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 4709659e3a..e83d97b17d 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3010,6 +3010,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Wybierz # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informacja o terenie +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji kawałka terenu. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Koszt czyszczenia: {LTBLUE}N/D STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Koszt czyszczenia: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Zysk gdy czyszczone: {LTBLUE}{CURRENCY_LONG} @@ -3480,6 +3481,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Przełą # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Edycja tekstu napisu +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Wyśrodkuj główny widok na pozycji napisu. Ctrl+Klik otwiera nowy podgląd wyśrodkowany na niej STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Idź do następnego napisu STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Idź do poprzedniego napisu @@ -4142,6 +4144,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Autowymi # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji pociągu. Podwójne kliknięcie włączy podążanie za pociągiem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji pojazdu. Podwójne kliknięcie włączy podążanie za pojazdem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji statku. Podwójne kliknięcie włączy podążanie za statkiem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji samolotu. Podwójne kliknięcie włączy podążanie za samolotem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Wyślij pociąg do warsztatów. Ctrl - tylko serwis STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Wyślij pojazd do zajezdni. Ctrl - tylko serwis @@ -4173,7 +4179,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż s STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż szczegóły statku STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż szczegóły samolotu +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Obecny stan pociągu - kliknij, aby zatrzymać/ruszyć pociąg +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Obecny stan pojazdu - kliknij, aby zatrzymać/ruszyć pojazd +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Obecny stan statku - kliknij, aby zatrzymać/ruszyć statek +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Obecny stan samolotu - kliknij aby zatrzymać/ruszyć samolot +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Wyśrodkuj główny widok na celu polecenia. Ctrl+Klik otwiera nowy podgląd na celu # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Załadunek / Wyładunek diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 3beaea3e02..b3821b6099 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1721,10 +1721,10 @@ STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL :normálny STR_CONFIG_SETTING_TOWN_GROWTH_FAST :rýchly STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST :Veľmi rýchly STR_CONFIG_SETTING_LARGER_TOWNS :Podiel miest ktoré sa stanú veľkomestami: {STRING} -STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT :Množstvo miest ktoré sa stanú veľkomestami, teda tie ktoré začali väčšie a rastú rýchlejšie. +STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT :Množstvo miest, ktoré sa stanú veľkomestami, teda tie ktoré začali väčšie a rastú rýchlejšie. STR_CONFIG_SETTING_LARGER_TOWNS_VALUE :1 z {COMMA} STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :žiadne -STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Násobok pociatocnej velkosti mesta: {STRING} +STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Násobok počiatočnej veľkosti mesta: {STRING} STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :Priemerná veľkosť veľkomiest v porovnaní k mestám na začiatku hry. STR_CONFIG_SETTING_LINKGRAPH_INTERVAL :Aktualizovať distribučný graf každ{P 0:2 "ý" "é" "ých"} {STRING} {P 0:2 "deň" "dni" "dní"} @@ -2134,7 +2134,7 @@ STR_NETWORK_LANG_LATVIAN :Litovsky STR_NETWORK_GAME_LOBBY_CAPTION :{WHITE}Sieťová hra - čakáreň STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN :{BLACK}Pripravuje sa k vstupu: {ORANGE}{STRING} -STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP :{BLACK}Aktualny zoznam spolocnosti v tejto hre. Bud mozes do jednej vstupit, alebo zalozit novu spolocnost. +STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP :{BLACK}Aktuálny zoznam spoločností v tejto hre. Buď môžeš do jednej vstúpiť, alebo založiť novú spoločnosť. STR_NETWORK_GAME_LOBBY_COMPANY_INFO :{SILVER}INFO O SPOLOCNOSTI STR_NETWORK_GAME_LOBBY_COMPANY_NAME :{SILVER}Názov spoločnosti: {WHITE}{STRING} @@ -2445,7 +2445,7 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Vybrať # Rail waypoint construction window STR_WAYPOINT_CAPTION :{WHITE}Smerový bod -STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Vyber typ kontrolneho bodu +STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Vyber typ kontrolného bodu # Rail station construction window STR_STATION_BUILD_RAIL_CAPTION :{WHITE}Výber železničnej stanice @@ -2788,21 +2788,21 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Lodenica STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Železničný tunel STR_LAI_TUNNEL_DESCRIPTION_ROAD :Cestný tunel -STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL :Ocelovy zavesny zeleznicny most -STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Ocelovy pilierovy zeleznicny most -STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Ocelovy visuty zeleznicny most -STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE :Vystuzeny zavesny betonovy zeleznicny most -STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN :Dreveny zeleznicny most -STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE :Betonovy zeleznicny most -STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL :Kryty zeleznicny most - -STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL :Ocelovy zavesny cestny most -STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL :Ocelovy pilierovy cestny most -STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL :Ocelovy visuty cestny most -STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE :Vystuzeny zavesny betonovy cestny most -STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN :Dreveny cestny most -STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE :Betonovy cestny most -STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL :Kryty cestny most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL :Oceľový závesný železničný most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Oceľový pilierový železničný most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Oceľový visutý železničný most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE :Vystužený závesný betónový železničný most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN :Drevený železničný most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE :Betónový železničný most +STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL :Krytý železničný most + +STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL :Oceľový závesný cestný most +STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL :Oceľovy pilierový cestný most +STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL :Oceľový visutý cestný most +STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE :Vystužený závesný betónový cestný most +STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN :Drevený cestný most +STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE :Betónový cestný most +STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL :Krytý cestný most STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT :Akvadukt @@ -2942,12 +2942,12 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuáln STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Orientácia výškovej mapy: STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Názov výškovej mapy: -STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Velkost: +STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Veľkosť: STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} x {NUM} STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT :{WHITE}Zmeniť maximálnu výšku mapy STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Zmeniť výšku hranice snehu -STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Zmenit rok zaciatku hry +STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Zmeniť rok začiatku hry # SE Map generation STR_SE_MAPGEN_CAPTION :{WHITE}Typ scenara @@ -3439,6 +3439,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Premiest STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Sídlo spoločnosti je možné premiestniť za 1% hodnoty spoločnosti. Shift+klik zobrazí odhadovanú cenu STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detaily STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Zobraziť podrobné políčka infraštruktúry +STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Presuň peniaze do tejto spoločnosti STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nová tvár STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Vybrať novú tvár prezidenta @@ -3847,6 +3848,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Zobrazi STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Zobraziť detaily o lodi STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Zobraziť detaily o lietadle +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Činnosť aktuálneho vlaku - kliknite na zastavenie/spustenie vlaku +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Činnosť aktuálneho cestného vozidla - kliknite na zastavenie/spustenie cestného vozidla +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Činnosť aktuálnej lode - kliknite na zastavenie/spustenie lode +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Činnosť aktuálneho lietadla - kliknite na zastavenie/spustenie lietadla # Messages in the start stop button in the vehicle view diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 0f8963f35b..1b6831d078 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -392,7 +392,7 @@ STR_SETTINGS_MENU_NEWGRF_SETTINGS :Configuración STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS :Opciones de transparencia STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :Mostrar nombres de pueblos STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED :Mostrar nombres de estaciones -STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :Mostrar puntos guías +STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :Mostrar puntos de ruta STR_SETTINGS_MENU_SIGNS_DISPLAYED :Mostrar carteles propios STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS :Mostrar carteles y nombres del competidor STR_SETTINGS_MENU_FULL_ANIMATION :Animación completa @@ -759,7 +759,7 @@ STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Nieve STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Mostrar u ocultar nombres de pueblos en el mapa -STR_SMALLMAP_CENTER :{BLACK}Centrar vista en la ubicación actual +STR_SMALLMAP_CENTER :{BLACK}Centrar la vista en la ubicación actual STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM}) STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING} STR_SMALLMAP_COMPANY :{TINY_FONT}{COMPANY} @@ -1450,6 +1450,8 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Mantener activa STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Mantener abiertas las herramientas de construcción de puentes, túneles, etc., después de usarlas STR_CONFIG_SETTING_EXPENSES_LAYOUT :Agrupar gastos en la ventana de finanzas: {STRING} STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Definir el diseño de la ventana de finanzas +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Quitar señales de forma automática al construir vías férreas: {STRING} +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Quitar las señales de forma automática al construir vías férreas si estas obstruyen. Puede provocar choques de trenes. STR_CONFIG_SETTING_SOUND_TICKER :Boletín de noticias: {STRING} STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Reproducir sonido para mensajes resumidos de noticias @@ -2311,16 +2313,16 @@ STR_MISSING_GRAPHICS_NO_QUIT :{BLACK}No, sali # Transparency settings window STR_TRANSPARENCY_CAPTION :{WHITE}Opciones de transparencia -STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Activar o desactivar transparencia para carteles. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Activar o desactivar transparencia para árboles. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Activar o desactivar transparencia para casas. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Activar o desactivar transparencia para industrias. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Activar o desactivar transparencia para edificios como estaciones, depósitos o puntos guías. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Activar o desactivar transparencia para puentes. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Activar o desactivar transparencia para estructuras como faros o antenas. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Activar o desactivar transparencia para catenaria. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Activar o desactivar transparencia para indicadores de carga. Ctrl+Clic para excluir de tecla rápida 'X' -STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ocultar objetos totalmente (deben ser transparentes primero) +STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Transparencia de carteles. Ctrl+Clic para bloquear +STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Transparencia de árboles. Ctrl+Clic para bloquear +STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Transparencia de casas. Ctrl+Clic para bloquear +STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Transparencia de industrias. Ctrl+Clic para bloquear +STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Transparencia de estaciones, depósitos o puntos de ruta. Ctrl+Clic para bloquear +STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Transparencia de puentes. Ctrl+Clic para bloquear +STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Transparencia de estructuras como faros o antenas. Ctrl+Clic para bloquear +STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Transparencia de catenaria. Ctrl+Clic para bloquear +STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Transparencia de indicadores de cargamento. Ctrl+Clic para bloquear +STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ocultar objetos totalmente # Linkgraph legend window STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Leyenda de flujo de cargamento @@ -2351,6 +2353,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Unir pun STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Construir aparte # Generic toolbar +STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Deshabilitado al no haber vehículos disponibles para esta infraestructura # Rail construction toolbar STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Construcción de ferrocarril @@ -2361,12 +2364,12 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION :Construcción d STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Construir tramo de vías férreas en una orientación. Ctrl quita o coloca vías. Mayús muestra una estimación del precio STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Construir tramo de vías férreas con orientación automática. Ctrl quita o coloca vías. Mayús muestra una estimación del precio STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Construir depósito de trenes (para comprar y dar mantenimiento a trenes). Mayús muestra una estimación del precio -STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Construir punto guía sobre vías férreas. Ctrl activa la unión de puntos guías. Mayús muestra una estimación del precio +STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Construir punto de ruta sobre vías férreas. Ctrl activa la unión de puntos de ruta. Mayús muestra una estimación del precio STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Construir estación de ferrocarril. Ctrl activa la ampliación de estaciones. Mayús muestra una estimación del precio STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Poner señales. Ctrl intercambia señales mecánicas y eléctricas{}Arrastrar sobre un tramo recto permite poner señales intercaladas. Ctrl pone señales hasta un desvío u otra señal{}Ctrl+Clic cambia al modo de selección de señales. Mayús muestra una estimación del precio STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Construir puente de ferrocarril. Mayús muestra una estimación del precio STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Construir túnel de ferrocarril. Mayús muestra una estimación del precio -STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Quitar vías férreas, señales, estaciones y puntos guías. Al mantener pulsado Ctrl se quitan también las vías al retirar estaciones o puntos guías +STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Quitar vías férreas, señales, estaciones y puntos de ruta. Al mantener pulsado Ctrl se quitan también las vías al retirar estaciones o puntos de ruta STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Convertir o actualizar tipos de vías férreas. Mayús muestra una estimación del precio STR_RAIL_NAME_RAILROAD :Ferrocarril @@ -2379,8 +2382,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Orientac STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Elegir la orientación del depósito de trenes # Rail waypoint construction window -STR_WAYPOINT_CAPTION :{WHITE}Punto guía -STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Elegir el tipo de punto guía +STR_WAYPOINT_CAPTION :{WHITE}Punto de ruta +STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Elegir el tipo de punto de ruta # Rail station construction window STR_STATION_BUILD_RAIL_CAPTION :{WHITE}Selección de estación @@ -2397,7 +2400,7 @@ STR_STATION_BUILD_STATION_CLASS_TOOLTIP :{BLACK}Mostrar STR_STATION_BUILD_STATION_TYPE_TOOLTIP :{BLACK}Construir el tipo de estación elegida STR_STATION_CLASS_DFLT :Estación por defecto -STR_STATION_CLASS_WAYP :Puntos guías +STR_STATION_CLASS_WAYP :Puntos de ruta # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Selección de señales @@ -2421,7 +2424,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Aumentar # Bridge selection window STR_SELECT_RAIL_BRIDGE_CAPTION :{WHITE}Selección de puente de ferrocarril STR_SELECT_ROAD_BRIDGE_CAPTION :{WHITE}Selección de puente de carretera -STR_SELECT_BRIDGE_SELECTION_TOOLTIP :{BLACK}Selección de puente: Clic en el puente elegido para construirlo +STR_SELECT_BRIDGE_SELECTION_TOOLTIP :{BLACK}Selección de puente. Clic para construir STR_SELECT_BRIDGE_INFO :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG} STR_SELECT_BRIDGE_SCENEDIT_INFO :{GOLD}{STRING},{} {VELOCITY} STR_BRIDGE_NAME_SUSPENSION_STEEL :Colgante (acero) @@ -2483,7 +2486,7 @@ STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP :{BLACK}Construi STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Construir esclusa. Mayús muestra una estimación del precio STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Construir astillero (para comprar y dar mantenimiento a barcos). Mayús muestra una estimación del precio STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}Construir muelles. Ctrl activa la ampliación de estaciones. Mayús muestra una estimación del precio -STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Colocar boya para utilizar como punto guía marítimo. Mayús muestra una estimación del precio +STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Colocar boya para utilizar como punto de ruta marítimo. Mayús muestra una estimación del precio STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Construir acueducto. Mayús muestra una estimación del precio STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP :{BLACK}Definir cuerpo de agua.{}Crea un canal, a menos que se pulse Ctrl en un área al nivel del mar, en cuyo caso se inundarán los alrededores STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}Colocar ríos @@ -2628,6 +2631,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Elegir l # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Información sobre área de terreno +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la casilla.Ctrl+Clic abre una vista aparte STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Costo por despejar: {LTBLUE}N/D STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Costo por despejar: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Ingreso por despejar: {LTBLUE}{CURRENCY_LONG} @@ -3098,6 +3102,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Distingu # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Editar texto del cartel +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la señal. Ctrl+Clic abre una vista aparte STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Ir al siguiente cartel STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir al cartel anterior @@ -3108,7 +3113,7 @@ STR_TOWN_DIRECTORY_CAPTION :{WHITE}Pueblos STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ninguno - STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA}) STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (ciudad){BLACK} ({COMMA}) -STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Nombres de pueblos. Clic en un nombre para centrar la vista principal en el pueblo. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Nombres de pueblos. Clic para centrar la vista en el pueblo. Ctrl+Clic abre una vista aparte STR_TOWN_POPULATION :{BLACK}Población mundial: {COMMA} # Town view window @@ -3126,7 +3131,7 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}El puebl STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}El pueblo crece cada {ORANGE}{COMMA}{BLACK}{NBSP}días{P "" s} (obra negra) STR_TOWN_VIEW_TOWN_GROW_STOPPED :{BLACK}El pueblo {RED}no{BLACK} está creciendo STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Nivel de ruido en el pueblo: {ORANGE}{COMMA}{BLACK} Máx.: {ORANGE}{COMMA} -STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Centrar vista sobre el pueblo. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en el pueblo. Ctrl+Clic abre una vista aparte STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON :{BLACK}Ayuntamiento STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP :{BLACK}Mostrar información sobre el ayuntamiento local STR_TOWN_VIEW_RENAME_TOOLTIP :{BLACK}Cambiar nombre del pueblo @@ -3178,7 +3183,7 @@ STR_GOALS_SPECTATOR_NONE :{ORANGE}- No ap STR_GOALS_PROGRESS :{ORANGE}{STRING} STR_GOALS_PROGRESS_COMPLETE :{GREEN}{STRING} STR_GOALS_COMPANY_TITLE :{BLACK}Metas de la empresa -STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en una meta para centrar la vista principal en la casilla, industria o pueblo. Ctrl+Clic abre una nueva ventana de vista en dicha ubicación +STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en una meta para centrar la vista en la industria, pueblo o casilla. Ctrl+Clic abre una vista aparte # Goal question window STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Pregunta @@ -3214,7 +3219,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO :{ORANGE}{STRING STR_SUBSIDIES_NONE :{ORANGE}- Ninguno - STR_SUBSIDIES_SUBSIDISED_TITLE :{BLACK}Servicios con subsidio: STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING} desde {STRING} a {STRING}{YELLOW} ({COMPANY}{YELLOW}, hasta {DATE_SHORT}) -STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en un servicio para centrar la vista principal en esta industria o pueblo. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en un servicio para centrar la vista en la industria o pueblo. Ctrl+Clic abre una vista aparte # Story book window STR_STORY_BOOK_CAPTION :{WHITE}Historial de {COMPANY} @@ -3230,7 +3235,7 @@ STR_STORY_BOOK_NEXT_PAGE_TOOLTIP :{BLACK}Ir a la STR_STORY_BOOK_INVALID_GOAL_REF :{RED}Referencia a objetivos no válida # Station list window -STR_STATION_LIST_TOOLTIP :{BLACK}Nombres de estaciones: Clic en un nombre para centrar la vista principal en la estación. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_STATION_LIST_TOOLTIP :{BLACK}Nombres de estaciones. Clic para centrar la vista en la estación. Ctrl+Clic abre una vista aparte STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE :{BLACK}Mantener pulsado Ctrl para seleccionar más de un elemento STR_STATION_LIST_CAPTION :{WHITE}{COMPANY}: {COMMA} estaci{P ón ones} STR_STATION_LIST_STATION :{YELLOW}{STATION} {STATION_FEATURES} @@ -3292,7 +3297,7 @@ STR_CARGO_RATING_EXCELLENT :Excelente STR_CARGO_RATING_OUTSTANDING :Excepcional ############ range for rating ends -STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Centrar vista en la ubicación de la estación. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en la estación. Ctrl+Clic abre una vista aparte STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Cambiar nombre de la estación STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Mostrar aquellos trenes que tienen esta estación en su itinerario @@ -3307,9 +3312,9 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}No permi # Waypoint/buoy view window STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT} -STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Centrar vista en ubicación del punto guía. Ctrl+Clic abre una ventana de vista en dicha ubicación -STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Cambiar nombre de punto guía -STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en la ubicación de la boya. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en el punto de ruta. Ctrl+Clic abre una vista aparte +STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Cambiar nombre de punto de ruta +STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en la boya. Ctrl+Clic abre una vista aparte STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Cambiar nombre de boya STR_EDIT_WAYPOINT_NAME :{WHITE}Cambiar nombre de punto de ruta @@ -3419,7 +3424,7 @@ STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUST STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} y {NUM} más... -STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Nombre de industria: Clic en un nombre para centrar la vista principal en la industria. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Nombres de industrias. Clic para centrar la vista en la industria. Ctrl+Clic abre una vista aparte STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER :{BLACK}Cargamento aceptado: {SILVER}{STRING} STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER :{BLACK}Cargemento producido: {SILVER}{STRING} STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES :Todos los tipos @@ -3429,7 +3434,7 @@ STR_INDUSTRY_DIRECTORY_FILTER_NONE :Ninguno STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY} STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Producción mes pasado: STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transportado) -STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Centrar la vista sobre la industria. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la industria. Ctrl+Clic abre una vista aparte STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Nivel de producción: {YELLOW}{COMMA}% STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}¡La industria ha anunciado su cierre inminente! @@ -3450,10 +3455,10 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION :{WHITE}{STRING} STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING}: {COMMA} barco{P "" s} STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING}: {COMMA} aeronave{P "" s} -STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenes: Clic en un tren para más información -STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Vehículos de carretera: Clic en un vehículo para más información -STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos: Clic en un barco para más información -STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeronave: Clic en una aeronave para más información +STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenes. Clic para más información +STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Vehículos de carretera. Clic para más información +STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos. Clic para más información +STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeronave. Clic para más información STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Ganancias este año: {CURRENCY_LONG} (último año: {CURRENCY_LONG}) @@ -3491,7 +3496,7 @@ STR_GROUP_DEFAULT_AIRCRAFTS :Aeronaves sin a STR_GROUP_COUNT_WITH_SUBGROUP :{TINY_FONT}{COMMA} (+{COMMA}) -STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grupos: Clic en un grupo para ver los vehículos incluidos. Arrastrar y soltar para reorganizar los grupos. +STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grupos. Clic para ver los vehículos incluidos. Arrastrar y soltar para reorganizar los grupos. STR_GROUP_CREATE_TOOLTIP :{BLACK}Clic para crear un grupo STR_GROUP_DELETE_TOOLTIP :{BLACK}Eliminar el grupo seleccionado STR_GROUP_RENAME_TOOLTIP :{BLACK}Cambiar nombre del grupo seleccionado @@ -3620,9 +3625,9 @@ STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} ve STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO_LONG} ({CARGO_SHORT}) STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trenes: arrastrar vehículos de ferrocarril con Clic izquierdo para añadirlos o quitarlos del tren. Clic derecho para más información. Mantener pulsado Ctrl para usar estos comandos con el resto del tren -STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vehículos de carretera: Clic derecho para más información -STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Barcos: Clic derecho en barco para más información -STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aeronaves: Clic derecho en la aeronave para más información +STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vehículos. Clic derecho para más información +STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Barcos. Clic derecho para más información +STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aeronaves. Clic derecho para más información STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Arrastrar aquí un vehículo para venderlo STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}Arrastrar aquí el vehículo de carretera para venderlo @@ -3661,10 +3666,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Esto com STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Esto comprará una copia idéntica del barco. Clic en este botón y después en el barco a copiar. Ctrl+Clic para compartir las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto comprará una copia idéntica de la aeronave. Clic en este botón y después en la aeronave a copiar. Ctrl+Clic para compartir las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra -STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del depósito de trenes. Ctrl+Clic abre una ventana de vista en dicha ubicación -STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del depósito de vehículos. Ctrl+Clic abre una ventana de vista en dicha ubicación -STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del astillero. Ctrl+Clic abre una ventana de vista en dicha ubicación -STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del hangar. Ctrl+Clic abre una ventana de vista en dicha ubicación +STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el depósito de trenes. Ctrl+Clic abre una vista aparte +STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el depósito de vehículos. Ctrl+Clic abre una vista aparte +STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el astillero. Ctrl+Clic abre una vista aparte +STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el hangar. Ctrl+Clic abre una vista aparte STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Listar todos los trenes que tengan alguna orden de ir a este depósito STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Listar todos los vehículos que tengan alguna orden de ir a este depósito @@ -3754,6 +3759,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Hacer qu # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK} Centrar la vista en el tren. Doble clic permite seguir el tren. Ctrl+Clic abre una vista aparte +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK} Centrar la vista en el vehículo. Doble clic permite seguir el vehículo. Ctrl+Clic abre una vista aparte +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centrar la vista en el barco. Ctrl+Clic abre una vista aparte +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK} Centrar la vista en la aeronave. Doble clic permite seguir la aeronave. Ctrl+Clic abre una vista aparte STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento @@ -3785,7 +3794,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Ver deta STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Ver detalles del barco STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Ver detalles de la aeronave +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del tren. Clic para arrancar o detener +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo. Clic para arrancar o detener +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Acción actual del barco. Clic para arrancar o detener +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual de la aeronave. Clic para arrancar o detener +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el destino de la orden. Ctrl+Clic abre una vista aparte # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando/Descargando @@ -3908,7 +3922,7 @@ STR_ORDERS_CAPTION :{WHITE}{VEHICLE STR_ORDERS_TIMETABLE_VIEW :{BLACK}Itinerario STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar a la ventana de itinerarios -STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes: Clic en una orden para resaltarla. Ctrl+Clic para desplazarse a la estación indicada en la orden +STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes. Clic para resaltar. Ctrl+Clic para ir al destino de la orden STR_ORDER_INDEX :{COMMA}:{NBSP} STR_ORDER_TEXT :{STRING} {STRING} {STRING} @@ -4013,6 +4027,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Reformar a {ST STR_ORDER_STOP_ORDER :(Detenerse) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} +STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(No se puede usar la estación){POP_COLOUR} {STRING} {STATION} {STRING} STR_ORDER_IMPLICIT :(Implícito) @@ -4064,7 +4079,7 @@ STR_TIMETABLE_TITLE :{WHITE}{VEHICLE STR_TIMETABLE_ORDER_VIEW :{BLACK}Órdenes STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Cambiar a la ventana de órdenes -STR_TIMETABLE_TOOLTIP :{BLACK}Itinerarios: Clic en una orden para marcarla +STR_TIMETABLE_TOOLTIP :{BLACK}Itinerarios. Clic en una orden para resaltarla STR_TIMETABLE_NO_TRAVEL :No viajar STR_TIMETABLE_NOT_TIMETABLEABLE :Viajar (automático; programado por la próxima orden manual) @@ -4136,12 +4151,12 @@ STR_AI_DEBUG_SETTINGS :{BLACK}Configur STR_AI_DEBUG_SETTINGS_TOOLTIP :{BLACK}Cambiar la configuración del script STR_AI_DEBUG_RELOAD :{BLACK}Volver a cargar código STR_AI_DEBUG_RELOAD_TOOLTIP :{BLACK}Eliminar la IA, volver a cargar el código y reiniciar la IA -STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP :{BLACK}Activar o desactivar interrupción cuando un mensaje de log de la IA coincida con la cadena de interrupción +STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP :{BLACK}Alternar interrupción de ejec. cuando la IA registre un mensaje que coincida con el texto de interrupción STR_AI_DEBUG_BREAK_ON_LABEL :{BLACK}Interrumpir en: STR_AI_DEBUG_BREAK_STR_OSKTITLE :{BLACK}Pausar cuando el script registre esta cadena STR_AI_DEBUG_BREAK_STR_TOOLTIP :{BLACK}Cuando un mensaje de log de una IA coincida con esta cadena, poner el juego en pausa STR_AI_DEBUG_MATCH_CASE :{BLACK}Distinguir mayúsculas -STR_AI_DEBUG_MATCH_CASE_TOOLTIP :{BLACK}Activar o desactivar la distinción de mayúsculas al comparar los mensajes del log de la IA con la cadena de interrupción +STR_AI_DEBUG_MATCH_CASE_TOOLTIP :{BLACK}Alternar distinción de mayúsculas al comparar los mensajes registrados de la IA con el texto de interrupción STR_AI_DEBUG_CONTINUE :{BLACK}Continuar STR_AI_DEBUG_CONTINUE_TOOLTIP :{BLACK}Quitar la pausa y hacer que la IA continúe STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Mostrar salida de depuración de esta IA @@ -4424,7 +4439,7 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}Primero # Waypoint related errors STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Se amplía más de un punto de ruta existente -STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Demasiado cerca de otro punto guía +STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Demasiado cerca de otro punto de ruta STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}No se puede construir el punto de ruta aquí... STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}No se puede colocar la boya aquí... @@ -4465,6 +4480,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Tipo de depósi STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} es demasiado largo después del reemplazo STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}No se han aplicado reglas de reemplazo o renovación STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(límite de dinero) +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}El nuevo vehículo no puede llevar {STRING} +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}El nuevo vehículo no puede reformarse en la orden {NUM} # Rail construction errors STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Combinación imposible de vías From 98400974a9e6a482f71e9aaaca3c3062af8d887d Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 12 Jan 2021 19:52:30 +0100 Subject: [PATCH 08/47] Codechange: nobody was using "str" parameter, so remove it --- src/fontdetection.cpp | 10 +++++----- src/strings.cpp | 7 ++----- src/strings_func.h | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/fontdetection.cpp b/src/fontdetection.cpp index fd48bd801b..570e1aa068 100644 --- a/src/fontdetection.cpp +++ b/src/fontdetection.cpp @@ -347,7 +347,7 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT PLOGFONT os_data = MallocT(1); *os_data = logfont->elfLogFont; info->callback->SetFontNames(info->settings, font_name, os_data); - if (info->callback->FindMissingGlyphs(nullptr)) return 1; + if (info->callback->FindMissingGlyphs()) return 1; DEBUG(freetype, 1, "Fallback font: %s (%s)", font_name, english_name); return 0; // stop enumerating } @@ -477,7 +477,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i /* Save result. */ callback->SetFontNames(settings, name); - if (!callback->FindMissingGlyphs(nullptr)) { + if (!callback->FindMissingGlyphs()) { DEBUG(freetype, 2, "CT-Font for %s: %s", language_isocode, name); result = true; break; @@ -488,10 +488,10 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i /* For some OS versions, the font 'Arial Unicode MS' does not report all languages it * supports. If we didn't find any other font, just try it, maybe we get lucky. */ callback->SetFontNames(settings, "Arial Unicode MS"); - result = !callback->FindMissingGlyphs(nullptr); + result = !callback->FindMissingGlyphs(); } - callback->FindMissingGlyphs(nullptr); + callback->FindMissingGlyphs(); return result; } @@ -623,7 +623,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i callback->SetFontNames(settings, (const char*)file); - bool missing = callback->FindMissingGlyphs(nullptr); + bool missing = callback->FindMissingGlyphs(); DEBUG(freetype, 1, "Font \"%s\" misses%s glyphs", file, missing ? "" : " no"); if (!missing) { diff --git a/src/strings.cpp b/src/strings.cpp index 0f270ca8b8..a98d7e966c 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1998,11 +1998,9 @@ const char *GetCurrentLanguageIsoCode() /** * Check whether there are glyphs missing in the current language. - * @param[out] str Pointer to an address for storing the text pointer. * @return If glyphs are missing, return \c true, else return \c false. - * @post If \c true is returned and str is not nullptr, *str points to a string that is found to contain at least one missing glyph. */ -bool MissingGlyphSearcher::FindMissingGlyphs(const char **str) +bool MissingGlyphSearcher::FindMissingGlyphs() { InitFreeType(this->Monospace()); const Sprite *question_mark[FS_END]; @@ -2014,7 +2012,6 @@ bool MissingGlyphSearcher::FindMissingGlyphs(const char **str) this->Reset(); for (const char *text = this->NextString(); text != nullptr; text = this->NextString()) { FontSize size = this->DefaultSize(); - if (str != nullptr) *str = text; for (WChar c = Utf8Consume(&text); c != '\0'; c = Utf8Consume(&text)) { if (c >= SCC_FIRST_FONT && c <= SCC_LAST_FONT) { size = (FontSize)(c - SCC_FIRST_FONT); @@ -2095,7 +2092,7 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher) { static LanguagePackGlyphSearcher pack_searcher; if (searcher == nullptr) searcher = &pack_searcher; - bool bad_font = !base_font || searcher->FindMissingGlyphs(nullptr); + bool bad_font = !base_font || searcher->FindMissingGlyphs(); #if defined(WITH_FREETYPE) || defined(_WIN32) if (bad_font) { /* We found an unprintable character... lets try whether we can find diff --git a/src/strings_func.h b/src/strings_func.h index 2019b8b369..e4b7791052 100644 --- a/src/strings_func.h +++ b/src/strings_func.h @@ -277,7 +277,7 @@ public: */ virtual void SetFontNames(struct FreeTypeSettings *settings, const char *font_name, const void *os_data = nullptr) = 0; - bool FindMissingGlyphs(const char **str); + bool FindMissingGlyphs(); }; void CheckForMissingGlyphs(bool base_font = true, MissingGlyphSearcher *search = nullptr); From c6fd6cfd1580f0f743ddb91a0d161758e3f8c7ac Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 12 Jan 2021 20:05:47 +0100 Subject: [PATCH 09/47] Fix: tell the user if a font fails to load and fallback is about to be used Additionally, tell exactly why the font failed to load, which glyph was missing from the font. This hopefully helps the user a bit more in the right direction. --- src/strings.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/strings.cpp b/src/strings.cpp index a98d7e966c..fa039fdb97 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -2017,6 +2017,17 @@ bool MissingGlyphSearcher::FindMissingGlyphs() size = (FontSize)(c - SCC_FIRST_FONT); } else if (!IsInsideMM(c, SCC_SPRITE_START, SCC_SPRITE_END) && IsPrintable(c) && !IsTextDirectionChar(c) && c != '?' && GetGlyph(size, c) == question_mark[size]) { /* The character is printable, but not in the normal font. This is the case we were testing for. */ + std::string size_name; + + switch (size) { + case 0: size_name = "medium"; break; + case 1: size_name = "small"; break; + case 2: size_name = "large"; break; + case 3: size_name = "mono"; break; + default: NOT_REACHED(); + } + + DEBUG(freetype, 0, "Font is missing glyphs to display char 0x%X in %s font size", c, size_name.c_str()); return true; } } @@ -2110,6 +2121,19 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher) memcpy(&_freetype, &backup, sizeof(backup)); + if (!bad_font) { + /* Show that we loaded fallback font. To do this properly we have + * to set the colour of the string, otherwise we end up with a lot + * of artifacts.* The colour 'character' might change in the + * future, so for safety we just Utf8 Encode it into the string, + * which takes exactly three characters, so it replaces the "XXX" + * with the colour marker. */ + static char *err_str = stredup("XXXThe current font is missing some of the characters used in the texts for this language. Using system fallback font instead."); + Utf8Encode(err_str, SCC_YELLOW); + SetDParamStr(0, err_str); + ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_WARNING); + } + if (bad_font && base_font) { /* Our fallback font does miss characters too, so keep the * user chosen font as that is more likely to be any good than From 60851ef1a69a22b5efc43223363d3a4f62b1167e Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Tue, 12 Jan 2021 21:47:08 +0000 Subject: [PATCH 10/47] Feature: Sign macOS builds --- .github/workflows/release.yml | 30 ++++++++++++++++-- os/macosx/Info.plist.in | 2 +- os/macosx/notarize.sh | 58 +++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 4 deletions(-) create mode 100755 os/macosx/notarize.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efd58bfbd6..d1eb1b525e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -420,6 +420,16 @@ jobs: - name: Install GCC problem matcher uses: ammaraskar/gcc-problem-matcher@master + - name: Import code signing certificates + uses: Apple-Actions/import-codesign-certs@v1 + with: + # The certificates in a PKCS12 file encoded as a base64 string + p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} + # The password used to import the PKCS12 file. + p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} + # If this is run on a fork, there may not be a certificate set up - continue in this case + continue-on-error: true + - name: Build run: | mkdir build @@ -432,6 +442,8 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \ + "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \ # EOF echo "::endgroup::" @@ -440,9 +452,21 @@ jobs: make -j$(sysctl -n hw.logicalcpu) package echo "::endgroup::" - # Remove the sha256 files CPack generates; we will do this ourself at - # the end of this workflow. - rm -f bundles/*.sha256 + - name: Install gon + env: + HOMEBREW_NO_AUTO_UPDATE: 1 + HOMEBREW_NO_INSTALL_CLEANUP: 1 + run: | + brew tap mitchellh/gon + brew install mitchellh/gon/gon + + - name: Notarize + env: + AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }} + AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }} + run: | + cd build + ../os/macosx/notarize.sh - name: Store bundles uses: actions/upload-artifact@v2 diff --git a/os/macosx/Info.plist.in b/os/macosx/Info.plist.in index b3285589dd..04d6ea6d33 100644 --- a/os/macosx/Info.plist.in +++ b/os/macosx/Info.plist.in @@ -8,7 +8,7 @@ CFBundleDisplayName ${CPACK_BUNDLE_NAME} CFBundleExecutable - ${CPACK_BUNDLE_NAME} + openttd CFBundleGetInfoString #CPACK_PACKAGE_VERSION#, Copyright 2004-${CURRENT_YEAR} The OpenTTD team CFBundleIconFile diff --git a/os/macosx/notarize.sh b/os/macosx/notarize.sh new file mode 100755 index 0000000000..3434c31256 --- /dev/null +++ b/os/macosx/notarize.sh @@ -0,0 +1,58 @@ +#!/bin/bash +set -e + +# This script attempts to notarize the OpenTTD DMG generated by CPack. +# If you are building an unofficial branch of OpenTTD, please change the bundle +# ID in Info.plist and below. +# +# This uses `gon' to perform notarization: +# +# https://github.com/mitchellh/gon +# +# Follow the setup instructions on the gon site to install. +# +# Before executing this script, you must first configure CMake with at least the following +# parameters: +# +# -DCPACK_BUNDLE_APPLE_CERT_APP={certificate ID} +# "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" +# +# then run "make package" or "cpack". +# +# This will sign the application with your signing certificate, and will enable +# the hardened runtime. +# +# You also need to set your Apple Developer username and password (app-specific password +# is recommended) in the AC_USERNAME and AC_PASSWORD environment variables. +# +# Then, ensuring you're in your build directory and that the "bundles" directory +# exists with a .dmg in it (clear out any old DMGs first), run: +# +# ../os/macosx/notarize.sh + +if [ -z "${AC_USERNAME}" ]; then + echo AC_USERNAME not set, skipping notarization. + exit 0 +fi; + +dmg_filename=(bundles/*.dmg) + +if [ "${dmg_filename}" = "bundles/*.dmg" ]; then + echo "No .dmg found in the bundles directory, skipping notarization. Please read this" + echo "script's source for execution instructions." + exit 1 +fi; + +cat < notarize.json +{ + "notarize": [ + { + "path": "${dmg_filename[0]}", + "bundle_id": "org.openttd.openttd", + "staple": true + } + ] +} +EOF + +gon notarize.json From de44ce2092a74a88236b08c8afba9f5af59af76d Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Wed, 13 Jan 2021 14:55:55 +0100 Subject: [PATCH 11/47] Change: darken the background of all graph to increase contrast (#8557) Now lines like Mauve, Dark Green and Purple are much more visible without hurting the other colours. --- src/graph_gui.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 2578c73f38..ea38914ad0 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -325,6 +325,9 @@ protected: /* Where to draw the X axis. Use floating point to avoid overflowing and results of zero. */ x_axis_offset = (int)((r.bottom - r.top) * (double)interval.highest / (double)interval_size); + /* Draw the background of the graph itself. */ + GfxFillRect(r.left, r.top, r.right, r.bottom, GREY_SCALE(2)); + /* Draw the vertical grid lines. */ /* Don't draw the first line, as that's where the axis will be. */ From f9dee5aaa0a557987eeef41690a2a88536f4902b Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Tue, 12 Jan 2021 20:32:17 +0000 Subject: [PATCH 12/47] Feature: Show rainforest under vegetation on small map --- src/gfx_func.h | 1 + src/lang/english.txt | 1 + src/smallmap_gui.cpp | 13 +++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gfx_func.h b/src/gfx_func.h index 0edbf722a1..7ac26f29bb 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -227,6 +227,7 @@ static const uint8 PC_LIGHT_BLUE = 0x98; ///< Light blue palet static const uint8 PC_ROUGH_LAND = 0x52; ///< Dark green palette colour for rough land. static const uint8 PC_GRASS_LAND = 0x54; ///< Dark green palette colour for grass land. static const uint8 PC_BARE_LAND = 0x37; ///< Brown palette colour for bare land. +static const uint8 PC_RAINFOREST = 0x5C; ///< Pale green palette colour for rainforest. static const uint8 PC_FIELDS = 0x25; ///< Light brown palette colour for fields. static const uint8 PC_TREES = 0x57; ///< Green palette colour for trees. static const uint8 PC_WATER = 0xC9; ///< Dark blue palette colour for water. diff --git a/src/lang/english.txt b/src/lang/english.txt index 8ec1250b89..dc184aa317 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -747,6 +747,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Rough Land STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Grass Land STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Bare Land +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Rainforest STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Fields STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Trees STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Rocks diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 8ece48d93f..ef1638d2f3 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -115,11 +115,12 @@ static const LegendAndColour _legend_vegetation[] = { MK(PC_ROUGH_LAND, STR_SMALLMAP_LEGENDA_ROUGH_LAND), MK(PC_GRASS_LAND, STR_SMALLMAP_LEGENDA_GRASS_LAND), MK(PC_BARE_LAND, STR_SMALLMAP_LEGENDA_BARE_LAND), + MK(PC_RAINFOREST, STR_SMALLMAP_LEGENDA_RAINFOREST), MK(PC_FIELDS, STR_SMALLMAP_LEGENDA_FIELDS), MK(PC_TREES, STR_SMALLMAP_LEGENDA_TREES), - MK(PC_GREEN, STR_SMALLMAP_LEGENDA_FOREST), - MS(PC_GREY, STR_SMALLMAP_LEGENDA_ROCKS), + MS(PC_GREEN, STR_SMALLMAP_LEGENDA_FOREST), + MK(PC_GREY, STR_SMALLMAP_LEGENDA_ROCKS), MK(PC_ORANGE, STR_SMALLMAP_LEGENDA_DESERT), MK(PC_LIGHT_BLUE, STR_SMALLMAP_LEGENDA_SNOW), MK(PC_BLACK, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES), @@ -531,7 +532,11 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t) { switch (t) { case MP_CLEAR: - return (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) ? MKCOLOUR_XXXX(PC_BARE_LAND) : _vegetation_clear_bits[GetClearGround(tile)]; + if (IsClearGround(tile, CLEAR_GRASS)) { + if (GetClearDensity(tile) < 3) return MKCOLOUR_XXXX(PC_BARE_LAND); + if (GetTropicZone(tile) == TROPICZONE_RAINFOREST) return MKCOLOUR_XXXX(PC_RAINFOREST); + } + return _vegetation_clear_bits[GetClearGround(tile)]; case MP_INDUSTRY: return IsTileForestIndustry(tile) ? MKCOLOUR_XXXX(PC_GREEN) : MKCOLOUR_XXXX(PC_DARK_RED); @@ -540,7 +545,7 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t) if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT || GetTreeGround(tile) == TREE_GROUND_ROUGH_SNOW) { return (_settings_game.game_creation.landscape == LT_ARCTIC) ? MKCOLOUR_XYYX(PC_LIGHT_BLUE, PC_TREES) : MKCOLOUR_XYYX(PC_ORANGE, PC_TREES); } - return MKCOLOUR_XYYX(PC_GRASS_LAND, PC_TREES); + return (GetTropicZone(tile) == TROPICZONE_RAINFOREST) ? MKCOLOUR_XYYX(PC_RAINFOREST, PC_TREES) : MKCOLOUR_XYYX(PC_GRASS_LAND, PC_TREES); default: return ApplyMask(MKCOLOUR_XXXX(PC_GRASS_LAND), &_smallmap_vehicles_andor[t]); From ebaecebc68a6a5c2382ecdf0e1c89d479ef46c93 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Wed, 13 Jan 2021 14:56:04 +0000 Subject: [PATCH 13/47] Fix #8560: Planes were landing at the wrong height at airports with lowered hangar tiles --- src/aircraft_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 0495da0b26..09c5dc4335 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1114,7 +1114,7 @@ static bool AircraftController(Aircraft *v) if ((amd.flag & (AMED_LAND | AMED_BRAKE)) && st != nullptr) { assert(st->airport.HasHangar()); TileIndex hangar_tile = st->airport.GetHangarTile(0); - airport_z = TilePixelHeight(hangar_tile) + 1; // To avoid clashing with the shadow + airport_z = GetTileMaxPixelZ(hangar_tile) + 1; // To avoid clashing with the shadow } if (amd.flag & AMED_LAND) { From b99eafbfb083ee1436e12ae5ebd88a707795d1d0 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 13 Jan 2021 18:48:46 +0000 Subject: [PATCH 14/47] Update: Translations from eints korean: 14 changes by telk5093 finnish: 1 change by hpiirai spanish: 41 changes by MontyMontana polish: 5 changes by yazalo --- src/lang/finnish.txt | 2 +- src/lang/korean.txt | 17 ++++++++++-- src/lang/polish.txt | 10 +++---- src/lang/spanish.txt | 66 +++++++++++++++++++++++++++----------------- 4 files changed, 61 insertions(+), 34 deletions(-) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index c5bcba20e1..2a4032b656 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -229,7 +229,7 @@ STR_LIST_FILTER_TITLE :{BLACK}Suodatin STR_LIST_FILTER_OSKTITLE :{BLACK}Syötä suodatinteksti STR_LIST_FILTER_TOOLTIP :{BLACK}Syötä avainsana suodattaaksesi listan -STR_TOOLTIP_GROUP_ORDER :{BLACK}Valitse ryhmittelyjärjestys +STR_TOOLTIP_GROUP_ORDER :{BLACK}Valitse ryhmittelytapa STR_TOOLTIP_SORT_ORDER :{BLACK}Valitse järjestys (laskeva/nouseva) STR_TOOLTIP_SORT_CRITERIA :{BLACK}Valitse järjestyskriteeri STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Valitse suodatuskriteerit diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 326bec0f05..a3e3d7d16a 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2631,6 +2631,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}표시 # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}이 지역의 지형 정보 +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}이 칸의 위치로 이동합니다. CTRL+클릭하면 이 칸의 위치를 기준으로 새로운 외부 화면을 엽니다 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}초기화 가격: {LTBLUE}없음 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}초기화 가격: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}제거시 들어오는 환불금: {LTBLUE}{CURRENCY_LONG} @@ -3101,6 +3102,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}팻말 # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}팻말 내용 고치기 +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}이 팻말의 위치로 이동합니다. CTRL+클릭하면 이 팻말 위치를 기준으로 새로운 외부 화면을 엽니다 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}다음 팻말로 가기 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}이전 팻말로 가기 @@ -3312,7 +3314,7 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}이 공 STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}이 경유지의 위치로 시점을 변경합니다. CTRL+클릭하면 이 경유지 위치를 기준으로 새로운 외부 화면을 엽니다 STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}이 경유지의 이름을 변경합니다 -STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}이 부표의 위치로 시점을 변경합니다. CTRL+클릭하면 이 부표 위치를 기준으로 새로운 외부 화면을 엽니다 +STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}이 부표의 위치로 이동합니다. CTRL+클릭하면 이 부표 위치를 기준으로 새로운 외부 화면을 엽니다 STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}부표 이름 바꾸기 STR_EDIT_WAYPOINT_NAME :{WHITE}경유지 이름 설정 @@ -3757,6 +3759,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}자동 # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}이 열차의 위치로 화면을 이동합니다. 더블 클릭하면 이 열차를 따라 화면이 움직입니다. CTRL+클릭하면 이 열차 위치를 기준으로 외부 화면을 엽니다 +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}이 차량의 위치로 화면을 이동합니다. 더블 클릭하면 이 차량을 따라 화면이 움직입니다. CTRL+클릭하면 이 차량 위치를 기준으로 외부 화면을 엽니다 +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}이 선박의 위치로 화면을 이동합니다. 더블 클릭하면 이 선박을 따라 화면이 움직입니다. CTRL+클릭하면 이 선박 위치를 기준으로 외부 화면을 엽니다 +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}이 항공기의 위치로 화면을 이동합니다. 더블 클릭하면 이 항공기를 따라 화면이 움직입니다. CTRL+클릭하면 이 항공기 위치를 기준으로 외부 화면을 엽니다 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}열차를 차량기지로 보냅니다. CTRL+클릭하면 정비를 하러 차량기지에 들르기만 합니다 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}차량을 차고지로 보냅니다. CTRL+클릭하면 정비를 하러 차고지에 들르기만 합니다 @@ -3788,7 +3794,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}차량 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}선박의 상세정보를 보여줍니다 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}항공기의 상세정보를 보여줍니다 +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}현재 열차 행동 - 열차 운행을 시작/정지하려면 클릭하세요 +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}현재 차량 행동 - 차량 운행을 시작/정지하려면 클릭하세요 +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}현재 선박 행동 - 선박 운행을 시작/정지하려면 클릭하세요 +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}현재 항공기 행동 - 항공기 운행을 시작/정지하려면 클릭하세요 +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}이 경로의 위치로 화면을 이동합니다. CTRL+클릭하면 이 경로의 위치를 기준으로 외부 화면을 엽니다 # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}싣는 중 / 내리는 중 @@ -4454,12 +4465,12 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR :{WHITE}... 격 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}차량기지 내에서 정지한 경우에만 개조할 수 있습니다 STR_ERROR_TRAIN_TOO_LONG :{WHITE}열차가 너무 깁니다! -STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}차량을 유턴시킬 수 없습니다... +STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}차량을 뒤집을 수 없습니다... STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}여러 대가 연결된 차량은 뒤집을 수 없습니다... STR_ERROR_INCOMPATIBLE_RAIL_TYPES :알맞지 않은 철도 타입입니다 STR_ERROR_CAN_T_MOVE_VEHICLE :{WHITE}차량을 옮길 수 없습니다... -STR_ERROR_REAR_ENGINE_FOLLOW_FRONT :{WHITE}뒷쪽 기관차는 앞쪽 기관차를 항상 따라다닐 것입니다 +STR_ERROR_REAR_ENGINE_FOLLOW_FRONT :{WHITE}뒷쪽 기관차는 앞쪽 기관차와 항상 붙어있어야 합니다 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}근처에 있는 차량기지로 가는 길을 찾을 수 없습니다 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}근처에 있는 차고지를 찾을 수 없습니다 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index e83d97b17d..7a6468d91a 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1383,7 +1383,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :inna STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Rozmiar interfejsu STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Wybierz rozmiar elementów interfejsu -STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Normalne +STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Normalny STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Podwójny STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Poczwórny @@ -1446,7 +1446,7 @@ STR_NUM_VERY_LOW :Bardzo mało STR_NUM_LOW :Mało STR_NUM_NORMAL :Średnio STR_NUM_HIGH :Dużo -STR_NUM_CUSTOM :Własne +STR_NUM_CUSTOM :Własna STR_NUM_CUSTOM_NUMBER :Własna ({NUM}) STR_VARIETY_NONE :Brak @@ -2192,7 +2192,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Wybierz STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Wyświetl opcje gry STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Wyświetl tabelę wyników -STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Ustawienia wyświetlania +STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Wyświetl ustawienia gry STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Wyświetl ustawienia NewGRF STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Poszukaj nowych lub zaktualizowanych dodatków do pobrania STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Pokaż ustawienia SI / Game Script @@ -3337,12 +3337,12 @@ STR_NEWGRF_SETTINGS_VERSION :{BLACK}Wersja: STR_NEWGRF_SETTINGS_MIN_VERSION :{BLACK}Kompatybilność z wersją min.: {SILVER}{NUM} STR_NEWGRF_SETTINGS_MD5SUM :{BLACK}Suma MD5: {SILVER}{STRING} STR_NEWGRF_SETTINGS_PALETTE :{BLACK}Paleta: {SILVER}{STRING} -STR_NEWGRF_SETTINGS_PALETTE_DEFAULT :Domyslny (D) +STR_NEWGRF_SETTINGS_PALETTE_DEFAULT :Domyślna (D) STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP :Domyślna (D) / 32 bpp STR_NEWGRF_SETTINGS_PALETTE_LEGACY :Dawna (W) STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP :Dawna (W) / 32 bpp STR_NEWGRF_SETTINGS_PARAMETER :{BLACK}Parametry: {SILVER}{STRING} -STR_NEWGRF_SETTINGS_PARAMETER_NONE :Żadne +STR_NEWGRF_SETTINGS_PARAMETER_NONE :Brak STR_NEWGRF_SETTINGS_NO_INFO :{BLACK}Brak dostępnych informacji STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Nie znaleziono pasującego pliku diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index c7e6c20dcc..88b2c28bf1 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -264,7 +264,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Al activ # Query window STR_BUTTON_DEFAULT :{BLACK}Por defecto STR_BUTTON_CANCEL :{BLACK}Cancelar -STR_BUTTON_OK :{BLACK}OK +STR_BUTTON_OK :{BLACK}Aceptar STR_WARNING_PASSWORD_SECURITY :{YELLOW}Advertencia: Los administradores del servidor podrían ser capaz de leer cualquier texto introducido aquí. # On screen keyboard window @@ -485,7 +485,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Borrar todos lo STR_ABOUT_MENU_LAND_BLOCK_INFO :Información del terreno STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Activar consola -STR_ABOUT_MENU_AI_DEBUG :Depuración de Script de Juego / IA +STR_ABOUT_MENU_AI_DEBUG :Depuración de Script de juego / IA STR_ABOUT_MENU_SCREENSHOT :Captura de pantalla STR_ABOUT_MENU_SHOW_FRAMERATE :Mostrar fotogramas por segundo - FPS STR_ABOUT_MENU_ABOUT_OPENTTD :Acerca de 'OpenTTD' @@ -1471,7 +1471,7 @@ STR_CONFIG_SETTING_SOUND_AMBIENT :Ambiental: {STR STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT :Reproducir sonidos ambientales de terreno, industrias y municipios STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :Deshabilitar construcción de infraestructuras cuando no haya vehículos apropiados disponibles: {STRING} -STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :Cuando se activa, solo pueden construirse infraestructuras si hay vehículos disponibles para ellas, previniendo un gasto innecesario de tiempo y dinero +STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :Cuando se activa, solo pueden construirse infraestructuras si hay vehículos disponibles para ellas, evitando un gasto innecesario de tiempo y dinero STR_CONFIG_SETTING_MAX_TRAINS :Número máximo de trenes por empresa: {STRING} STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :Número máximo de trenes que una compañía puede tener STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Número máximo de automóviles por empresa: {STRING} @@ -1836,6 +1836,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}¿Está # Cheat window STR_CHEATS :{WHITE}Trucos STR_CHEATS_TOOLTIP :{BLACK}Las casillas indican si ha usado este truco antes +STR_CHEATS_NOTE :{BLACK}Nota: el uso de estos ajustes quedará registrado en la partida STR_CHEAT_MONEY :{LTBLUE}Incrementar dinero en {CURRENCY_LONG} STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jugando como la empresa: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldózer mágico (elimina industrias, objetos inamovibles): {ORANGE}{STRING} @@ -2352,6 +2353,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Unir pun STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Construir un punto de ruta separado # Generic toolbar +STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Desactivado porque actualmente no hay vehículos disponibles para esta infraestructura # Rail construction toolbar STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Construcción de Ferrocarril @@ -2403,21 +2405,21 @@ STR_STATION_CLASS_WAYP :Puntos de ruta # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Selección de Señales STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Señal de bloque (mecánica){}Es el tipo de señal más básico, que permite a un único tren estar a la vez en el mismo bloque -STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Señal de entrada (mecánica){}Verde si existen una o más señales de salida en el tramo en verde, de lo contrario estará en rojo +STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Señal de entrada (mecánica){}En verde si existen una o más señales en verde en el siguiente segmento de vía; de lo contrario, estará en rojo STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Señal de salida (mecánica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Señal combo (mecánica){}La señal combo actúa como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales -STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Señal de ruta (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás -STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de un sentido (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás -STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Señal de bloque (eléctrica){}Es el tipo de señal más básico, que permite a un único tren estar a la vez en el mismo bloque -STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Señal de entrada (eléctrica){}Verde si existen una o más señales verdes en el siguiente segmento de vía, de lo contrario estará en rojo -STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Señal de salida (eléctrica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo +STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Señal de ruta (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser rebasadas desde atrás +STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de sentido único (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser rebasadas desde atrás +STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Señal de bloque (eléctrica){}Es el tipo de señal más básico, que permite estar solamente a un tren en el mismo bloque +STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Señal de entrada (eléctrica){}En verde si existen una o más señales en verde en el siguiente segmento de vía; de lo contrario, estará en rojo +STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Señal de salida (eléctrica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar correctamente las señales de entrada y combo STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Señal combo (eléctrica){}La señal combo actúa como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales -STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás -STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de un sentido (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás +STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser rebasadas desde atrás +STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de sentido único (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser rebasadas desde atrás STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Convertir señal{}Cuando es seleccionado, pulsar sobre una señal existente la convierte en el tipo y variante indicados. Pulsar Ctrl+Clic permite cambiar de variante. Mayús+Clic muestra una estimación del precio de conversión -STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Distancia del arrastre de señales -STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Reducir distancia del arrastre de señales -STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Incrementar distancia del arrastre de señales +STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Distancia de arrastre de señales +STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Reducir la distancia de arrastre de señales +STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Incrementar la distancia de arrastre de señales # Bridge selection window STR_SELECT_RAIL_BRIDGE_CAPTION :{WHITE}Seleccione Puente de Ferrocarril @@ -2629,6 +2631,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Permite # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Información del terreno +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrar la vista principal en la posición de la casilla. Ctrl+Clic abre un nuevo punto de vista en dicha posición. STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Coste de despeje: {LTBLUE}N/D STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Coste de despeje: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Beneficio cuando es limpiado: {LTBLUE}{CURRENCY_LONG} @@ -3099,6 +3102,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Activa/d # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Editar texto del cartel +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centrar la vista principal en el cartel. Ctrl+Clic abre un nuevo punto de vista en dicha posición STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Ir al siguiente cartel STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir al anterior cartel @@ -3755,6 +3759,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Hacer qu # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición del tren. Doble clic seguirá al tren en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición. +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición del vehículo. Doble clic seguirá al vehículo en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición. +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición del barco. Doble clic seguirá al barco en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición. +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición de la aeronave. Doble clic seguirá la aeronave en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento @@ -3786,7 +3794,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalles del barco STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalles de la aeronave +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del tren - clicar para detener/arrancar el tren +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo - clicar para detener/arrancar el vehículo +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Acción actual del barco - clicar para detener/arrancar el barco +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual de la aeronave - clicar para detener/arrancar la aeronave +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centrar la vista principal en el destino de la orden. Ctrl+Clic abre un nuevo punto de vista en dicha posición # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando / Descargando @@ -4014,6 +4027,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Reformar en {S STR_ORDER_STOP_ORDER :(Detenerse) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} +STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(No puede usar la estación){POP_COLOUR} {STRING} {STATION} {STRING} STR_ORDER_IMPLICIT :(Implícita) @@ -4130,7 +4144,7 @@ STR_DATE_YEAR_TOOLTIP :{BLACK}Seleccio # AI debug window -STR_AI_DEBUG :{WHITE}Depuración de Scripts de Juego / IA +STR_AI_DEBUG :{WHITE}Depuración de Scripts de juego / IA STR_AI_DEBUG_NAME_AND_VERSION :{BLACK}{STRING} (v{NUM}) STR_AI_DEBUG_NAME_TOOLTIP :{BLACK}Nombre del script STR_AI_DEBUG_SETTINGS :{BLACK}Configuración @@ -4146,18 +4160,18 @@ STR_AI_DEBUG_MATCH_CASE_TOOLTIP :{BLACK}Activa/d STR_AI_DEBUG_CONTINUE :{BLACK}Continuar STR_AI_DEBUG_CONTINUE_TOOLTIP :{BLACK}Quitar pausa y hacer que la IA continúe STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Mostrar salida de depuración de esta IA -STR_AI_GAME_SCRIPT :{BLACK}Script de Juego -STR_AI_GAME_SCRIPT_TOOLTIP :{BLACK}Comprobar el registro del Script de Juego +STR_AI_GAME_SCRIPT :{BLACK}Script de juego +STR_AI_GAME_SCRIPT_TOOLTIP :{BLACK}Comprobar el registro del Script de juego STR_ERROR_AI_NO_AI_FOUND :No se encontró IA apropiada para cargar.{}Ésta es una IA por defecto que no realiza acción alguna.{}Puedes descargar nuevas IA mediante el sistema de 'Contenido Online' STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Uno de los scripts ejecutados ha fallado. Por favor, informe del fallo al autor del script con una captura de la ventana de depuración de Script / IA STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}La ventana de depuración de Scripts solo está disponible para el servidor # AI configuration window -STR_AI_CONFIG_CAPTION :{WHITE}Configuración de Scripts de Juego / IA -STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Script de Juego que será cargado en la próxima partida -STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}IAs que serán cargadas en la próxima partida -STR_AI_CONFIG_HUMAN_PLAYER :Jugador Humano +STR_AI_CONFIG_CAPTION :{WHITE}Configuración de Scripts de juego / IA +STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Script de juego que será cargado en la próxima partida +STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}IA que serán cargadas en la próxima partida +STR_AI_CONFIG_HUMAN_PLAYER :Jugador humano STR_AI_CONFIG_RANDOM_AI :IA aleatoria STR_AI_CONFIG_NONE :(ninguna) @@ -4166,13 +4180,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Mover la STR_AI_CONFIG_MOVE_DOWN :{BLACK}Mover hacia abajo STR_AI_CONFIG_MOVE_DOWN_TOOLTIP :{BLACK}Mover la IA seleccionada hacia abajo -STR_AI_CONFIG_GAMESCRIPT :{SILVER}Script de Juego +STR_AI_CONFIG_GAMESCRIPT :{SILVER}Script de juego STR_AI_CONFIG_AI :{SILVER}IA STR_AI_CONFIG_CHANGE :{BLACK}Seleccionar {STRING} STR_AI_CONFIG_CHANGE_NONE : STR_AI_CONFIG_CHANGE_AI :IA -STR_AI_CONFIG_CHANGE_GAMESCRIPT :Script de Juego +STR_AI_CONFIG_CHANGE_GAMESCRIPT :Script de juego STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Cargar otro script STR_AI_CONFIG_CONFIGURE :{BLACK}Configurar STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Configura los parámetros del script @@ -4180,7 +4194,7 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Configur # Available AIs window STR_AI_LIST_CAPTION :{WHITE}Disponible {STRING} STR_AI_LIST_CAPTION_AI :IAs -STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de Juego +STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de juego STR_AI_LIST_TOOLTIP :{BLACK}Clic para seleccionar un script STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} @@ -4203,7 +4217,7 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT :{BLACK}Minimapa # AI Parameters STR_AI_SETTINGS_CAPTION :{WHITE}Parámetros {STRING} STR_AI_SETTINGS_CAPTION_AI :IA -STR_AI_SETTINGS_CAPTION_GAMESCRIPT :Script de Juego +STR_AI_SETTINGS_CAPTION_GAMESCRIPT :Script de juego STR_AI_SETTINGS_CLOSE :{BLACK}Cerrar STR_AI_SETTINGS_RESET :{BLACK}Reiniciar STR_AI_SETTINGS_SETTING :{STRING}: {ORANGE}{STRING} @@ -4466,6 +4480,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Tipo de depósi STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} es demasiado largo después del reemplazo STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}No se han aplicado reglas de autoreemplazo/renovación STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(límite de dinero) +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}El nuevo vehículo no puede transportar {STRING} +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}El nuevo vehículo no se puede reformar en la orden {NUM} # Rail construction errors STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Combinación de tramos imposible From 1411f878abdd22c04ef5783f3100ab9456d2520a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 13 Jan 2021 20:16:47 +0000 Subject: [PATCH 15/47] Add: Console command to dump debugging information (#8548) --- src/console_cmds.cpp | 157 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index e1cabd88f7..140d91e70f 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -36,6 +36,8 @@ #include "newgrf_profiling.h" #include "console_func.h" #include "engine_base.h" +#include "road.h" +#include "rail.h" #include "game/game.hpp" #include "table/strings.h" #include @@ -2112,6 +2114,159 @@ DEF_CONSOLE_CMD(ConFramerateWindow) return true; } +static void ConDumpRoadTypes() +{ + IConsolePrintF(CC_DEFAULT, " Flags:"); + IConsolePrintF(CC_DEFAULT, " c = catenary"); + IConsolePrintF(CC_DEFAULT, " l = no level crossings"); + IConsolePrintF(CC_DEFAULT, " X = no houses"); + IConsolePrintF(CC_DEFAULT, " h = hidden"); + IConsolePrintF(CC_DEFAULT, " T = buildable by towns"); + + std::map grfs; + for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) { + const RoadTypeInfo *rti = GetRoadTypeInfo(rt); + if (rti->label == 0) continue; + uint32 grfid = 0; + const GRFFile *grf = rti->grffile[ROTSG_GROUND]; + if (grf != nullptr) { + grfid = grf->grfid; + grfs.emplace(grfid, grf); + } + IConsolePrintF(CC_DEFAULT, " %02u %s %c%c%c%c, Flags: %c%c%c%c%c, GRF: %08X, %s", + (uint) rt, + RoadTypeIsTram(rt) ? "Tram" : "Road", + rti->label >> 24, rti->label >> 16, rti->label >> 8, rti->label, + HasBit(rti->flags, ROTF_CATENARY) ? 'c' : '-', + HasBit(rti->flags, ROTF_NO_LEVEL_CROSSING) ? 'l' : '-', + HasBit(rti->flags, ROTF_NO_HOUSES) ? 'X' : '-', + HasBit(rti->flags, ROTF_HIDDEN) ? 'h' : '-', + HasBit(rti->flags, ROTF_TOWN_BUILD) ? 'T' : '-', + BSWAP32(grfid), + GetStringPtr(rti->strings.name) + ); + } + for (const auto &grf : grfs) { + IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grf.first), grf.second->filename); + } +} + +static void ConDumpRailTypes() +{ + IConsolePrintF(CC_DEFAULT, " Flags:"); + IConsolePrintF(CC_DEFAULT, " c = catenary"); + IConsolePrintF(CC_DEFAULT, " l = no level crossings"); + IConsolePrintF(CC_DEFAULT, " h = hidden"); + IConsolePrintF(CC_DEFAULT, " s = no sprite combine"); + IConsolePrintF(CC_DEFAULT, " a = always allow 90 degree turns"); + IConsolePrintF(CC_DEFAULT, " d = always disallow 90 degree turns"); + + std::map grfs; + for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) { + const RailtypeInfo *rti = GetRailTypeInfo(rt); + if (rti->label == 0) continue; + uint32 grfid = 0; + const GRFFile *grf = rti->grffile[RTSG_GROUND]; + if (grf != nullptr) { + grfid = grf->grfid; + grfs.emplace(grfid, grf); + } + IConsolePrintF(CC_DEFAULT, " %02u %c%c%c%c, Flags: %c%c%c%c%c%c, GRF: %08X, %s", + (uint) rt, + rti->label >> 24, rti->label >> 16, rti->label >> 8, rti->label, + HasBit(rti->flags, RTF_CATENARY) ? 'c' : '-', + HasBit(rti->flags, RTF_NO_LEVEL_CROSSING) ? 'l' : '-', + HasBit(rti->flags, RTF_HIDDEN) ? 'h' : '-', + HasBit(rti->flags, RTF_NO_SPRITE_COMBINE) ? 's' : '-', + HasBit(rti->flags, RTF_ALLOW_90DEG) ? 'a' : '-', + HasBit(rti->flags, RTF_DISALLOW_90DEG) ? 'd' : '-', + BSWAP32(grfid), + GetStringPtr(rti->strings.name) + ); + } + for (const auto &grf : grfs) { + IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grf.first), grf.second->filename); + } +} + +static void ConDumpCargoTypes() +{ + IConsolePrintF(CC_DEFAULT, " Cargo classes:"); + IConsolePrintF(CC_DEFAULT, " p = passenger"); + IConsolePrintF(CC_DEFAULT, " m = mail"); + IConsolePrintF(CC_DEFAULT, " x = express"); + IConsolePrintF(CC_DEFAULT, " a = armoured"); + IConsolePrintF(CC_DEFAULT, " b = bulk"); + IConsolePrintF(CC_DEFAULT, " g = piece goods"); + IConsolePrintF(CC_DEFAULT, " l = liquid"); + IConsolePrintF(CC_DEFAULT, " r = refrigerated"); + IConsolePrintF(CC_DEFAULT, " h = hazardous"); + IConsolePrintF(CC_DEFAULT, " c = covered/sheltered"); + IConsolePrintF(CC_DEFAULT, " S = special"); + + std::map grfs; + for (CargoID i = 0; i < NUM_CARGO; i++) { + const CargoSpec *spec = CargoSpec::Get(i); + if (!spec->IsValid()) continue; + uint32 grfid = 0; + const GRFFile *grf = spec->grffile; + if (grf != nullptr) { + grfid = grf->grfid; + grfs.emplace(grfid, grf); + } + IConsolePrintF(CC_DEFAULT, " %02u Bit: %2u, Label: %c%c%c%c, Callback mask: 0x%02X, Cargo class: %c%c%c%c%c%c%c%c%c%c%c, GRF: %08X, %s", + (uint) i, + spec->bitnum, + spec->label >> 24, spec->label >> 16, spec->label >> 8, spec->label, + spec->callback_mask, + (spec->classes & CC_PASSENGERS) != 0 ? 'p' : '-', + (spec->classes & CC_MAIL) != 0 ? 'm' : '-', + (spec->classes & CC_EXPRESS) != 0 ? 'x' : '-', + (spec->classes & CC_ARMOURED) != 0 ? 'a' : '-', + (spec->classes & CC_BULK) != 0 ? 'b' : '-', + (spec->classes & CC_PIECE_GOODS) != 0 ? 'g' : '-', + (spec->classes & CC_LIQUID) != 0 ? 'l' : '-', + (spec->classes & CC_REFRIGERATED) != 0 ? 'r' : '-', + (spec->classes & CC_HAZARDOUS) != 0 ? 'h' : '-', + (spec->classes & CC_COVERED) != 0 ? 'c' : '-', + (spec->classes & CC_SPECIAL) != 0 ? 'S' : '-', + BSWAP32(grfid), + GetStringPtr(spec->name) + ); + } + for (const auto &grf : grfs) { + IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grf.first), grf.second->filename); + } +} + + +DEF_CONSOLE_CMD(ConDumpInfo) +{ + if (argc != 2) { + IConsoleHelp("Dump debugging information."); + IConsoleHelp("Usage: dump_info roadtypes|railtypes|cargotypes"); + IConsoleHelp(" Show information about road/tram types, rail types or cargo types."); + return true; + } + + if (strcasecmp(argv[1], "roadtypes") == 0) { + ConDumpRoadTypes(); + return true; + } + + if (strcasecmp(argv[1], "railtypes") == 0) { + ConDumpRailTypes(); + return true; + } + + if (strcasecmp(argv[1], "cargotypes") == 0) { + ConDumpCargoTypes(); + return true; + } + + return false; +} + /******************************* * console command registration *******************************/ @@ -2249,4 +2404,6 @@ void IConsoleStdLibRegister() /* NewGRF development stuff */ IConsoleCmdRegister("reload_newgrfs", ConNewGRFReload, ConHookNewGRFDeveloperTool); IConsoleCmdRegister("newgrf_profile", ConNewGRFProfile, ConHookNewGRFDeveloperTool); + + IConsoleCmdRegister("dump_info", ConDumpInfo); } From 516e8633955840b44fd5329d872c9bfcd455012a Mon Sep 17 00:00:00 2001 From: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> Date: Wed, 13 Jan 2021 20:41:37 +0000 Subject: [PATCH 16/47] Cleanup: src/3rdparty/optional was removed, also remove its licensing note. (#8567) --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 2c16855e0a..14104e041a 100644 --- a/README.md +++ b/README.md @@ -207,9 +207,6 @@ See the comments in the source files in `src/3rdparty/md5` for the complete lice The implementations of Posix `getaddrinfo` and `getnameinfo` for OS/2 in `src/3rdparty/os2` are distributed partly under the GNU Lesser General Public License 2.1, and partly under the (3-clause) BSD license. The exact licensing terms can be found in `src/3rdparty/os2/getaddrinfo.c` resp. `src/3rdparty/os2/getnameinfo.c`. -The implementation of C++17 `std::optional` in `src/3rdparty/optional` is licensed under the Boost Software License - Version 1.0. -See `src/3rdparty/optional/LICENSE_1_0.txt` for the complete license text. - ## 4.0 Credits From 4f5990fa26574ad497d4286ab1acdb316619cded Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Thu, 14 Jan 2021 09:08:02 +0000 Subject: [PATCH 17/47] Fix: Remove .sha256 files from macOS builds --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1eb1b525e..53222a8064 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -452,6 +452,10 @@ jobs: make -j$(sysctl -n hw.logicalcpu) package echo "::endgroup::" + # Remove the sha256 files CPack generates; we will do this ourself at + # the end of this workflow. + rm -f bundles/*.sha256 + - name: Install gon env: HOMEBREW_NO_AUTO_UPDATE: 1 From cc5f190cb32af0a09183217984a0a5f09afc2caa Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Thu, 14 Jan 2021 11:26:13 +0100 Subject: [PATCH 18/47] Fix: [Actions] circumvent Windows tar warning about read-only files (#8570) This was already applied on the CI build, but not yet on the release build. --- .github/workflows/release.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53222a8064..6b9acc1e61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -503,6 +503,18 @@ jobs: run: | tar -xf source.tar.gz --strip-components=1 + # "restore-cache" which is done by "run-vcpkg" uses Windows tar. + # A git clone on windows marks a few files as read-only; when Windows tar + # tries to extract the cache over this folder, it fails, despite the files + # being identical. This failure shows up as an warning in the logs. We + # avoid this by simply removing the read-only mark from the git folder. + # In other words: this is a hack! + # See: https://github.com/lukka/run-vcpkg/issues/61 + - name: Remove read-only flag from vcpkg git folder + shell: powershell + run: | + attrib -r "c:\vcpkg\.git\*.*" /s + - name: Prepare vcpkg (with cache) uses: lukka/run-vcpkg@v6 with: From bc8f347ef2386d77e105b336cec9c0242261f9fa Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Thu, 14 Jan 2021 10:13:27 +0000 Subject: [PATCH 19/47] Fix: vcpkg binaries were not being cached on Mac --- .github/workflows/release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b9acc1e61..3191e36d24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -383,18 +383,18 @@ jobs: run: | tar -xf source.tar.gz --strip-components=1 - # The following step can be removed and the default vcpkg installation - # (/usr/local/share/vcpkg) restored when the build VM is updated with a revision of - # vcpkg dating from roughly 01/01/2021 or later. + # The following step can be removed when the build VM is updated with a revision of + # vcpkg dating from roughly 01/01/2021 or later. At that point, `doNotUpdateVcpkg` + # can be set to `true` and the `vcpkgGitCommitId` can be removed. - name: Update vcpkg run: | - cd /tmp - git clone https://github.com/Microsoft/vcpkg + cd /usr/local/share/vcpkg + git fetch --unshallow - name: Prepare vcpkg (with cache) uses: lukka/run-vcpkg@v6 with: - vcpkgDirectory: '/tmp/vcpkg' + vcpkgDirectory: '/usr/local/share/vcpkg' doNotUpdateVcpkg: false vcpkgGitCommitId: 2a42024b53ebb512fb5dd63c523338bf26c8489c vcpkgArguments: 'freetype liblzma lzo' @@ -439,7 +439,7 @@ jobs: cmake ${GITHUB_WORKSPACE} \ -DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \ - -DCMAKE_TOOLCHAIN_FILE=/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \ From 86818e5ae8a170951d00eb0060767c9d1687540c Mon Sep 17 00:00:00 2001 From: glx22 Date: Thu, 14 Jan 2021 18:41:38 +0100 Subject: [PATCH 20/47] Fix #7670: prevent useless pathfinder run for blocked vehicles --- src/roadveh_cmd.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 17c9c39e96..f0c2c8aa4a 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1389,7 +1389,16 @@ again: int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y; Direction new_dir = RoadVehGetSlidingDirection(v, x, y); - if (v->IsFrontEngine() && RoadVehFindCloseTo(v, x, y, new_dir) != nullptr) return false; + if (v->IsFrontEngine() && RoadVehFindCloseTo(v, x, y, new_dir) != nullptr) { + /* We are blocked. */ + v->cur_speed = 0; + if (!v->path.empty()) { + /* Prevent pathfinding rerun as we already know where we are heading to. */ + v->path.tile.push_front(v->tile); + v->path.td.push_front(dir); + } + return false; + } uint32 r = VehicleEnterTile(v, v->tile, x, y); if (HasBit(r, VETS_CANNOT_ENTER)) { From 711723d7387df67b1abe98ca9ed4d7f2bd7de57d Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 14 Jan 2021 18:44:37 +0000 Subject: [PATCH 21/47] Update: Translations from eints norwegian (bokmal): 10 changes by buzzCraft spanish (mexican): 7 changes by absay korean: 1 change by telk5093 indonesian: 30 changes by dimaspaf14 finnish: 1 change by hpiirai catalan: 2 changes by gerardnll portuguese (brazilian): 4 changes by AKANexus polish: 1 change by yazalo --- src/lang/brazilian_portuguese.txt | 4 ++++ src/lang/catalan.txt | 2 ++ src/lang/finnish.txt | 1 + src/lang/indonesian.txt | 38 ++++++++++++++++++++++++------- src/lang/korean.txt | 1 + src/lang/norwegian_bokmal.txt | 10 ++++++++ src/lang/polish.txt | 1 + src/lang/spanish_MX.txt | 13 ++++++----- 8 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 1c471f759e..43f1fe0738 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1441,6 +1441,7 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Manter a barra STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Mantém as ferramentas de construção para pontes, túneis, etc abertas após o uso STR_CONFIG_SETTING_EXPENSES_LAYOUT :Agrupar despesas na janela de financas da companhia: {STRING} STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Define o layout para os gastos da companhia +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Automaticamente remove sinais durante a construção de ferrovias se os sinais estiverem no caminho. Note que isso pode levar a acidentes ferroviários. STR_CONFIG_SETTING_SOUND_TICKER :Notícias: {STRING} STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Toca um som para mensagens resumidas @@ -1605,6 +1606,7 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Posicionamento de árvores: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controla o nascimento aleatório de árvores durante o jogo. Isso pode afetar indústrias que dependem do crescimento de árvores, como serrarias +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Crescer sem espalhar {RED}(afeta serrarias) STR_CONFIG_SETTING_TOOLBAR_POS :Posição da barra de ferramentas principal: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posição horizontal da barra de ferramentas principal no topo da tela @@ -1965,6 +1967,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Entrar n STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Atualizar dados STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Atualiza as informações sobre o servidor +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :{BLACK}Procurar na internet STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Adicionar servidor STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adiciona um servidor à lista que será sempre verificada se existem jogos ocorrendo STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Iniciar servidor @@ -2518,6 +2521,7 @@ STR_TREES_RANDOM_TYPE :{BLACK}Árvores STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Plantar árvores de tipo aleatório, Shift alterna entre construção/preço estimado STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Plantar Aleatoriamente STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Planta árvores aleatoriamente pelo terreno +STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Planta florestas grandes ao arrastar pelo terreno. # Land generation window (SE) STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Gerar Terreno diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index d0b30b28d6..82e9a36b74 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1836,6 +1836,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}Esteu s # Cheat window STR_CHEATS :{WHITE}Trampes STR_CHEATS_TOOLTIP :{BLACK}Les caselles de selecció indiquen si heu fet servir aquesta trampa. +STR_CHEATS_NOTE :{BLACK}Nota: Qualsevol ús d'aquests paràmetres serà enregistrat per la partida guardada STR_CHEAT_MONEY :{LTBLUE}Augmenta els diners de la companyia actual en {CURRENCY_LONG}. STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Juga amb la companyia: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Eruga màgica (treu indústries i altres objectes inamovibles): {ORANGE}{STRING} @@ -3100,6 +3101,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Commuta # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Edita el text del senyal +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centra la vista principal en la senyal. Amb Ctrl+Clic, obre una nova vista centrada en la senyal. STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Vés al proper senyal STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Vés al senyal anterior diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 2a4032b656..d190d715da 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -747,6 +747,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Kumpuilevaa maata STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Ruohikkoa STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Paljasta maata +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Sademetsää STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Peltoja STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Puita STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Kiviä diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 75163bbb99..e1c963abea 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -194,6 +194,7 @@ STR_COLOUR_DEFAULT :Standar STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mil/j STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/jam STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}meter/detik +STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ubin/hari STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}dk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}dk @@ -313,10 +314,14 @@ STR_SORT_BY_RANGE :Jangkauan STR_SORT_BY_POPULATION :Populasi STR_SORT_BY_RATING :Peringkat STR_SORT_BY_NUM_VEHICLES :Jumlah kendaraan +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Total laba tahun lalu STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :Total laba tahun ini STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :Laba rata-rata tahun lalu +STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :Laba rata-rata tahun ini # Group by options for vehicle list +STR_GROUP_BY_NONE :Tidak ada +STR_GROUP_BY_SHARED_ORDERS :Perintah bersama # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Hentikan sementara permainan @@ -742,6 +747,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Daratan terjal STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Daratan berumput STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Lahan kritis +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Hutan hujan STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Ladang STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Pepohonan STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Bebatuan @@ -1445,6 +1451,7 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Menjagakan alat STR_CONFIG_SETTING_EXPENSES_LAYOUT :Kelompokkan pengeluaran perusahaan dalam neraca: {STRING} STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Mendefinisikan tata ruang untuk tetingkap biaya perusahaan STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Secara otomatis menghapus sinyal selama konstruksi rel: {STRING} +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Menghapus sinyal secara otomatis selama konstruksi rel jika sinyal menghalangi. Perhatikan bahwa hal ini berpotensi menyebabkan kecelakaan kereta api. STR_CONFIG_SETTING_SOUND_TICKER :Ticker berita: {STRING} STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Mainkan suara untuk pesanan berita yang diringkas @@ -1562,6 +1569,7 @@ STR_CONFIG_SETTING_ECONOMY_TYPE :Tipe ekonomi: { STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Ekonomi yang lancar membuat perubahan produksi lebih sering, dan dalam langkah yang lebih kecil. Ekonomi beku menghentikan perubahan produksi dan penutupan industri. Pengaturan ini mungkin tidak berpengaruh jika jenis industri disediakan oleh NewGRF. STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Asli STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Halus +STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Beku STR_CONFIG_SETTING_ALLOW_SHARES :Ijinkan pembelian saham perusahaan lain: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Jika diaktifkan, pemain dibolehkan membeli saham suatu perusahaan. Saham hanya bisa dibeli saat perusahaan memasuki umur tertentu STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Usia minimum perusahaan untuk memperdagangkan saham: {STRING} @@ -1683,6 +1691,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Apabila kecepat STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperial (mpj) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metrik (km/j) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/d) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Unit permainan (ubin/hari) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Satuan daya kendaraan: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Apabila daya kendaraan ditampilkan di antarmuka, nyatakan di satuan yang dipilih @@ -1815,6 +1824,7 @@ STR_INTRO_TRANSLATION :{BLACK}Terjemah # Quit window STR_QUIT_CAPTION :{WHITE}Keluar +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Anda yakin ingin keluar dari OpenTTD? STR_QUIT_YES :{BLACK}Ya STR_QUIT_NO :{BLACK}Tidak @@ -1978,6 +1988,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bergabun STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Cek server STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Periksa lagi status server +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :{BLACK}Cari di internet STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Cari di internet untuk server publik STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN :{BLACK}CARI LAN STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Cari jaringan area lokal untuk server @@ -2222,6 +2233,7 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} be STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} mulai mendirikan perusahaan (#{2:NUM}) STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} meninggalkan permainan ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} telah mengganti namanya menjadi {STRING} +STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} memberikan {2:CURRENCY_LONG} kepada {1:STRING} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Server menutup sesi STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Server memulai ulang...{}Tunggulah... STR_NETWORK_MESSAGE_KICKED :*** {STRING} telah dikeluarkan. Alasan: ({STRING}) @@ -2619,6 +2631,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Pilih in # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informasi area daratan +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Pusatkan tampilan utama pada lokasi ubin. Ctrl+Klik membuka viewport baru pada lokasi petak STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Biaya penghancuran: {LTBLUE}tidak ada STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Biaya penghancuran: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Nilai jual kembali: {LTBLUE}{CURRENCY_LONG} @@ -3173,10 +3186,10 @@ STR_GOALS_COMPANY_TITLE :{BLACK}Target p STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Klik pada tujuan untuk mengarahkan pandangan pada tengah industri/kota/kotak. Ctrl+klik untuk membuka jendela baru pada lokasi industri/kota/kotak # Goal question window -STR_GOAL_QUESTION_CAPTION_QUESTION :Pertanyaan -STR_GOAL_QUESTION_CAPTION_INFORMATION :Informasi -STR_GOAL_QUESTION_CAPTION_WARNING :Peringatan -STR_GOAL_QUESTION_CAPTION_ERROR :Kesalahan +STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Pertanyaan +STR_GOAL_QUESTION_CAPTION_INFORMATION :{BLACK}Informasi +STR_GOAL_QUESTION_CAPTION_WARNING :{BLACK}Peringatan +STR_GOAL_QUESTION_CAPTION_ERROR :{YELLOW}Kesalahan ############ Start of Goal Question button list STR_GOAL_QUESTION_BUTTON_CANCEL :Batal @@ -3385,6 +3398,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Jual 25% STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Nama Perusahaan STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Nama Pimpinan +STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Masukkan jumlah uang yang ingin Anda berikan STR_BUY_COMPANY_MESSAGE :{WHITE}Kami mencari perusahaan transporasi untuk mengambil alih perusahaan kami.{}{}Anda ingin membeli {COMPANY} senilai {CURRENCY_LONG}? @@ -3745,7 +3759,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Membuat # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Pandangan utama lokasi pusat kereta api. Klik ganda akan mengikuti kereta di tampilan utama. Ctrl+Click membuka viewport baru pada lokasi kereta +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Pandangan utama lokasi kendaraan. Klik dua kali akan mengikuti kendaraan dalam tampilan utama. Ctrl+Click membuka viewport baru pada lokasi kendaraan STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Tampilan utama pusat di lokasi kapal. Klik ganda akan mengikuti kapal dalam tampilan utama. Ctrl+Click membuka viewport baru di lokasi kapal +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Pandangan utama pusat lokasi pesawat. Klik dua kali akan mengikuti pesawat dalam tampilan utama. Ctrl+Click membuka viewport baru pada lokasi pesawat STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kereta berhenti di depo. CTRL+klik untuk memerintahkan perbaikan saja STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kendaraan berhenti di bengkel. CTRL+klik hanya akan memerintahkan perbaikan di bengkel @@ -3778,7 +3795,11 @@ STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilka STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail pesawat STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi kereta saat ini - klik untuk menghentikan/memulai kereta +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi kendaraan saat ini - klik untuk menghentikan/memulai kendaraan +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Aksi kapal saat ini - klik untuk menghentikan/menjalankan kapal +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi Pesawat saat ini - klik untuk menghentikan/memulai Pesawat +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Tampilan utama pusat pada tujuan pesanan. Ctrl+Click membuka viewport baru pada lokasi tujuan pesanan # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Bongkar/Muat @@ -4742,10 +4763,10 @@ STR_INDUSTRY_NAME_SUGAR_MINE :Tambang Gula ##id 0x6000 STR_SV_EMPTY : STR_SV_UNNAMED :Tanpa nama -STR_SV_TRAIN_NAME :Kereta {COMMA} -STR_SV_ROAD_VEHICLE_NAME :Kendaraan Jalan Raya {COMMA} -STR_SV_SHIP_NAME :Kapal {COMMA} -STR_SV_AIRCRAFT_NAME :Pesawat {COMMA} +STR_SV_TRAIN_NAME :Kereta #{COMMA} +STR_SV_ROAD_VEHICLE_NAME :Kendaraan Jalan Raya #{COMMA} +STR_SV_SHIP_NAME :Kapal #{COMMA} +STR_SV_AIRCRAFT_NAME :Pesawat #{COMMA} STR_SV_STNAME :{STRING} STR_SV_STNAME_NORTH :{STRING} Utara @@ -5047,6 +5068,7 @@ STR_FORMAT_BUOY_NAME :Pelampung {TOWN STR_FORMAT_BUOY_NAME_SERIAL :Pelampung {TOWN} #{COMMA} STR_FORMAT_COMPANY_NUM :(Perusahaan {COMMA}) STR_FORMAT_GROUP_NAME :Kelompok {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA} STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} STR_FORMAT_WAYPOINT_NAME :Waypoint {TOWN} STR_FORMAT_WAYPOINT_NAME_SERIAL :Waypoint {TOWN} #{COMMA} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index a3e3d7d16a..07b4df9b53 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -748,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}거친 땅 STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}잔디 땅 STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}맨 땅 +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}열대우림 STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}들판 STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}나무 STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}바위 diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index c06adf072e..e0b269809b 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -314,8 +314,10 @@ STR_SORT_BY_CARGO_CAPACITY :Lastekapasitet STR_SORT_BY_RANGE :Rekkevidde STR_SORT_BY_POPULATION :Folketall STR_SORT_BY_RATING :Rangering +STR_SORT_BY_NUM_VEHICLES :Antall kjøretøy # Group by options for vehicle list +STR_GROUP_BY_NONE :Ingen # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Sett spillet på pause @@ -741,6 +743,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Utmark STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Gress STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Bart land +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Regnskog STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Jorder STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Trær STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Steiner @@ -1605,6 +1608,8 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineær STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plassering av trær i spillet: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontroll tilfeldige utseender til tre under spillet. Dette kan påvirke industrier som avhenger av trevekst, for eksempel trelast +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Voks men ikke spre{RED}(Ødelegger for sagbruk) +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Voks, men kun i regnskoger STR_CONFIG_SETTING_TOOLBAR_POS :Plassering av hovedverktøylinje: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horisontal posisjon av hoved verktøylinjen på toppen av skjermen @@ -1965,6 +1970,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bli med STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Oppdater tjener STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Oppdater tjenerinfo +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :Søk på internett STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Legg til tjener STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Legger til en tjener til listen som alltid vil bli sjekket for aktive spill. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tjener @@ -2518,6 +2524,7 @@ STR_TREES_RANDOM_TYPE :{BLACK}Trær av STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Plasser trær av tilfeldig type. Shift slår av/på kostnadsestimat STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Tilfeldige trær STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Plasser trær tilfeldig i landskapet +STR_TREES_MODE_FOREST_LG_BUTTON :{BLACK}Skog # Land generation window (SE) STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landskapsgenerering @@ -2594,6 +2601,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Velg ind # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informasjon om landområde +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Sentrer hovedvinduet på lokasjon. Ctrl+Klikk åpner et nytt tilleggsvindu på lokasjonen STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Ryddingskostnad: {LTBLUE}Ikke tilgjengelig STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Ryddingskostnad: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Utbytte når ryddet: {LTBLUE}{CURRENCY_LONG} @@ -3748,6 +3756,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Vis deta STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om skipet STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om luftfartøyet +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt luftfartøy komando - klikk for å stoppe/starte luftfartøyet # Messages in the start stop button in the vehicle view @@ -3976,6 +3985,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Bygg om til {S STR_ORDER_STOP_ORDER :(Stopp) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} +STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(Kan ikke bruke stasjon){POP_COLOUR} {STRING} {STATION} {STRING} STR_ORDER_IMPLICIT :(Ubetinget) diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 7a6468d91a..b4e9ef5a9d 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1127,6 +1127,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Wyboisty teren STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Trawa STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Odsłonięta ziemia +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Las deszczowy STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Pola STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Drzewa STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Skały diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 1b6831d078..434a01acc0 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -639,10 +639,10 @@ STR_PERFORMANCE_DETAIL_TOTAL :{BLACK}Total: STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP :{BLACK}Cuántos vehículos tuvieron ganancias el último año, contando los de carretera, trenes, barcos y aeronaves STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP :{BLACK}Número de estaciones abastecidas recientemente. Las estaciones de tren, paradas de autobuses, aeropuertos y demás se contabilizan aparte, aun si pertenecen a la misma estación STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP :{BLACK}Utilidad del vehículo con menores ingresos (de entre aquellos con más de 2 años) -STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más baja de los pasados 12 trimestres -STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más alta de los pasados 12 trimestres -STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP :{BLACK}Unidades de cargamento entregadas en los pasados cuatro trimestres -STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP :{BLACK}Número de tipos de cargamento entregados en el trimestre pasado +STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más baja de los últimos 12 trimestres +STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más alta de los últimos 12 trimestres +STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP :{BLACK}Unidades de cargamento entregadas en los últimos cuatro trimestres +STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP :{BLACK}Número de tipos de cargamento entregados en el último trimestre STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP :{BLACK}Cantidad de dinero que esta empresa tiene en el banco STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP :{BLACK}Cantidad de dinero que esta empresa ha recibido como préstamo STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP :{BLACK}Total de puntos ganados del máximo posible @@ -748,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Terreno irregular STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Pasto STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Terreno árido +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Selva STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Campos STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Árboles STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Rocas @@ -3120,7 +3121,7 @@ STR_TOWN_POPULATION :{BLACK}Poblaci STR_TOWN_VIEW_TOWN_CAPTION :{WHITE}{TOWN} STR_TOWN_VIEW_CITY_CAPTION :{WHITE}{TOWN} (ciudad) STR_TOWN_VIEW_POPULATION_HOUSES :{BLACK}Habitantes: {ORANGE}{COMMA}{BLACK} Casas: {ORANGE}{COMMA} -STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX :{BLACK}{CARGO_LIST} mes pasado: {ORANGE}{COMMA}{BLACK} máx.: {ORANGE}{COMMA} +STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX :{BLACK}{CARGO_LIST} último mes: {ORANGE}{COMMA}{BLACK} máx.: {ORANGE}{COMMA} STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH :{BLACK}Cargamento necesario para crecimiento: STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL :{ORANGE}{STRING}{RED} requeridos STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER :{ORANGE}{STRING}{BLACK} requerido en invierno @@ -3432,7 +3433,7 @@ STR_INDUSTRY_DIRECTORY_FILTER_NONE :Ninguno # Industry view STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY} -STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Producción mes pasado: +STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Producción último mes: STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transportado) STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la industria. Ctrl+Clic abre una vista aparte STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Nivel de producción: {YELLOW}{COMMA}% From fa60c1f8b94dd5584a5d5331de277ca23a203422 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Thu, 14 Jan 2021 21:53:06 +0100 Subject: [PATCH 22/47] Feature: Choose a sensible window size on a fresh OTTD config file. (#8536) --- src/openttd.cpp | 14 ++++++-------- src/table/misc_settings.ini | 2 +- src/video/allegro_v.cpp | 2 ++ src/video/cocoa/cocoa_v.h | 3 +++ src/video/cocoa/cocoa_v.mm | 11 +++++++++++ src/video/dedicated_v.cpp | 2 ++ src/video/null_v.cpp | 2 ++ src/video/sdl2_v.cpp | 10 ++++++++++ src/video/sdl2_v.h | 4 ++++ src/video/sdl_v.cpp | 2 ++ src/video/video_driver.hpp | 35 ++++++++++++++++++++++++++++++----- src/video/win32_v.cpp | 7 +++++++ src/video/win32_v.h | 3 +++ 13 files changed, 83 insertions(+), 14 deletions(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 9d28a3fe59..352a653bea 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -708,14 +708,12 @@ int openttd_main(int argc, char *argv[]) if (resolution.width != 0) _cur_resolution = resolution; - /* - * The width and height must be at least 1 pixel and width times - * height times bytes per pixel must still fit within a 32 bits - * integer, even for 32 bpp video modes. This way all internal - * drawing routines work correctly. - */ - _cur_resolution.width = ClampU(_cur_resolution.width, 1, UINT16_MAX / 2); - _cur_resolution.height = ClampU(_cur_resolution.height, 1, UINT16_MAX / 2); + /* Limit width times height times bytes per pixel to fit a 32 bit + * integer, This way all internal drawing routines work correctly. + * A resolution that has one component as 0 is treated as a marker to + * auto-detect a good window size. */ + _cur_resolution.width = std::min(_cur_resolution.width, UINT16_MAX / 2u); + _cur_resolution.height = std::min(_cur_resolution.height, UINT16_MAX / 2u); /* Assume the cursor starts within the game as not all video drivers * get an event that the cursor is within the window when it is opened. diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini index edad848165..167f8441c2 100644 --- a/src/table/misc_settings.ini +++ b/src/table/misc_settings.ini @@ -120,7 +120,7 @@ name = ""resolution"" type = SLE_INT length = 2 var = _cur_resolution -def = ""640,480"" +def = ""0,0"" cat = SC_BASIC [SDTG_STR] diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index 9cab0805ea..c3df6c6509 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -417,6 +417,8 @@ const char *VideoDriver_Allegro::Start(const StringList &parm) } _allegro_instance_count++; + this->UpdateAutoResolution(); + install_timer(); install_mouse(); install_keyboard(); diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h index f5d1756407..54ff53d156 100644 --- a/src/video/cocoa/cocoa_v.h +++ b/src/video/cocoa/cocoa_v.h @@ -70,6 +70,9 @@ public: /** Main game loop. */ void GameLoop(); // In event.mm. +protected: + Dimension GetScreenSize() const override; + private: friend class WindowQuartzSubdriver; diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index eae1acbc99..f09920fe20 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -200,6 +200,8 @@ const char *VideoDriver_Cocoa::Start(const StringList &parm) /* Don't create a window or enter fullscreen if we're just going to show a dialog. */ if (!CocoaSetupApplication()) return NULL; + this->UpdateAutoResolution(); + this->orig_res = _cur_resolution; int width = _cur_resolution.width; int height = _cur_resolution.height; @@ -302,6 +304,15 @@ void VideoDriver_Cocoa::EditBoxLostFocus() HandleTextInput(NULL, true); } +/** + * Get the resolution of the main screen. + */ +Dimension VideoDriver_Cocoa::GetScreenSize() const +{ + NSRect frame = [ [ NSScreen mainScreen ] frame ]; + return { static_cast(NSWidth(frame)), static_cast(NSHeight(frame)) }; +} + /** * Handle a change of the display area. */ diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp index 7efd417ce9..d237e2d9e3 100644 --- a/src/video/dedicated_v.cpp +++ b/src/video/dedicated_v.cpp @@ -135,6 +135,8 @@ static FVideoDriver_Dedicated iFVideoDriver_Dedicated; const char *VideoDriver_Dedicated::Start(const StringList &parm) { + this->UpdateAutoResolution(); + int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth(); _dedicated_video_mem = (bpp == 0) ? nullptr : MallocT(_cur_resolution.width * _cur_resolution.height * (bpp / 8)); diff --git a/src/video/null_v.cpp b/src/video/null_v.cpp index 707045040d..49f3941537 100644 --- a/src/video/null_v.cpp +++ b/src/video/null_v.cpp @@ -24,6 +24,8 @@ const char *VideoDriver_Null::Start(const StringList &parm) _set_error_mode(_OUT_TO_STDERR); #endif + this->UpdateAutoResolution(); + this->ticks = GetDriverParamInt(parm, "ticks", 1000); _screen.width = _screen.pitch = _cur_resolution.width; _screen.height = _cur_resolution.height; diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp index dee0ff93d1..f2fbd6d5a5 100644 --- a/src/video/sdl2_v.cpp +++ b/src/video/sdl2_v.cpp @@ -674,6 +674,8 @@ const char *VideoDriver_SDL::Start(const StringList &parm) } if (ret_code < 0) return SDL_GetError(); + this->UpdateAutoResolution(); + GetVideoModes(); if (!CreateMainSurface(_cur_resolution.width, _cur_resolution.height, false)) { return SDL_GetError(); @@ -930,4 +932,12 @@ void VideoDriver_SDL::ReleaseBlitterLock() if (_draw_mutex != nullptr) _draw_mutex->unlock(); } +Dimension VideoDriver_SDL::GetScreenSize() const +{ + SDL_DisplayMode mode; + if (SDL_GetCurrentDisplayMode(0, &mode) != 0) return VideoDriver::GetScreenSize(); + + return { static_cast(mode.w), static_cast(mode.h) }; +} + #endif /* WITH_SDL2 */ diff --git a/src/video/sdl2_v.h b/src/video/sdl2_v.h index c2ac87a062..f0f27df795 100644 --- a/src/video/sdl2_v.h +++ b/src/video/sdl2_v.h @@ -40,6 +40,10 @@ public: void EditBoxLostFocus() override; const char *GetName() const override { return "sdl"; } + +protected: + Dimension GetScreenSize() const override; + private: int PollEvent(); void LoopOnce(); diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index 3fae8e69bf..56068fe44d 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -614,6 +614,8 @@ const char *VideoDriver_SDL::Start(const StringList &parm) } if (ret_code < 0) return SDL_GetError(); + this->UpdateAutoResolution(); + GetVideoModes(); if (!CreateMainSurface(_cur_resolution.width, _cur_resolution.height)) { return SDL_GetError(); diff --git a/src/video/video_driver.hpp b/src/video/video_driver.hpp index 15dd5d0d48..d4e7501342 100644 --- a/src/video/video_driver.hpp +++ b/src/video/video_driver.hpp @@ -12,10 +12,19 @@ #include "../driver.h" #include "../core/geometry_type.hpp" +#include "../core/math_func.hpp" #include +extern std::string _ini_videodriver; +extern std::vector _resolutions; +extern Dimension _cur_resolution; +extern bool _rightclick_emulate; + /** The base of all video drivers. */ class VideoDriver : public Driver { + const uint DEFAULT_WINDOW_WIDTH = 640u; ///< Default window width. + const uint DEFAULT_WINDOW_HEIGHT = 480u; ///< Default window height. + public: /** * Mark a particular area dirty. @@ -102,11 +111,27 @@ public: static VideoDriver *GetInstance() { return static_cast(*DriverFactoryBase::GetActiveDriver(Driver::DT_VIDEO)); } -}; -extern std::string _ini_videodriver; -extern std::vector _resolutions; -extern Dimension _cur_resolution; -extern bool _rightclick_emulate; +protected: + /* + * Get the resolution of the main screen. + */ + virtual Dimension GetScreenSize() const { return { DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT }; } + + /** + * Apply resolution auto-detection and clamp to sensible defaults. + */ + void UpdateAutoResolution() + { + if (_cur_resolution.width == 0 || _cur_resolution.height == 0) { + /* Auto-detect a good resolution. We aim for 75% of the screen size. + * Limit width times height times bytes per pixel to fit a 32 bit + * integer, This way all internal drawing routines work correctly. */ + Dimension res = this->GetScreenSize(); + _cur_resolution.width = ClampU(res.width * 3 / 4, DEFAULT_WINDOW_WIDTH, UINT16_MAX / 2); + _cur_resolution.height = ClampU(res.height * 3 / 4, DEFAULT_WINDOW_HEIGHT, UINT16_MAX / 2); + } + } +}; #endif /* VIDEO_VIDEO_DRIVER_HPP */ diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 29b85985fb..e7e89fd73d 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -1114,6 +1114,8 @@ static FVideoDriver_Win32 iFVideoDriver_Win32; const char *VideoDriver_Win32::Start(const StringList &parm) { + this->UpdateAutoResolution(); + memset(&_wnd, 0, sizeof(_wnd)); RegisterWndClass(); @@ -1343,3 +1345,8 @@ void VideoDriver_Win32::EditBoxLostFocus() SetCompositionPos(_wnd.main_wnd); SetCandidatePos(_wnd.main_wnd); } + +Dimension VideoDriver_Win32::GetScreenSize() const +{ + return { static_cast(GetSystemMetrics(SM_CXSCREEN)), static_cast(GetSystemMetrics(SM_CYSCREEN)) }; +} diff --git a/src/video/win32_v.h b/src/video/win32_v.h index 5c1b20322f..ef02e132e6 100644 --- a/src/video/win32_v.h +++ b/src/video/win32_v.h @@ -40,6 +40,9 @@ public: const char *GetName() const override { return "win32"; } bool MakeWindow(bool full_screen); + +protected: + Dimension GetScreenSize() const override; }; /** The factory for Windows' video driver. */ From 0e62a398c7f03ae0bb75980d97dab3f72ecfb26c Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 14 Jan 2021 23:29:29 +0100 Subject: [PATCH 23/47] Add: [SDL2] video driver parameter to put OpenTTD on a particular display on start. By default use the display where the mouse cursor is. (#8572) --- src/video/sdl2_v.cpp | 28 +++++++++++++++++++++++++--- src/video/sdl2_v.h | 1 + 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp index f2fbd6d5a5..48bd84691f 100644 --- a/src/video/sdl2_v.cpp +++ b/src/video/sdl2_v.cpp @@ -272,10 +272,15 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize) flags |= SDL_WINDOW_FULLSCREEN; } + int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED; + SDL_Rect r; + if (SDL_GetDisplayBounds(this->startup_display, &r) == 0) { + x = r.x + (r.w - w) / 2; + y = r.y + (r.h - h) / 4; // decent desktops have taskbars at the bottom + } _sdl_window = SDL_CreateWindow( caption, - SDL_WINDOWPOS_UNDEFINED, - SDL_WINDOWPOS_UNDEFINED, + x, y, w, h, flags); @@ -674,6 +679,23 @@ const char *VideoDriver_SDL::Start(const StringList &parm) } if (ret_code < 0) return SDL_GetError(); + this->startup_display = GetDriverParamInt(parm, "display", -1); + int num_displays = SDL_GetNumVideoDisplays(); + if (!IsInsideBS(this->startup_display, 0, num_displays)) { + /* Mouse position decides which display to use */ + int mx, my; + SDL_GetGlobalMouseState(&mx, &my); + this->startup_display = 0; // used when mouse is on no screen... + for (int display = 0; display < num_displays; ++display) { + SDL_Rect r; + if (SDL_GetDisplayBounds(display, &r) == 0 && IsInsideBS(mx, r.x, r.w) && IsInsideBS(my, r.y, r.h)) { + DEBUG(driver, 1, "SDL2: Mouse is at (%d, %d), use display %d (%d, %d, %d, %d)", mx, my, display, r.x, r.y, r.w, r.h); + this->startup_display = display; + break; + } + } + } + this->UpdateAutoResolution(); GetVideoModes(); @@ -935,7 +957,7 @@ void VideoDriver_SDL::ReleaseBlitterLock() Dimension VideoDriver_SDL::GetScreenSize() const { SDL_DisplayMode mode; - if (SDL_GetCurrentDisplayMode(0, &mode) != 0) return VideoDriver::GetScreenSize(); + if (SDL_GetCurrentDisplayMode(this->startup_display, &mode) != 0) return VideoDriver::GetScreenSize(); return { static_cast(mode.w), static_cast(mode.h) }; } diff --git a/src/video/sdl2_v.h b/src/video/sdl2_v.h index f0f27df795..de10543b5d 100644 --- a/src/video/sdl2_v.h +++ b/src/video/sdl2_v.h @@ -64,6 +64,7 @@ private: uint32 last_cur_ticks; uint32 next_tick; + int startup_display; std::thread draw_thread; std::unique_lock draw_lock; }; From ce42e819b9a9ad945f73f0668cdceca61e3878f3 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Thu, 14 Jan 2021 13:32:49 +0000 Subject: [PATCH 24/47] Feature: Build macOS build as a universal binary --- .github/workflows/release.yml | 61 ++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3191e36d24..2d05d93258 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -360,15 +360,6 @@ jobs: name: MacOS needs: source - strategy: - fail-fast: false - matrix: - include: - - arch: x64 - full_arch: x86_64 - - arch: arm64 - full_arch: arm64 - runs-on: macos-10.15 env: MACOSX_DEPLOYMENT_TARGET: 10.9 @@ -397,8 +388,7 @@ jobs: vcpkgDirectory: '/usr/local/share/vcpkg' doNotUpdateVcpkg: false vcpkgGitCommitId: 2a42024b53ebb512fb5dd63c523338bf26c8489c - vcpkgArguments: 'freetype liblzma lzo' - vcpkgTriplet: '${{ matrix.arch }}-osx' + vcpkgArguments: 'freetype:x64-osx liblzma:x64-osx lzo:x64-osx freetype:arm64-osx liblzma:arm64-osx lzo:arm64-osx' - name: Build tools run: | @@ -430,15 +420,35 @@ jobs: # If this is run on a fork, there may not be a certificate set up - continue in this case continue-on-error: true - - name: Build + - name: Build arm64 run: | - mkdir build - cd build + mkdir build-arm64 + cd build-arm64 echo "::group::CMake" cmake ${GITHUB_WORKSPACE} \ - -DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \ - -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \ + -DCMAKE_OSX_ARCHITECTURES=arm64 \ + -DVCPKG_TARGET_TRIPLET=arm64-osx \ + -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + # EOF + echo "::endgroup::" + + echo "::group::Build" + echo "Running on $(sysctl -n hw.logicalcpu) cores" + make -j$(sysctl -n hw.logicalcpu) + echo "::endgroup::" + + - name: Build x64 + run: | + mkdir build-x64 + cd build-x64 + + echo "::group::CMake" + cmake ${GITHUB_WORKSPACE} \ + -DCMAKE_OSX_ARCHITECTURES=x86_64 \ + -DVCPKG_TARGET_TRIPLET=x64-osx \ -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -447,6 +457,19 @@ jobs: # EOF echo "::endgroup::" + echo "::group::Build" + echo "Running on $(sysctl -n hw.logicalcpu) cores" + make -j$(sysctl -n hw.logicalcpu) + echo "::endgroup::" + + - name: Build package + run: | + cd build-x64 + + # Combine the `openttd` binaries from each build into a single file + lipo -create -output openttd-universal ../build-*/openttd + mv openttd-universal openttd + echo "::group::Build" echo "Running on $(sysctl -n hw.logicalcpu) cores" make -j$(sysctl -n hw.logicalcpu) package @@ -469,14 +492,14 @@ jobs: AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }} AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }} run: | - cd build + cd build-x64 ../os/macosx/notarize.sh - name: Store bundles uses: actions/upload-artifact@v2 with: - name: openttd-macos-${{ matrix.arch }} - path: build/bundles + name: openttd-macos-universal + path: build-x64/bundles retention-days: 5 windows: From 0a129bc810cddb9f7b684772157ac6e8cbab8297 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Sat, 16 Jan 2021 06:29:28 +0000 Subject: [PATCH 25/47] Change: Label Mac builds as "macos" instead of "macosx" --- cmake/InstallAndPackage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake index 2a735e9dc4..5fb4646e57 100644 --- a/cmake/InstallAndPackage.cmake +++ b/cmake/InstallAndPackage.cmake @@ -101,7 +101,7 @@ if(APPLE) set(CPACK_GENERATOR "Bundle") include(PackageBundle) - set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macosx-${CPACK_SYSTEM_NAME}") + set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}") elseif(WIN32) set(CPACK_GENERATOR "ZIP") if(OPTION_USE_NSIS) From c91a7b5e2e4294bbc489b7a973f4302e05d1bea4 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 16 Jan 2021 18:40:42 +0000 Subject: [PATCH 26/47] Update: Translations from eints norwegian (bokmal): 65 changes by fnutt french: 1 change by glx22 --- src/lang/french.txt | 1 + src/lang/norwegian_bokmal.txt | 79 ++++++++++++++++++++++++++++------- 2 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/lang/french.txt b/src/lang/french.txt index 823145c10f..de7734ad5b 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -748,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Terre en friche STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Herbe STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Terre nue +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Région tropicale STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Champs STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Arbres STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Rochers diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index e0b269809b..abe32294ea 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -196,6 +196,7 @@ STR_COLOUR_DEFAULT :Standard STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mi/t STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/t STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s +STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruter/dag STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hk STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hk @@ -315,9 +316,14 @@ STR_SORT_BY_RANGE :Rekkevidde STR_SORT_BY_POPULATION :Folketall STR_SORT_BY_RATING :Rangering STR_SORT_BY_NUM_VEHICLES :Antall kjøretøy +STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Total profitt i fjor +STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :Total profitt i år +STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :Gjennomsnittlig profitt i fjor +STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :Gjennomsnittlig profitt i år # Group by options for vehicle list STR_GROUP_BY_NONE :Ingen +STR_GROUP_BY_SHARED_ORDERS :Delte ordre # Tooltips for the main toolbar STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Sett spillet på pause @@ -775,6 +781,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Vis alle STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Vis siste melding eller nyhetsrapport STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSE * * +STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * SPILL SATT PÅ PAUSE (venter på koblingsgraf oppdatering) * * STR_STATUSBAR_AUTOSAVE :{RED}AUTOLAGRING STR_STATUSBAR_SAVING_GAME :{RED}* * LAGRER SPILL * * @@ -1316,6 +1323,7 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL :Vis byers innby STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Vis inbyggertallet i byer i tittelfeltet på kartet STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Graflinjenes tykkelse: {STRING} STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Linjebredde i grafene. En tynn linje er mer presis å lese av, mens en tykkere linje er lettere å se, og farger er lettere å skille +STR_CONFIG_SETTING_SHOW_NEWGRF_NAME :Vis NewGRF's navn i kjøretøysbyggevinduet: {STRING} STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT :Legg til en linje i bygg kjøretøy vinduet, som viser hvilken NewGRF det valgte kjøretøyet kommer fra. STR_CONFIG_SETTING_LANDSCAPE :Landskap: {STRING} @@ -1445,6 +1453,8 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :La byggingsverk STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Holde verktøylinjen for bruer, tunneler, osv åpnet etter bruk STR_CONFIG_SETTING_EXPENSES_LAYOUT :Grupper utgifter i firmaets finansvindu: {STRING} STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Definer oppsettet for vinduet som viser selskapets utgifter +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Automatisk fjerne signaler mens jernbane bygges: {STRING} +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Automatisk fjerne signaler mens jernbane bygges dersom signalene er i veien. Vær oppmerksom på at dette kan potensielt lede til togkrasj. STR_CONFIG_SETTING_SOUND_TICKER :Nyhetstavle: {STRING} STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Spille av lyd for oppsummerte nyhetsmeldinger @@ -1558,8 +1568,14 @@ STR_CONFIG_SETTING_ENDING_YEAR :Poengsum ved sl STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT :Året spillet slutter med tanke på poeng. På slutten av dette året, vil firmaets poengsum bli lagret og tavlen med høyeste poengsummer vil vises. Spilleren kan fortsette å spille etter dette.{}Hvis dette er før start året, vil tavlen med høyeste poengsummer aldri vises. STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} STR_CONFIG_SETTING_ENDING_YEAR_ZERO :Aldri +STR_CONFIG_SETTING_ECONOMY_TYPE :Økonomi type: {STRING} +STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Jevn økonomi medfører at produksjonen endres oftere, og i mindre steg. Frossen økonomi stopper produksjon endringer og industri stenges. Denne innstillingen kan ha ingen effekt dersom industri typene er gitt av NewGRF. +STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Original +STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Jevnt +STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Frossen STR_CONFIG_SETTING_ALLOW_SHARES :Tillat aksjekjøp i andre firmaer: {STRING} STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Når aktivert, tillates kjøp og salg av selskapers aksjer. Aksjer vil kun være tilgjengelig selskaper som når en viss alder +STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum alder på firmaet for å handle aksjer: {STRING} STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Sett minimum levetid for et selskap, før andre kan kjøpe og selge aksjer fra dem. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Prosentandel av etappe-overskudd som skal betales i innmatingssystem: {STRING} STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Andel av inntekten gitt til de mellomliggende etapper i et overføringssystem, noe som gir mer kontroll over inntektene @@ -1608,8 +1624,10 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineær STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plassering av trær i spillet: {STRING} STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontroll tilfeldige utseender til tre under spillet. Dette kan påvirke industrier som avhenger av trevekst, for eksempel trelast -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Voks men ikke spre{RED}(Ødelegger for sagbruk) +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Voks men ikke spre{RED}(ødelegger for sagbruk) STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Voks, men kun i regnskoger +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Voks og spre overalt +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Ikke voks, men spre {RED}(ødelegger for sagbruk) STR_CONFIG_SETTING_TOOLBAR_POS :Plassering av hovedverktøylinje: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horisontal posisjon av hoved verktøylinjen på toppen av skjermen @@ -1676,6 +1694,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Når en hastigh STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Det britiske imperiets enhetssystem (mph) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metrisk (km/t) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/s) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Spill deler (ruter/dag) STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Kjøretøys effektenheter: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Når et kjøretøys effekt er vist i brukergrensesnittet, vise det i de valgte enheter @@ -1808,6 +1827,7 @@ STR_INTRO_TRANSLATION :{BLACK}Denne ov # Quit window STR_QUIT_CAPTION :{WHITE}Avslutt +STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på at du vil avslutte OpenTTD? STR_QUIT_YES :{BLACK}Ja STR_QUIT_NO :{BLACK}Nei @@ -1819,6 +1839,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}Er du s # Cheat window STR_CHEATS :{WHITE}Juksekoder STR_CHEATS_TOOLTIP :{BLACK}Avkrysningsbokser indikerer om du har brukt denne juksekoden tidligere +STR_CHEATS_NOTE :{BLACK}Notat: alle endringer i disse innstillingene vil bli lagret i det lagrede spillet STR_CHEAT_MONEY :{LTBLUE}Øk pengebeholdningen med {CURRENCY_LONG} STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Spiller som firma: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk bulldoser (fjern industrier, uflyttbare objekter): {ORANGE}{STRING} @@ -1971,6 +1992,9 @@ STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Oppdater STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Oppdater tjenerinfo STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :Søk på internett +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Søk på internett for offentlige servere +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN :{BLACK}Søk LAN +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Søk lokalt nettverk for servere STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Legg til tjener STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Legger til en tjener til listen som alltid vil bli sjekket for aktive spill. STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tjener @@ -2197,11 +2221,13 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :Spillet er fort STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :Spillet er fortsatt på pause ({STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :Spillet er fortsatt på pause ({STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :Spillet er fortsatt på pause ({STRING}, {STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5 :Spillet er fortsatt på pause ({STRING}, {STRING}, {STRING}, {STRING}, {STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED :Spillet fortsetter ({STRING}) STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :ikke nok spillere STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :kobler til klienter STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :manual STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT :spillskript +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :venter for koblingsgraf oppdatering ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlater STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har blitt med i spillet @@ -2211,8 +2237,10 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} ha STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} har startet et nytt firma (nr. {2:NUM}) STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} har forlatt spillet ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} har forandret sitt navn til {STRING} +STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} ga {2:CURRENCY_LONG} til ditt firma{1:STRING} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Tjeneren avsluttet spillet STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Tjeneren starter på nytt...{}Vennligst vent... +STR_NETWORK_MESSAGE_KICKED :*** {STRING} ble kastet ut. Grunn: ({STRING}) # Content downloading window STR_CONTENT_TITLE :{WHITE}Laster ned innhold @@ -2329,6 +2357,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Slå sam STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Bygg separat kontrollpunkt # Generic toolbar +STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Deaktivert da det ikke er noen kjøretøy tilgjengelig for denne infrastrukturen # Rail construction toolbar STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Bygg jernbane @@ -2524,7 +2553,12 @@ STR_TREES_RANDOM_TYPE :{BLACK}Trær av STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Plasser trær av tilfeldig type. Shift slår av/på kostnadsestimat STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Tilfeldige trær STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Plasser trær tilfeldig i landskapet +STR_TREES_MODE_NORMAL_BUTTON :{BLACK}Normal +STR_TREES_MODE_NORMAL_TOOLTIP :{BLACK}Plant ett og ett tre ved å dra over landskapet. +STR_TREES_MODE_FOREST_SM_BUTTON :{BLACK}Vokse +STR_TREES_MODE_FOREST_SM_TOOLTIP :{BLACK}Plant små skoger ved å dra over landskapet. STR_TREES_MODE_FOREST_LG_BUTTON :{BLACK}Skog +STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Plant store skoger ved å dra over landskapet. # Land generation window (SE) STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landskapsgenerering @@ -3072,6 +3106,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Veksle m # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Skriv inn skilttekst +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på skiltets lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over skiltets lokalisasjon STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Gå til neste skilt STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gå til forrige skilt @@ -3155,10 +3190,10 @@ STR_GOALS_COMPANY_TITLE :{BLACK}Firmaets STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}klikk på mål for å gå til industri/by/rute . Ctrl+klikk åpner et nytt tilleggsvindu over industriens/byens/rutens beliggenhet # Goal question window -STR_GOAL_QUESTION_CAPTION_QUESTION :Spørsmål -STR_GOAL_QUESTION_CAPTION_INFORMATION :Informasjon -STR_GOAL_QUESTION_CAPTION_WARNING :Advarsel -STR_GOAL_QUESTION_CAPTION_ERROR :Feil +STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Spørsmål +STR_GOAL_QUESTION_CAPTION_INFORMATION :{BLACK}Informasjon +STR_GOAL_QUESTION_CAPTION_WARNING :{BLACK}Advarsel +STR_GOAL_QUESTION_CAPTION_ERROR :{YELLOW}Feil ############ Start of Goal Question button list STR_GOAL_QUESTION_BUTTON_CANCEL :Avbryt @@ -3283,7 +3318,7 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}Hindre f STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Gå til kontrollpunkt. Ctrl+klikk åpner et nytt tilleggsvindu over kontrollpunktet STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Endre kontrollpunktets navn -STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Gå til bøye. Ctrl+klikk åpner et nytt tilleggsvindu over bøyen +STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på bøyens lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over bøyens lokalisasjon STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Endre navn på bøye STR_EDIT_WAYPOINT_NAME :{WHITE}Endre navn på kontrollpunkt @@ -3348,6 +3383,8 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Flytt fi STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Gjenoppbygg (flytt) firmaets hovedkontor et annet sted til en kostnad av 1{NBSP}% av firmaverdien. Shift+klikk viser beregnet kostnad uten å flytte kontoret STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detaljer STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Vis detaljert infrastrukturtelling +STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Gi penger +STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Gi penger til dette firmaet STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt ansikt STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Velg nytt ansikt på sjefen @@ -3365,6 +3402,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Selg 25{ STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Firmanavn STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Sjefens navn +STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Skriv inn hvor mye penger du vil gi STR_BUY_COMPANY_MESSAGE :{WHITE}Vi ser etter et transportfirma som er villig til å overta oss.{}{}Vil du kjøpe {COMPANY} for {CURRENCY_LONG}? @@ -3632,10 +3670,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Dette vi STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Dette vil skape en kopi av et skip. Klikk denne knappen og deretter på et skip utenfor eller inni skipsdokken. Ctrl+klikk vil dele ordrene. Shift+klikk viser estimert kostnad STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vil skape en kopi av et luftfartøy. Klikk denne knappen og deretter på et luftfartøy utenfor eller inni hangaren. Ctrl+klikk vil dele ordrene. Shift+klikk viser estimert kostnad -STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Gå til togstall. Ctrl+klikk åpner et nytt tilleggsvindu over togstallen -STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Gå til garasje. Ctrl+klikk åpner et nytt tilleggsvindu over garasjen -STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Gå til skipsdokk. Ctrl+klikk åpner et nytt tilleggsvindu over skipsdokken -STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Gå til hangar. Ctrl+klikk åpner et nytt tilleggsvindu over hangaren +STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på togstallens lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over togstallens lokalisasjon +STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på vegkjøretøyets garasje lokalisasjon. Dobbelklikk for å følge kjøretøyet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over vegkjøretøyets garasje lokalisasjon +STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på skipsdokken lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over skipsdokkens lokalisasjon +STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på hangar lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over hangarens lokalisasjon STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Få en liste over alle tog med denne togstallen i sine ordre STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Få en liste over alle kjøretøy med denne garasjen i sine ordre @@ -3725,6 +3763,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}La autoe # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på togets lokalisasjon. Dobbelklikk for å følge toget i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over togets lokalisasjon +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på kjøretøyets lokalisasjon. Dobbelklikk for å følge kjøretøyet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over kjøretøyets lokalisasjon +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på skipets lokalisasjon. Dobbelklikk for å følge skipet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over skipets lokalisasjon +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på flyets lokalisasjon. Dobbelklikk for å følge flyet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over flyets lokalisasjon STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til en togstall. Ctrl+klikk for kun å utføre vedlikehold STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send kjøretøyet til en garasje. Ctrl+klikk for kun å utføre vedlikehold @@ -3756,8 +3798,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Vis deta STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om skipet STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om luftfartøyet +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt tog handling - klikk for å stoppe/starte toget +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt kjøretøy handling - klikk for å stoppe/starte kjøretøyet +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Valgt skip handling - klikk for å stoppe/starte skip STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt luftfartøy komando - klikk for å stoppe/starte luftfartøyet +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på ordrens lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over ordrens lokalisasjon # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laster / Losser @@ -4231,6 +4277,7 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Spillet er lagr STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Kan ikke lese filen STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Kan ikke skrive til filen STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Integritetssjekk av data mislyktes +STR_GAME_SAVELOAD_ERROR_PATCHPACK :Lagret spill er laget med en modifisert versjon STR_GAME_SAVELOAD_NOT_AVAILABLE : STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Spillet ble lagret i en versjon uten støtte for trikk. Alle trikker har blitt fjernet. @@ -4311,6 +4358,7 @@ STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... inge STR_ERROR_CURRENCY_REQUIRED :{WHITE}... du trenger {CURRENCY_LONG} STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Kan ikke betale tilbake lån... STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}Kan ikke gi bort penger som er lånt fra banken... +STR_ERROR_CAN_T_GIVE_MONEY :{WHITE}Kan ikke gi bort penger til dette firmaet... STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Kan ikke kjøpe firma... STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Kan ikke bygge firmaets hovedkontor... STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan ikke kjøpe 25{NBSP}% av aksjene... @@ -4437,6 +4485,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Feil type garas STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} er for langt etter utskiftning STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Ingen autoerstatt/fornyelseregler satt. STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(pengegrense) +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Nytt kjøretøy kan ikke frakte {STRING} +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Nytt kjøretøy kan ikke bygges på nytt {NUM} # Rail construction errors STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Umulig sporkombinasjon @@ -4718,10 +4768,10 @@ STR_INDUSTRY_NAME_SUGAR_MINE :{G=feminine}Suk ##id 0x6000 STR_SV_EMPTY : STR_SV_UNNAMED :Uten navn -STR_SV_TRAIN_NAME :Tog {COMMA} -STR_SV_ROAD_VEHICLE_NAME :Kjøretøy {COMMA} -STR_SV_SHIP_NAME :Skip {COMMA} -STR_SV_AIRCRAFT_NAME :Luftfartøy {COMMA} +STR_SV_TRAIN_NAME :Tog #{COMMA} +STR_SV_ROAD_VEHICLE_NAME :Vegkjøretøy #{COMMA} +STR_SV_SHIP_NAME :Skip #{COMMA} +STR_SV_AIRCRAFT_NAME :Luftfartøy #{COMMA} STR_SV_STNAME :{STRING} STR_SV_STNAME_NORTH :{STRING} nord @@ -5023,6 +5073,7 @@ STR_FORMAT_BUOY_NAME :{TOWN} Bøye STR_FORMAT_BUOY_NAME_SERIAL :{TOWN} Bøye #{COMMA} STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_FORMAT_GROUP_NAME :Gruppe {COMMA} +STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA} STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} STR_FORMAT_WAYPOINT_NAME :{TOWN} Kontrollpunkt STR_FORMAT_WAYPOINT_NAME_SERIAL :{TOWN} Kontrollpunkt # {COMMA} From 540fdfbf5a8a6bd7fcdf28d62681c1666b66c870 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 16 Jan 2021 23:36:15 +0100 Subject: [PATCH 27/47] Fix 0e62a398c7f: Only center the window, when it is smaller than the screen. (#8581) --- src/video/sdl2_v.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp index 48bd84691f..685610d2c8 100644 --- a/src/video/sdl2_v.cpp +++ b/src/video/sdl2_v.cpp @@ -275,8 +275,8 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize) int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED; SDL_Rect r; if (SDL_GetDisplayBounds(this->startup_display, &r) == 0) { - x = r.x + (r.w - w) / 2; - y = r.y + (r.h - h) / 4; // decent desktops have taskbars at the bottom + x = r.x + std::max(0, r.w - static_cast(w)) / 2; + y = r.y + std::max(0, r.h - static_cast(h)) / 4; // decent desktops have taskbars at the bottom } _sdl_window = SDL_CreateWindow( caption, From 120c6fda61b631cfa68e6b13b53cdb5f29f5e9b6 Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 17 Jan 2021 18:39:39 +0000 Subject: [PATCH 28/47] Update: Translations from eints catalan: 11 changes by J0anJosep --- src/lang/catalan.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 82e9a36b74..926ee9f55f 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -748,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Terreny irregular STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Gespa STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Terreny erm +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Selva tropical STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Camps de conreu STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Arbres STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Roques @@ -2631,6 +2632,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Seleccio # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informació del terreny +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc on està la casella. Amb Ctrl+clic s'obre una vista nova al lloc de la casella. STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Cost de neteja: {LTBLUE}N/A STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Cost de neteja: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Ingressos en netejar: {LTBLUE}{CURRENCY_LONG} @@ -3758,6 +3760,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fer que # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està el tren. Si feu doble clic, se'l seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està el tren. +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està el vehicle. Si feu doble clic, se'l seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està el vehicle. +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està el vaixell. Si feu doble clic, se'l seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està el vaixell. +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està l'aeronau. Si feu doble clic, se la seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està l'aeronau. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia el tren a cotxera STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia el vehicle a cotxera @@ -3789,7 +3795,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra e STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra els detalls del vaixell STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra els detalls de l'avió +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Acció actual del tren - Feu clic per parar-lo o engegar-lo. +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Acció actual del vehicle - Feu clic per parar-lo o engegar-lo. +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Acció actual del vaixell - Feu clic per parar-lo o engegar-lo. +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Acció actual de l'aeronau - Feu clic per parar-la o engegar-la. +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centra la vista principal a la destinació de l'ordre. Amb Ctrl+clic s'obre una vista nova al lloc de la destinació de l'ordre. # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Carregant / Descarregant From 40d5fe1631ca59080ec7001b621526cbc9a26504 Mon Sep 17 00:00:00 2001 From: Matt Kimber Date: Sun, 17 Jan 2021 18:57:16 +0000 Subject: [PATCH 29/47] Fix eeb88e8: Trains reversed while paused do not correctly update sprite bounds (#8540) --- src/saveload/vehicle_sl.cpp | 1 + src/ship_cmd.cpp | 2 + src/vehicle.cpp | 120 +++++++++++++++++++++--------------- src/vehicle_base.h | 24 ++++---- src/viewport.cpp | 24 +++++--- src/viewport_func.h | 2 +- 6 files changed, 105 insertions(+), 68 deletions(-) diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 6715eb97de..94bc37fb8a 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -470,6 +470,7 @@ void AfterLoadVehicles(bool part_of_load) v->UpdateDeltaXY(); v->coord.left = INVALID_COORD; + v->sprite_cache.old_coord.left = INVALID_COORD; v->UpdatePosition(); v->UpdateViewport(false); } diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index e839941cfd..825321e104 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -646,6 +646,8 @@ static void ShipController(Ship *v) if ((v->tick_counter & 7) == 0) { DirDiff diff = DirDifference(v->direction, v->rotation); v->rotation = ChangeDir(v->rotation, diff > DIRDIFF_REVERSE ? DIRDIFF_45LEFT : DIRDIFF_45RIGHT); + /* Invalidate the sprite cache direction to force recalculation of viewport */ + v->sprite_cache.last_direction = INVALID_DIR; v->UpdateViewport(true, true); } return; diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 17e843255b..21d02f1816 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -346,6 +346,7 @@ Vehicle::Vehicle(VehicleType type) { this->type = type; this->coord.left = INVALID_COORD; + this->sprite_cache.old_coord.left = INVALID_COORD; this->group_id = DEFAULT_GROUP; this->fill_percent_te_id = INVALID_TE_ID; this->first = this; @@ -643,11 +644,9 @@ static void UpdateVehicleTileHash(Vehicle *v, bool remove) static Vehicle *_vehicle_viewport_hash[1 << (GEN_HASHX_BITS + GEN_HASHY_BITS)]; -static void UpdateVehicleViewportHash(Vehicle *v, int x, int y) +static void UpdateVehicleViewportHash(Vehicle *v, int x, int y, int old_x, int old_y) { Vehicle **old_hash, **new_hash; - int old_x = v->coord.left; - int old_y = v->coord.top; new_hash = (x == INVALID_COORD) ? nullptr : &_vehicle_viewport_hash[GEN_HASH(x, y)]; old_hash = (old_x == INVALID_COORD) ? nullptr : &_vehicle_viewport_hash[GEN_HASH(old_x, old_y)]; @@ -881,7 +880,7 @@ Vehicle::~Vehicle() delete v; UpdateVehicleTileHash(this, true); - UpdateVehicleViewportHash(this, INVALID_COORD, 0); + UpdateVehicleViewportHash(this, INVALID_COORD, 0, this->sprite_cache.old_coord.left, this->sprite_cache.old_coord.top); DeleteVehicleNews(this->index, INVALID_STRING_ID); DeleteNewGRFInspectWindow(GetGrfSpecFeature(this->type), this->index); } @@ -1091,17 +1090,6 @@ static void DoDrawVehicle(const Vehicle *v) if (to != TO_INVALID && (IsTransparencySet(to) || IsInvisibilitySet(to))) return; } - /* - * If the vehicle sprite was not updated despite further viewport changes, we need - * to update it before drawing. - */ - if (v->sprite_cache.sprite_has_viewport_changes) { - VehicleSpriteSeq seq; - v->GetImage(v->direction, EIT_ON_MAP, &seq); - v->sprite_cache.sprite_seq = seq; - v->sprite_cache.sprite_has_viewport_changes = false; - } - StartSpriteCombine(); for (uint i = 0; i < v->sprite_cache.sprite_seq.count; ++i) { PaletteID pal2 = v->sprite_cache.sprite_seq.seq[i].pal; @@ -1156,30 +1144,42 @@ void ViewportAddVehicles(DrawPixelInfo *dpi) while (v != nullptr) { if (!(v->vehstatus & VS_HIDDEN) && - l <= v->coord.right && - t <= v->coord.bottom && - r >= v->coord.left && - b >= v->coord.top) { - DoDrawVehicle(v); - } - else if (l <= v->coord.right + xb && + l <= v->coord.right + xb && t <= v->coord.bottom + yb && r >= v->coord.left - xb && b >= v->coord.top - yb) { /* - * Indicate that this vehicle was considered for rendering in a viewport, - * is within the bounds where a sprite could be valid for rendering - * and we therefore need to update sprites more frequently in case a callback - * will change the bounding box to one which will cause the sprite to be - * displayed. - * - * This reduces the chances of flicker when sprites enter the screen, if they - * are part of a newgrf vehicle set which changes bounding boxes within a - * single vehicle direction. + * This vehicle can potentially be drawn as part of this viewport and + * needs to be revalidated, as the sprite may not be correct. */ - v->sprite_cache.is_viewport_candidate = true; - } + if (v->sprite_cache.revalidate_before_draw) { + VehicleSpriteSeq seq; + v->GetImage(v->direction, EIT_ON_MAP, &seq); + + if (seq.IsValid() && v->sprite_cache.sprite_seq != seq) { + v->sprite_cache.sprite_seq = seq; + /* + * A sprite change may also result in a bounding box change, + * so we need to update the bounding box again before we + * check to see if the vehicle should be drawn. Note that + * we can't interfere with the viewport hash at this point, + * so we keep the original hash on the assumption there will + * not be a significant change in the top and left coordinates + * of the vehicle. + */ + v->UpdateBoundingBoxCoordinates(false); + + } + + v->sprite_cache.revalidate_before_draw = false; + } + + if (l <= v->coord.right && + t <= v->coord.bottom && + r >= v->coord.left && + b >= v->coord.top) DoDrawVehicle(v); + } v = v->hash_viewport_next; } @@ -1598,11 +1598,10 @@ void Vehicle::UpdatePosition() } /** - * Update the vehicle on the viewport, updating the right hash and setting the - * new coordinates. - * @param dirty Mark the (new and old) coordinates of the vehicle as dirty. - */ -void Vehicle::UpdateViewport(bool dirty) + * Update the bounding box co-ordinates of the vehicle + * @param update_cache Update the cached values for previous co-ordinate values +*/ +void Vehicle::UpdateBoundingBoxCoordinates(bool update_cache) const { Rect new_coord; this->sprite_cache.sprite_seq.GetBounds(&new_coord); @@ -1613,20 +1612,44 @@ void Vehicle::UpdateViewport(bool dirty) new_coord.right += pt.x + 2 * ZOOM_LVL_BASE; new_coord.bottom += pt.y + 2 * ZOOM_LVL_BASE; - UpdateVehicleViewportHash(this, new_coord.left, new_coord.top); + if (update_cache) { + /* + * If the old coordinates are invalid, set the cache to the new coordinates for correct + * behaviour the next time the coordinate cache is checked. + */ + this->sprite_cache.old_coord = this->coord.left == INVALID_COORD ? new_coord : this->coord; + } + else { + /* Extend the bounds of the existing cached bounding box so the next dirty window is correct */ + this->sprite_cache.old_coord.left = std::min(this->sprite_cache.old_coord.left, this->coord.left); + this->sprite_cache.old_coord.top = std::min(this->sprite_cache.old_coord.top, this->coord.top); + this->sprite_cache.old_coord.right = std::max(this->sprite_cache.old_coord.right, this->coord.right); + this->sprite_cache.old_coord.bottom = std::max(this->sprite_cache.old_coord.bottom, this->coord.bottom); + } - Rect old_coord = this->coord; this->coord = new_coord; +} + +/** + * Update the vehicle on the viewport, updating the right hash and setting the new coordinates. + * @param dirty Mark the (new and old) coordinates of the vehicle as dirty. + */ +void Vehicle::UpdateViewport(bool dirty) +{ + Rect old_coord = this->sprite_cache.old_coord; + + this->UpdateBoundingBoxCoordinates(true); + UpdateVehicleViewportHash(this, this->coord.left, this->coord.top, old_coord.left, old_coord.top); if (dirty) { if (old_coord.left == INVALID_COORD) { - this->MarkAllViewportsDirty(); + this->sprite_cache.is_viewport_candidate = this->MarkAllViewportsDirty(); } else { - ::MarkAllViewportsDirty( - std::min(old_coord.left, this->coord.left), - std::min(old_coord.top, this->coord.top), - std::max(old_coord.right, this->coord.right), - std::max(old_coord.bottom, this->coord.bottom)); + this->sprite_cache.is_viewport_candidate = ::MarkAllViewportsDirty( + std::min(this->sprite_cache.old_coord.left, this->coord.left), + std::min(this->sprite_cache.old_coord.top, this->coord.top), + std::max(this->sprite_cache.old_coord.right, this->coord.right), + std::max(this->sprite_cache.old_coord.bottom, this->coord.bottom)); } } } @@ -1642,10 +1665,11 @@ void Vehicle::UpdatePositionAndViewport() /** * Marks viewports dirty where the vehicle's image is. + * @return true if at least one viewport has a dirty block */ -void Vehicle::MarkAllViewportsDirty() const +bool Vehicle::MarkAllViewportsDirty() const { - ::MarkAllViewportsDirty(this->coord.left, this->coord.top, this->coord.right, this->coord.bottom); + return ::MarkAllViewportsDirty(this->coord.left, this->coord.top, this->coord.right, this->coord.bottom); } /** diff --git a/src/vehicle_base.h b/src/vehicle_base.h index 24facfb3e4..f80faf1e39 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -186,10 +186,11 @@ struct VehicleSpriteSeq { * or calculating the viewport. */ struct MutableSpriteCache { - Direction last_direction; ///< Last direction we obtained sprites for - bool is_viewport_candidate; ///< The vehicle has been in the hash for a shown viewport recently - bool sprite_has_viewport_changes; ///< There have been viewport changes since the sprite was last updated - VehicleSpriteSeq sprite_seq; ///< Vehicle appearance. + Direction last_direction; ///< Last direction we obtained sprites for + bool revalidate_before_draw; ///< We need to do a GetImage() and check bounds before drawing this sprite + Rect old_coord; ///< Co-ordinates from the last valid bounding box + bool is_viewport_candidate; ///< This vehicle can potentially be drawn on a viewport + VehicleSpriteSeq sprite_seq; ///< Vehicle appearance. }; /** A vehicle pool for a little over 1 million vehicles. */ @@ -251,7 +252,7 @@ public: CargoPayment *cargo_payment; ///< The cargo payment we're currently in - Rect coord; ///< NOSAVE: Graphical bounding box of the vehicle, i.e. what to redraw on moves. + mutable Rect coord; ///< NOSAVE: Graphical bounding box of the vehicle, i.e. what to redraw on moves. Vehicle *hash_viewport_next; ///< NOSAVE: Next vehicle in the visual location hash. Vehicle **hash_viewport_prev; ///< NOSAVE: Previous vehicle in the visual location hash. @@ -768,8 +769,9 @@ public: void UpdatePosition(); void UpdateViewport(bool dirty); + void UpdateBoundingBoxCoordinates(bool update_cache) const; void UpdatePositionAndViewport(); - void MarkAllViewportsDirty() const; + bool MarkAllViewportsDirty() const; inline uint16 GetServiceInterval() const { return this->service_interval; } @@ -1206,14 +1208,14 @@ struct SpecializedVehicle : public Vehicle { } this->sprite_cache.last_direction = this->direction; - this->sprite_cache.is_viewport_candidate = false; - this->sprite_cache.sprite_has_viewport_changes = false; + this->sprite_cache.revalidate_before_draw = false; } else { /* - * Changes could still be relevant when we render the vehicle even if - * they don't alter the bounding box + * A change that could potentially invalidate the sprite has been + * made, signal that we should still resolve it before drawing on a + * viewport. */ - this->sprite_cache.sprite_has_viewport_changes = true; + this->sprite_cache.revalidate_before_draw = true; } if (force_update || sprite_has_changed) { diff --git a/src/viewport.cpp b/src/viewport.cpp index 8fd6f373fb..44ff37c741 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -179,7 +179,7 @@ struct ViewportDrawer { Point foundation_offset[FOUNDATION_PART_END]; ///< Pixel offset for ground sprites on the foundations. }; -static void MarkViewportDirty(const Viewport *vp, int left, int top, int right, int bottom); +static bool MarkViewportDirty(const Viewport *vp, int left, int top, int right, int bottom); static ViewportDrawer _vd; @@ -1903,27 +1903,28 @@ void UpdateViewportPosition(Window *w) * @param top Top edge of area to repaint * @param right Right edge of area to repaint * @param bottom Bottom edge of area to repaint + * @return true if the viewport contains a dirty block * @ingroup dirty */ -static void MarkViewportDirty(const Viewport *vp, int left, int top, int right, int bottom) +static bool MarkViewportDirty(const Viewport *vp, int left, int top, int right, int bottom) { /* Rounding wrt. zoom-out level */ right += (1 << vp->zoom) - 1; bottom += (1 << vp->zoom) - 1; right -= vp->virtual_left; - if (right <= 0) return; + if (right <= 0) return false; bottom -= vp->virtual_top; - if (bottom <= 0) return; + if (bottom <= 0) return false; left = std::max(0, left - vp->virtual_left); - if (left >= vp->virtual_width) return; + if (left >= vp->virtual_width) return false; top = std::max(0, top - vp->virtual_top); - if (top >= vp->virtual_height) return; + if (top >= vp->virtual_height) return false; AddDirtyBlock( UnScaleByZoomLower(left, vp->zoom) + vp->left, @@ -1931,6 +1932,8 @@ static void MarkViewportDirty(const Viewport *vp, int left, int top, int right, UnScaleByZoom(right, vp->zoom) + vp->left + 1, UnScaleByZoom(bottom, vp->zoom) + vp->top + 1 ); + + return true; } /** @@ -1939,18 +1942,23 @@ static void MarkViewportDirty(const Viewport *vp, int left, int top, int right, * @param top Top edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_NORMAL) * @param right Right edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_NORMAL) * @param bottom Bottom edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_NORMAL) + * @return true if at least one viewport has a dirty block * @ingroup dirty */ -void MarkAllViewportsDirty(int left, int top, int right, int bottom) +bool MarkAllViewportsDirty(int left, int top, int right, int bottom) { + bool dirty = false; + Window *w; FOR_ALL_WINDOWS_FROM_BACK(w) { Viewport *vp = w->viewport; if (vp != nullptr) { assert(vp->width != 0); - MarkViewportDirty(vp, left, top, right, bottom); + if (MarkViewportDirty(vp, left, top, right, bottom)) dirty = true; } } + + return dirty; } void ConstrainAllViewportsZoom() diff --git a/src/viewport_func.h b/src/viewport_func.h index 466a24a3b3..9461f3df5e 100644 --- a/src/viewport_func.h +++ b/src/viewport_func.h @@ -27,7 +27,7 @@ Point TranslateXYToTileCoord(const Viewport *vp, int x, int y, bool clamp_to_map Point GetTileBelowCursor(); void UpdateViewportPosition(Window *w); -void MarkAllViewportsDirty(int left, int top, int right, int bottom); +bool MarkAllViewportsDirty(int left, int top, int right, int bottom); bool DoZoomInOutWindow(ZoomStateChange how, Window *w); void ZoomInOrOutToCursorWindow(bool in, Window * w); From 7415964a4df4ff1618fdc251401c208112aa0b40 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Sat, 16 Jan 2021 16:31:08 +0100 Subject: [PATCH 30/47] Codechange: [Win32] Remove Windows 95 specific mouse tracking work-around. --- src/video/win32_v.cpp | 49 +++++++------------------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index e7e89fd73d..a9dbd8589c 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -39,9 +39,6 @@ #define PM_QS_INPUT 0x20000 #endif -typedef BOOL (WINAPI *PFNTRACKMOUSEEVENT)(LPTRACKMOUSEEVENT lpEventTrack); -static PFNTRACKMOUSEEVENT _pTrackMouseEvent = nullptr; - static struct { HWND main_wnd; ///< Handle to system window. HBITMAP dib_sect; ///< System bitmap object referencing our rendering buffer. @@ -229,31 +226,6 @@ int RedrawScreenDebug() } #endif -/* Windows 95 will not have a WM_MOUSELEAVE message, so define it if needed */ -#if !defined(WM_MOUSELEAVE) -#define WM_MOUSELEAVE 0x02A3 -#endif -#define TID_POLLMOUSE 1 -#define MOUSE_POLL_DELAY 75 - -static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT_PTR event, DWORD time) -{ - RECT rc; - POINT pt; - - /* Get the rectangle of our window and translate it to screen coordinates. - * Compare this with the current screen coordinates of the mouse and if it - * falls outside of the area or our window we have left the window. */ - GetClientRect(hwnd, &rc); - MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT)(LPRECT)&rc, 2); - GetCursorPos(&pt); - - if (!PtInRect(&rc, pt) || (WindowFromPoint(pt) != hwnd)) { - KillTimer(hwnd, event); - PostMessage(hwnd, WM_MOUSELEAVE, 0, 0L); - } -} - /** * Instantiate a new window. * @param full_screen Whether to make a full screen window or not. @@ -633,7 +605,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP switch (msg) { case WM_CREATE: - SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, TrackMouseTimerProc); + _cursor.in_window = false; // Win32 has mouse tracking. SetCompositionPos(hwnd); _imm_props = ImmGetProperty(GetKeyboardLayout(0), IGP_PROPERTY); break; @@ -730,16 +702,12 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP * tracking the mouse for exiting the window */ if (!_cursor.in_window) { _cursor.in_window = true; - if (_pTrackMouseEvent != nullptr) { - TRACKMOUSEEVENT tme; - tme.cbSize = sizeof(tme); - tme.dwFlags = TME_LEAVE; - tme.hwndTrack = hwnd; - - _pTrackMouseEvent(&tme); - } else { - SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, TrackMouseTimerProc); - } + TRACKMOUSEEVENT tme; + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + + TrackMouseEvent(&tme); } if (_cursor.fix_at) { @@ -1024,9 +992,6 @@ static void RegisterWndClass() registered = true; if (!RegisterClass(&wnd)) usererror("RegisterClass failed"); - - /* Dynamically load mouse tracking, as it doesn't exist on Windows 95. */ - _pTrackMouseEvent = (PFNTRACKMOUSEEVENT)GetProcAddress(GetModuleHandle(_T("User32")), "TrackMouseEvent"); } } From 689404a4a1ca91d33ad78875a66bf7b0821f2f4f Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 16 Jan 2021 15:27:13 +0100 Subject: [PATCH 31/47] Codechange: [Win32] Use return-early in RegisterWndClass() --- src/video/win32_v.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index a9dbd8589c..57a481bd8f 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -975,24 +975,24 @@ static void RegisterWndClass() { static bool registered = false; - if (!registered) { - HINSTANCE hinst = GetModuleHandle(nullptr); - WNDCLASS wnd = { - CS_OWNDC, - WndProcGdi, - 0, - 0, - hinst, - LoadIcon(hinst, MAKEINTRESOURCE(100)), - LoadCursor(nullptr, IDC_ARROW), - 0, - 0, - _T("OTTD") - }; - - registered = true; - if (!RegisterClass(&wnd)) usererror("RegisterClass failed"); - } + if (registered) return; + + HINSTANCE hinst = GetModuleHandle(nullptr); + WNDCLASS wnd = { + CS_OWNDC, + WndProcGdi, + 0, + 0, + hinst, + LoadIcon(hinst, MAKEINTRESOURCE(100)), + LoadCursor(nullptr, IDC_ARROW), + 0, + 0, + _T("OTTD") + }; + + registered = true; + if (!RegisterClass(&wnd)) usererror("RegisterClass failed"); } static bool AllocateDibSection(int w, int h, bool force) From 881d17d8f1e48949e62326ed112fc45d861c3aa6 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 17 Jan 2021 15:41:54 +0100 Subject: [PATCH 32/47] Codechange: [Win32] use CSleep() instead of Sleep() like everywhere else Functional it is identical. Just helps future-us when searching for sleeps. --- src/video/win32_v.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 57a481bd8f..2f464fae23 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -1241,7 +1241,7 @@ void VideoDriver_Win32::MainLoop() /* Release the thread while sleeping */ if (_draw_threaded) draw_lock.unlock(); - Sleep(1); + CSleep(1); if (_draw_threaded) draw_lock.lock(); NetworkDrawChatMessage(); From 49df9c415595a7aa104ff5463372118ec874a4c2 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 17 Jan 2021 15:43:04 +0100 Subject: [PATCH 33/47] Codechange: [Win32] Use _local_palette for most operations Other drivers do this too, and this makes the world a bit more the same. --- src/video/win32_v.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 2f464fae23..9e1df84738 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -73,24 +73,24 @@ static Palette _local_palette; static void MakePalette() { + _cur_palette.first_dirty = 0; + _cur_palette.count_dirty = 256; + _local_palette = _cur_palette; + LOGPALETTE *pal = (LOGPALETTE*)alloca(sizeof(LOGPALETTE) + (256 - 1) * sizeof(PALETTEENTRY)); pal->palVersion = 0x300; pal->palNumEntries = 256; for (uint i = 0; i != 256; i++) { - pal->palPalEntry[i].peRed = _cur_palette.palette[i].r; - pal->palPalEntry[i].peGreen = _cur_palette.palette[i].g; - pal->palPalEntry[i].peBlue = _cur_palette.palette[i].b; + pal->palPalEntry[i].peRed = _local_palette.palette[i].r; + pal->palPalEntry[i].peGreen = _local_palette.palette[i].g; + pal->palPalEntry[i].peBlue = _local_palette.palette[i].b; pal->palPalEntry[i].peFlags = 0; } _wnd.gdi_palette = CreatePalette(pal); if (_wnd.gdi_palette == nullptr) usererror("CreatePalette failed!\n"); - - _cur_palette.first_dirty = 0; - _cur_palette.count_dirty = 256; - _local_palette = _cur_palette; } static void UpdatePalette(HDC dc, uint start, uint count) From 1eceee915ede04301c411bb0465c32a3712aa0d2 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 16 Jan 2021 16:27:50 +0100 Subject: [PATCH 34/47] Codechange: [SDL2/Win32] Be consistent how 0bpp blitters are not allowed Sometimes it returned an usererror(), sometimes Start() failed. Now it always fails on Start(), so nothing else has to check again what blitter is used. AfterBlitterChange() can never change to a 0bpp, so it is sufficient to guard this with an assert(). --- src/video/sdl2_v.cpp | 5 +++-- src/video/win32_v.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp index 685610d2c8..ede8a84860 100644 --- a/src/video/sdl2_v.cpp +++ b/src/video/sdl2_v.cpp @@ -258,8 +258,6 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize) DEBUG(driver, 1, "SDL2: using mode %ux%ux%d", w, h, bpp); - if (bpp == 0) usererror("Can't use a blitter that blits 0 bpp for normal visuals"); - /* Free any previously allocated shadow surface */ if (_sdl_surface != nullptr && _sdl_surface != _sdl_realscreen) SDL_FreeSurface(_sdl_surface); @@ -664,6 +662,8 @@ int VideoDriver_SDL::PollEvent() const char *VideoDriver_SDL::Start(const StringList &parm) { + if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) return "Only real blitters supported"; + /* Explicitly disable hardware acceleration. Enabling this causes * UpdateWindowSurface() to update the window's texture instead of * its surface. */ @@ -939,6 +939,7 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen) bool VideoDriver_SDL::AfterBlitterChange() { + assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0); int w, h; SDL_GetWindowSize(_sdl_window, &w, &h); return CreateMainSurface(w, h, false); diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 9e1df84738..c1b31d14ab 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -1004,8 +1004,6 @@ static bool AllocateDibSection(int w, int h, bool force) w = std::max(w, 64); h = std::max(h, 64); - if (bpp == 0) usererror("Can't use a blitter that blits 0 bpp for normal visuals"); - if (!force && w == _screen.width && h == _screen.height) return false; bi = (BITMAPINFO*)alloca(sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256); @@ -1016,7 +1014,7 @@ static bool AllocateDibSection(int w, int h, bool force) bi->bmiHeader.biHeight = -(_wnd.height = h); bi->bmiHeader.biPlanes = 1; - bi->bmiHeader.biBitCount = BlitterFactory::GetCurrentBlitter()->GetScreenDepth(); + bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = BI_RGB; if (_wnd.dib_sect) DeleteObject(_wnd.dib_sect); @@ -1079,6 +1077,8 @@ static FVideoDriver_Win32 iFVideoDriver_Win32; const char *VideoDriver_Win32::Start(const StringList &parm) { + if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) return "Only real blitters supported"; + this->UpdateAutoResolution(); memset(&_wnd, 0, sizeof(_wnd)); @@ -1288,6 +1288,7 @@ bool VideoDriver_Win32::ToggleFullscreen(bool full_screen) bool VideoDriver_Win32::AfterBlitterChange() { + assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0); return AllocateDibSection(_screen.width, _screen.height, true) && this->MakeWindow(_fullscreen); } From 2d9e164ec47aac60c48e9dce29753ab2df8e4ba0 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Sun, 17 Jan 2021 16:45:23 +0000 Subject: [PATCH 35/47] Fix: [Actions] Give Universal Mac packages the "universal" suffix --- .github/workflows/release.yml | 1 + cmake/InstallAndPackage.cmake | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d05d93258..ac91e31fe8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -454,6 +454,7 @@ jobs: -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \ "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \ + -DAPPLE_UNIVERSAL_PACKAGE=1 \ # EOF echo "::endgroup::" diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake index 5fb4646e57..be00cfc153 100644 --- a/cmake/InstallAndPackage.cmake +++ b/cmake/InstallAndPackage.cmake @@ -101,7 +101,11 @@ if(APPLE) set(CPACK_GENERATOR "Bundle") include(PackageBundle) - set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}") + if (APPLE_UNIVERSAL_PACKAGE) + set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal") + else() + set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}") + endif() elseif(WIN32) set(CPACK_GENERATOR "ZIP") if(OPTION_USE_NSIS) From 6d95ed53dc81a2951585c5bf94a5dba77842c8f0 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Fri, 11 Dec 2020 15:20:13 +0000 Subject: [PATCH 36/47] Feature: Add support for rdtsc for ARM-based Windows (MSVC) --- src/cpu.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cpu.cpp b/src/cpu.cpp index bafa0f7352..b93f0fa5ed 100644 --- a/src/cpu.cpp +++ b/src/cpu.cpp @@ -16,11 +16,18 @@ /* rdtsc for MSC_VER, uses simple inline assembly, or _rdtsc * from external win64.asm because VS2005 does not support inline assembly */ -#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && !defined(RDTSC_AVAILABLE) +#if defined(_MSC_VER) && !defined(RDTSC_AVAILABLE) #include +#include uint64 ottd_rdtsc() { +#if defined(_M_ARM) + return __rdpmccntr64(); +#elif defined(_M_ARM64) + return _ReadStatusReg(ARM64_PMCCNTR_EL0); +#else return __rdtsc(); +#endif } #define RDTSC_AVAILABLE #endif From a2bd0a14e1033d9bd1e29416c8c68f96c73d179e Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Sat, 16 Jan 2021 21:31:20 +0000 Subject: [PATCH 37/47] Feature: [Actions] ARM64 builds for Windows --- .github/workflows/release.yml | 5 +++-- cmake/InstallAndPackage.cmake | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac91e31fe8..81d3cd5b91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -513,6 +513,7 @@ jobs: include: - arch: x86 - arch: x64 + - arch: arm64 runs-on: windows-latest @@ -560,7 +561,7 @@ jobs: uses: ammaraskar/msvc-problem-matcher@master - name: Build (with installer) - if: needs.source.outputs.is_tag == 'true' && matrix.arch != 'arm64' + if: needs.source.outputs.is_tag == 'true' uses: lukka/run-cmake@v3 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -569,7 +570,7 @@ jobs: cmakeAppendedArgs: ' -GNinja -DOPTION_USE_NSIS=ON -DHOST_BINARY_DIR=${{ github.workspace }}/build-host -DCMAKE_BUILD_TYPE=RelWithDebInfo' - name: Build (without installer) - if: needs.source.outputs.is_tag != 'true' || matrix.arch == 'arm64' + if: needs.source.outputs.is_tag != 'true' uses: lukka/run-cmake@v3 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake index be00cfc153..b54c8131ac 100644 --- a/cmake/InstallAndPackage.cmake +++ b/cmake/InstallAndPackage.cmake @@ -70,10 +70,15 @@ endif() # Windows is a bit more annoying to detect; using the size of void pointer # seems to be the most robust. if(WIN32) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(ARCHITECTURE "win64") + # Check if the MSVC platform has been defined + if ("$ENV{Platform}" STREQUAL "arm64") + set(ARCHITECTURE "arm64") else() - set(ARCHITECTURE "win32") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(ARCHITECTURE "win64") + else() + set(ARCHITECTURE "win32") + endif() endif() endif() if(APPLE AND CMAKE_OSX_ARCHITECTURES) From 7da224d29d4af6333d187ccbf5104e6a1bf805f9 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Mon, 18 Jan 2021 21:11:38 +0100 Subject: [PATCH 38/47] Fix #8589, 653e7fa548: Motion counter is NewGRF-visible but not saved, leading to desyncs. (#8591) --- src/saveload/saveload.h | 1 + src/saveload/vehicle_sl.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index f5ec936a2d..fb7761128b 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -322,6 +322,7 @@ enum SaveLoadVersion : uint16 { SLV_END_PATCHPACKS = 286, ///< 286 Last known patchpack to use a version just above ours. SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 and PR#8115 GS industry control. + SLV_VEH_MOTION_COUNTER, ///< 288 PR#8591 Desync safe motion counter SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 94bc37fb8a..131d31519a 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -612,6 +612,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_VAR(Vehicle, cur_speed, SLE_UINT16), SLE_VAR(Vehicle, subspeed, SLE_UINT8), SLE_VAR(Vehicle, acceleration, SLE_UINT8), + SLE_CONDVAR(Vehicle, motion_counter, SLE_UINT32, SLV_VEH_MOTION_COUNTER, SL_MAX_VERSION), SLE_VAR(Vehicle, progress, SLE_UINT8), SLE_VAR(Vehicle, vehstatus, SLE_UINT8), From b3d048dfcf607cdc9f041b3913cb9932b492d539 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 18 Jan 2021 22:42:10 +0100 Subject: [PATCH 39/47] Change: [NewGRF] industry special flag 19 now specifically targets only passenger production, instead of the second cargo of any water-based industry. (#8590) This behavior is less surprising to NewGRF authors, and may even be intentional behavior for some industries. --- src/industry_cmd.cpp | 3 +-- src/industrytype.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 8696e34400..69d67b9d8c 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -2754,8 +2754,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) /* Prevent production to overflow or Oil Rig passengers to be over-"produced" */ new_prod = Clamp(new_prod, 1, 255); - - if (((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) && j == 1 && !(indspec->behaviour & INDUSTRYBEH_WATER_NO_CLAMP_PROD)) { + if (i->produced_cargo[j] == CT_PASSENGERS && !(indspec->behaviour & INDUSTRYBEH_NO_PAX_PROD_CLAMP)) { new_prod = Clamp(new_prod, 0, 16); } diff --git a/src/industrytype.h b/src/industrytype.h index 937ff62cb9..d5f1ba96a7 100644 --- a/src/industrytype.h +++ b/src/industrytype.h @@ -80,7 +80,7 @@ enum IndustryBehaviour { INDUSTRYBEH_NOBUILT_MAPCREATION = 1 << 16, ///< Do not force one instance of this type to appear on map generation INDUSTRYBEH_CANCLOSE_LASTINSTANCE = 1 << 17, ///< Allow closing down the last instance of this type INDUSTRYBEH_CARGOTYPES_UNLIMITED = 1 << 18, ///< Allow produced/accepted cargoes callbacks to supply more than 2 and 3 types - INDUSTRYBEH_WATER_NO_CLAMP_PROD = 1 << 19, ///< Do not clamp production of second cargo for water industries + INDUSTRYBEH_NO_PAX_PROD_CLAMP = 1 << 19, ///< Do not clamp production of passengers. (smooth economy only) }; DECLARE_ENUM_AS_BIT_SET(IndustryBehaviour) From 27caabdb91a28b6edf251b2b4d50c8d882e7a1ff Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 19 Jan 2021 18:41:55 +0000 Subject: [PATCH 40/47] Update: Translations from eints german: 23 changes by Wuzzy2 russian: 70 changes by Ln-Wolf --- src/lang/german.txt | 28 +++++++-- src/lang/russian.txt | 137 ++++++++++++++++++++++--------------------- 2 files changed, 94 insertions(+), 71 deletions(-) diff --git a/src/lang/german.txt b/src/lang/german.txt index 8b9760bace..365710e3d9 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -748,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Unebenes Land STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Wiesen STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Kahles Land +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Regenwald STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Ackerland STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Bäume STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Felsen @@ -779,6 +780,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Zeige al STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Letzte Nachricht oder letzten Bericht anzeigen STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * ANGEHALTEN * * +STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * PAUSE (warte auf Aktualisierung des Verteilungsgraphen) * * STR_STATUSBAR_AUTOSAVE :{RED}Autosicherung STR_STATUSBAR_SAVING_GAME :{RED}* * SPEICHERE SPIEL * * @@ -840,7 +842,7 @@ STR_NEWS_END_OF_RECESSION :{BLACK}{BIG_FON STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL :{BIG_FONT}{BLACK}{INDUSTRY} {G 0 erhöht erhöht erhöht erhöhen} die Produktion! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL :{BIG_FONT}{BLACK}Neue Kohlevorkommen bei {INDUSTRY} gefunden!{}Förderung verdoppelt! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL :{BIG_FONT}{BLACK}Neue Ölfunde bei {INDUSTRY}!{}Förderung wird vermutlich verdoppelt! -STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Neue Getreideanbaumethoden bei {INDUSTRY} werden Erträge verdoppeln! +STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Neue Anbaumethoden bei {INDUSTRY} werden Erträge verdoppeln! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}{STRING}produktion von {INDUSTRY} erhöht sich um {COMMA}%! STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL :{BIG_FONT}{BLACK}Produktion bei {INDUSTRY} sinkt um 50% STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM :{BIG_FONT}{BLACK}Insektenplage bei {INDUSTRY} verursacht Schaden!{}Produktion sinkt um 50% @@ -1066,7 +1068,7 @@ STR_NUM_VERY_LOW :Sehr niedrig STR_NUM_LOW :Niedrig STR_NUM_NORMAL :Normal STR_NUM_HIGH :Hoch -STR_NUM_CUSTOM :Eigene +STR_NUM_CUSTOM :Individuell STR_NUM_CUSTOM_NUMBER :Individuell ({NUM}) STR_VARIETY_NONE :Minimal @@ -1091,7 +1093,7 @@ STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Individuell ({N STR_RIVERS_NONE :Keine STR_RIVERS_FEW :Wenige -STR_RIVERS_MODERATE :einige +STR_RIVERS_MODERATE :Einige STR_RIVERS_LOT :Viele STR_DISASTER_NONE :Keine @@ -1340,7 +1342,7 @@ STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Rauheit des Gel STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT :(nur TerraGenesis) Wähle die Häufigkeit von Hügeln: Rollende Landschaften haben wenige, weit verteilte Hügel. Zerklüftete Landschaften haben viele Hügel, was wiederum sich wiederholend aussehen kann STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Sehr eben STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Eben -STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :zerklüftet +STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Zerklüftet STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Sehr zerklüftet STR_CONFIG_SETTING_VARIETY :Größe der Geländeformen: {STRING} STR_CONFIG_SETTING_VARIETY_HELPTEXT :(nur TerraGenesis) Beinflusst, ob die Karte sowohl bergige als auch ebene Gegenden enthält. Weil dieses die Karte nur ebener macht, sollten andere Einstellungen auf bergig gesetzt werden @@ -2232,6 +2234,7 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} is STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} hat eine neue Firma gegründet (#{2:NUM}) STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} hat das Spiel verlassen ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} hat seinen/ihren Namen in {STRING} geändert +STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} gab {2:CURRENCY_LONG} an {1:STRING} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Der Server hat das Spiel beendet STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Der Server startet neu...{}Bitte warten... STR_NETWORK_MESSAGE_KICKED :*** {STRING} wurde vom Server hinausgeworfen. Grund: ({STRING}) @@ -2629,6 +2632,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Industri # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Gebietsinformation +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Zentriert die Hauptansicht an der Kachelposition. Strg+Klick öffnet ein neues Ansichtsfenster an der Kachelposition STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Räumungskosten: {LTBLUE}Keine STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Räumungskosten: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Einnahmen beim Abriss: {LTBLUE}{CURRENCY_LONG} @@ -2790,6 +2794,7 @@ STR_FRAMERATE_DRAWING :{BLACK}Grafik-R STR_FRAMERATE_DRAWING_VIEWPORTS :{BLACK}Kartenansichten: STR_FRAMERATE_VIDEO :{BLACK}Videoausgabe: STR_FRAMERATE_SOUND :{BLACK}Sound-Abmischung: +STR_FRAMERATE_ALLSCRIPTS :{BLACK} GS/AI-Skripte gesamt: STR_FRAMERATE_GAMESCRIPT :{BLACK} Script: STR_FRAMERATE_AI :{BLACK} KI {NUM} {STRING} ############ End of leave-in-this-order @@ -2806,6 +2811,7 @@ STR_FRAMETIME_CAPTION_DRAWING :Grafik-Renderin STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS :Karten-Rendering STR_FRAMETIME_CAPTION_VIDEO :Videoausgabe STR_FRAMETIME_CAPTION_SOUND :Sound-Abmischung +STR_FRAMETIME_CAPTION_ALLSCRIPTS :GS/AI-Skripte gesamt STR_FRAMETIME_CAPTION_GAMESCRIPT :Spielskript STR_FRAMETIME_CAPTION_AI :KI {NUM} {STRING} ############ End of leave-in-this-order @@ -3097,6 +3103,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Umschalt # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Schildtext ändern +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Hauptansicht auf Schildposition zentrieren. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Schildes STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Zum nächsten Schild wechseln STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Zum vorherigen Schild wechseln @@ -3414,6 +3421,7 @@ STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industri STR_INDUSTRY_DIRECTORY_NONE :{ORANGE}- Keine - STR_INDUSTRY_DIRECTORY_ITEM_INFO :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportiert){BLACK} STR_INDUSTRY_DIRECTORY_ITEM_NOPROD :{ORANGE}{INDUSTRY} +STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUSTRY} {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} und {NUM} weitere... @@ -3752,6 +3760,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ursprün # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf die Position des Zuges. Durch Doppelklick wird der Zug in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Zuges +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf den Standort des Fahrzeugs. Durch Doppelklick wird das Fahrzeug in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster an der Position des Fahrzeugs +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf die Position des Schiffs. Mit Doppelklick wird das Schiff in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Schiffs +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf die Position des Flugzeugs. Durch Doppelklick wird das Flugzeug in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Flugzeugs STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Zug ins Depot schicken. Strg+Klick, um dort nur Wartung durchzuführen STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Das Fahrzeug ins Depot schicken. Strg+Klick, um dort nur Wartung durchzuführen @@ -3783,7 +3795,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Einzelhe STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Zeige Einzelheiten des Schiffes STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Zeige Einzelheiten des Flugzeuges +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Momentane Zugaktion - Klicken zum Starten/Anhalten des Zuges +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Momentane Fahrzeugaktion - Klicken zum Starten/Anhalten des Fahrzeugs +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Momentane Schiffsaktion - Klicken zum Starten/Anhalten des Schiffs +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Momentane Flugzeugaktion - Klicken zum Starten/Anhalten des Flugzeugs +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Hauptansicht auf Auftragsziel zentrieren. Strg+Klick öffnet ein neues Ansichtsfenster auf dem Standort des Auftragsziels # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laden / Entladen @@ -4011,6 +4028,7 @@ STR_ORDER_REFIT_STOP_ORDER :(auf {STRING} u STR_ORDER_STOP_ORDER :(Stopp) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} +STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(Station unbenutzbar){POP_COLOUR} {STRING} {STATION} {STRING} STR_ORDER_IMPLICIT :(Implizit) @@ -4377,7 +4395,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... kann STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... kann nur unterhalb der Schneegrenze errichtet werden STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}Es konnten für die Industrie '{STRING}' keine geeigneten Standorte gefunden werden -STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Ändere die Karteneinstellungen, um eine bessere Karte zu erzeugen +STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Karteneinstellungen ändern, um eine bessere Karte zu erzeugen # Station construction related errors STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Bahnhof kann hier nicht gebaut werden... diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 003630f320..8838c2214c 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -383,7 +383,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Пока STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели локомотивов и вагонов также будут показаны STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели автомобилей также будут показаны -STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели кораблей также будут показаны +STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели судов также будут показаны STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели воздушных судов также будут показаны # Query window @@ -467,7 +467,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Пока STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Список существующих предприятий; создание новых STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Список поездов. Ctrl+щелчок переключает отображение по группам. STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Список автотранспорта. Ctrl+щелчок переключает отображение по группам. -STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Список кораблей. Ctrl+щелчок переключает отображение по группам. +STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Список судов. Ctrl+щелчок переключает отображение по группам. STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Список авиатранспорта. Ctrl+щелчок переключает отображение по группам. STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}Приблизить STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}Отдалить @@ -486,8 +486,8 @@ STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Пере STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO :{BLACK}Сохранение/загрузка сценария, выход из редактора, выход STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Редактор сценариев -STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD :{BLACK}Уменьшить год начала игры на 1 -STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD :{BLACK}Увеличить год начала игры на 1 +STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD :{BLACK}Начать игру на 1 год раньше +STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD :{BLACK}Начать игру на 1 год позже STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE :{BLACK}Нажмите, чтобы изменить год начала игры STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY :{BLACK}Показать карту; список городов STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION :{BLACK}Создание ландшафта @@ -940,7 +940,7 @@ STR_NEWS_FIRST_BUS_ARRIVAL :{BIG_FONT}{BLAC STR_NEWS_FIRST_TRUCK_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый грузовик прибыл на терминал {STATION}! STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый трамвай прибыл на {STATION}! STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый грузовой трамвай прибыл на {STATION}! -STR_NEWS_FIRST_SHIP_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый корабль причалил к {STATION}! +STR_NEWS_FIRST_SHIP_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первое судно причалило к {STATION}! STR_NEWS_FIRST_AIRCRAFT_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый самолёт прибыл в {STATION}! STR_NEWS_TRAIN_CRASH :{BIG_FONT}{BLACK}Столкновение поездов!{}{COMMA} человек{P "" а ""} погиб{P "" ло ло} в результате крушения! @@ -978,7 +978,7 @@ STR_NEWS_INDUSTRY_CLOSURE_GENERAL :{BIG_FONT}{BLAC STR_NEWS_INDUSTRY_CLOSURE_SUPPLY_PROBLEMS :{BIG_FONT}{BLACK}{STRING} закрывается из-за проблем с поставками сырья! STR_NEWS_INDUSTRY_CLOSURE_LACK_OF_TREES :{BIG_FONT}{BLACK}«{STRING}» объявляет о закрытии в связи с полной вырубкой близлежащих лесов! -STR_NEWS_EURO_INTRODUCTION :{BIG_FONT}{BLACK}Создана зона евро!{}{}Теперь в вашей стране в качестве единой валюты используется евро! +STR_NEWS_EURO_INTRODUCTION :{BIG_FONT}{BLACK}Создан европейский валютный союз!{}{}Теперь в вашей стране в качестве единой валюты используется евро! STR_NEWS_BEGIN_OF_RECESSION :{BIG_FONT}{BLACK}Мировой спад{}{}Финансовые эксперты дают ужасные прогнозы в связи с кризисом экономики! STR_NEWS_END_OF_RECESSION :{BIG_FONT}{BLACK}Спад закончился!{}{}Увеличение объёмов торговли внушает уверенность владельцам предприятий. Экономика укрепляет свои позиции. @@ -1627,17 +1627,17 @@ STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Максима STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :Максимальное количество автомобилей, которое может иметь транспортная компания STR_CONFIG_SETTING_MAX_AIRCRAFT :Максимальное количество авиатранспорта на игрока: {STRING} STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :Максимальное количество воздушных судов, которое может иметь транспортная компания -STR_CONFIG_SETTING_MAX_SHIPS :Максимальное количество кораблей на игрока: {STRING} -STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Максимальное количество кораблей, которое может иметь транспортная компания - -STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Не допускать постройки поездов компьютером: {STRING} -STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT :Запрет строительства поездов для игроков, управляемых компьютером -STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :Не допускать постройки автомобилей компьютером: {STRING} -STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT :Запрет строительства автомобилей для игроков, управляемых компьютером -STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :Не допускать постройки авиатранспорта компьютером: {STRING} -STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT :Запрет строительства воздушных судов для игроков, управляемых компьютером -STR_CONFIG_SETTING_AI_BUILDS_SHIPS :Не допускать постройки кораблей компьютером: {STRING} -STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT :Запрет строительства кораблей для игроков, управляемых компьютером +STR_CONFIG_SETTING_MAX_SHIPS :Максимальное количество судов на игрока: {STRING} +STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Максимальное количество судов, которое может иметь транспортная компания + +STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Запретить покупку поездов компьютером: {STRING} +STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT :Запрет покупки железнодорожного транспорта для компаний, управляемых компьютером +STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :Запретить покупку автомобилей компьютером: {STRING} +STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT :Запрет покупки автотранспорта для компаний, управляемых компьютером +STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :Запретить покупку авиатранспорта компьютером: {STRING} +STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT :Запрет покупки воздушного транспорта для компаний, управляемых компьютером +STR_CONFIG_SETTING_AI_BUILDS_SHIPS :Запретить покупку судов компьютером: {STRING} +STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT :Запрет покупки водного транспорта для компаний, управляемых компьютером STR_CONFIG_SETTING_AI_PROFILE :Исходный профиль настроек: {STRING} STR_CONFIG_SETTING_AI_PROFILE_HELPTEXT :Выберите, какой профиль настроек использовать случайному ИИ или для начальных значений при добавлении нового ИИ или сценария игры @@ -1663,7 +1663,7 @@ STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES :Интерва STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT :Настройка периодичности тех. обслуживания для новых автомобилей STR_CONFIG_SETTING_SERVINT_AIRCRAFT :Интервал обслуживания по умолчанию для авиатранспорта: {STRING} STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT :Настройка периодичности тех. обслуживания для новых воздушных судов -STR_CONFIG_SETTING_SERVINT_SHIPS :Интервал обслуживания по умолчанию для кораблей: {STRING} +STR_CONFIG_SETTING_SERVINT_SHIPS :Интервал обслуживания по умолчанию для судов: {STRING} STR_CONFIG_SETTING_SERVINT_SHIPS_HELPTEXT :Настройка периодичности тех. обслуживания для новых судов STR_CONFIG_SETTING_NOSERVICE :Не обслуживать транспорт, если отключены поломки: {STRING} STR_CONFIG_SETTING_NOSERVICE_HELPTEXT :Отключение технического обслуживания транспортных средств, если отключены поломки. (Если транспорт не заходит в депо, автозамена не работает). @@ -1903,8 +1903,8 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Алгорит STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Алгоритм поиска пути, используемый поездами STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :Алгоритм поиска пути для автотранспорта: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_HELPTEXT :Алгоритм поиска пути, используемый автомобилями -STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :Алгоритм поиска пути для кораблей: {STRING} -STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT :Алгоритм поиска пути, используемый кораблями +STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :Алгоритм поиска пути для судов: {STRING} +STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT :Алгоритм поиска пути, используемый водным транспортом STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :Автоматический разворот у сигналов: {STRING} STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT :Разрешить поездам разворачиваться у светофора, если они долго ждут разрешающего сигнала @@ -2381,6 +2381,7 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} п STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} основал новую компанию (#{2:NUM}) STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} покинул игру ({2:STRING}) STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} изменил имя на {STRING} +STR_NETWORK_MESSAGE_GIVE_MONEY :*** Компания «{STRING}» передала «{STRING}» {CURRENCY_LONG} STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Сервер закрыл сессию STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Сервер перезапускается...{}Пожалуйста, подождите... STR_NETWORK_MESSAGE_KICKED :*** {STRING} был исключён из игры. Причина: ({STRING}) @@ -2654,7 +2655,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION :{WHITE}Судо STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Водные пути STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP :{BLACK}Строительство каналов. При нажатом Shift - оценка стоимости строительства. STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Строительство шлюзов. При нажатом Shift - оценка стоимости строительства. -STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Строительство доков (для приобретения и обслуживания кораблей). При нажатом Shift - оценка стоимости строительства. +STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Строительство доков (для приобретения и обслуживания судов). При нажатом Shift - оценка стоимости строительства. STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}Строительство пристаней. Нажатие Ctrl позволяет объединять станции. При нажатом Shift - оценка стоимости строительства. STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Буи помогают в навигации на больших расстояниях; используйте их как маршрутные точки. При нажатом Shift - оценка стоимости строительства. STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Строительство акведуков. При нажатом Shift - оценка стоимости строительства. @@ -2952,7 +2953,7 @@ STR_FRAMERATE_GAMELOOP :{BLACK}Расч STR_FRAMERATE_GL_ECONOMY :{BLACK} Расчёт объёмов груза: STR_FRAMERATE_GL_TRAINS :{BLACK} Движение поездов: STR_FRAMERATE_GL_ROADVEHS :{BLACK} Движение автомобилей: -STR_FRAMERATE_GL_SHIPS :{BLACK} Движение кораблей: +STR_FRAMERATE_GL_SHIPS :{BLACK} Движение судов: STR_FRAMERATE_GL_AIRCRAFT :{BLACK} Движение воздушных судов: STR_FRAMERATE_GL_LANDSCAPE :{BLACK} Изменения на карте: STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Задержка графа распределения: @@ -2969,7 +2970,7 @@ STR_FRAMETIME_CAPTION_GAMELOOP :Расчёт и STR_FRAMETIME_CAPTION_GL_ECONOMY :Расчёт объёмов груза STR_FRAMETIME_CAPTION_GL_TRAINS :Движение поездов STR_FRAMETIME_CAPTION_GL_ROADVEHS :Движение автомобилей -STR_FRAMETIME_CAPTION_GL_SHIPS :Движение кораблей +STR_FRAMETIME_CAPTION_GL_SHIPS :Движение судов STR_FRAMETIME_CAPTION_GL_AIRCRAFT :Движение воздушных судов STR_FRAMETIME_CAPTION_GL_LANDSCAPE :Расчёт изменений на карте STR_FRAMETIME_CAPTION_GL_LINKGRAPH :Задержка графа распределения @@ -3469,7 +3470,7 @@ STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Пере STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Показать список поездов, маршрут которых проходит через эту станцию STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP :{BLACK}Показать список автомобилей, маршрут которых проходит через эту станцию/остановку STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP :{BLACK}Показать список воздушных судов, маршрут которых проходит через этот аэропорт -STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Показать список кораблей, маршрут которых проходит через эту пристань +STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Показать список судов, маршрут которых проходит через эту пристань STR_STATION_VIEW_RENAME_STATION_CAPTION :Название станции @@ -3494,12 +3495,12 @@ STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Нова STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Обслуж. поездов STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Обслуж. автомобилей STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Обслуж. авиации -STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Обслуж. кораблей +STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Обслуж. судов STR_FINANCES_SECTION_PROPERTY_MAINTENANCE :{GOLD}Обслуж. собственности STR_FINANCES_SECTION_TRAIN_INCOME :{GOLD}Доход от поездов STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME :{GOLD}Доход от автомобилей STR_FINANCES_SECTION_AIRCRAFT_INCOME :{GOLD}Доход от авиации -STR_FINANCES_SECTION_SHIP_INCOME :{GOLD}Доход от кораблей +STR_FINANCES_SECTION_SHIP_INCOME :{GOLD}Доход от судов STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Проценты по займу STR_FINANCES_SECTION_OTHER :{GOLD}Прочие расходы STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} @@ -3525,7 +3526,7 @@ STR_COMPANY_VIEW_VEHICLES_TITLE :{GOLD}Тран STR_COMPANY_VIEW_TRAINS :{WHITE}{COMMA} поезд{P "" а ов} STR_COMPANY_VIEW_ROAD_VEHICLES :{WHITE}{COMMA} автомобил{P ь я ей} STR_COMPANY_VIEW_AIRCRAFT :{WHITE}{COMMA} воздушн{P ое ых ых} суд{P но на ов} -STR_COMPANY_VIEW_SHIPS :{WHITE}{COMMA} корабл{P ь я ей} +STR_COMPANY_VIEW_SHIPS :{WHITE}{COMMA} суд{P но на ов} STR_COMPANY_VIEW_VEHICLES_NONE :{WHITE}нет STR_COMPANY_VIEW_COMPANY_VALUE :{GOLD}Стоимость компании: {WHITE}{CURRENCY_LONG} STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA}% владеет {COMPANY}) @@ -3615,12 +3616,12 @@ STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}Изме # Vehicle lists STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} поезд{P "" а ов} STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION :{WHITE}{STRING} - {COMMA} автомобил{P ь я ей} -STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} корабл{P ь я ей} +STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} суд{P но на ов} STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} воздушн{P ое ых ых} суд{P но на ов} STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Поезда - щёлкните для получения информации STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Автомобили - щёлкните для получения информации -STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Корабли - щёлкните для получения информации +STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Суда - щёлкните для получения информации STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Авиатранспорт - щёлкните для получения информации STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Прибыль в этом году: {CURRENCY_LONG} (в прошлом году: {CURRENCY_LONG}) @@ -3649,7 +3650,7 @@ STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION :{WHITE}Общи # Group window STR_GROUP_ALL_TRAINS :Все поезда STR_GROUP_ALL_ROAD_VEHICLES :Весь автотранспорт -STR_GROUP_ALL_SHIPS :Все корабли +STR_GROUP_ALL_SHIPS :Все суда STR_GROUP_ALL_AIRCRAFTS :Все самолёты STR_GROUP_DEFAULT_TRAINS :Без группы @@ -3691,7 +3692,7 @@ STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION :Новые тр ############ range for vehicle availability starts STR_BUY_VEHICLE_TRAIN_ALL_CAPTION :Новый поезд STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION :Новый дорожный транспорт -STR_BUY_VEHICLE_SHIP_CAPTION :Новый корабль +STR_BUY_VEHICLE_SHIP_CAPTION :Новое судно STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Новое воздушное судно ############ range for vehicle availability ends @@ -3721,9 +3722,9 @@ STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Дальность: {GOLD}{COMMA} клет{P ка ки ок} STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Тип возд. судна: {GOLD}{STRING} -STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Список локомотивов и вагонов - щёлкните для получения информации. Ctrl+щелчок скроет/покажет ТС. +STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Список железнодорожного транспорта - щёлкните для получения информации. Ctrl+щелчок скроет/покажет ТС. STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Список автотранспорта - щёлкните для получения информации. Ctrl+щелчок скроет/покажет выбранный автомобиль. -STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Список кораблей - щёлкните для получения информации. Ctrl+щелчок скроет/покажет выбранный корабль. +STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Список судов - щёлкните для получения информации. Ctrl+щелчок скроет/покажет выбранное судно. STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Список воздушных судов - щёлкните для получения информации. Ctrl+щелчок скроет/покажет ТС. STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Купить @@ -3753,7 +3754,7 @@ STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Пере STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Изменить название модели поезда STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP :{BLACK}Изменить название модели автомобиля -STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Изменить название модели корабля +STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Изменить название модели судна STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Изменить название модели возд. судна STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON :{BLACK}Скрыть @@ -3768,12 +3769,12 @@ STR_BUY_VEHICLE_AIRCRAFT_SHOW_TOGGLE_BUTTON :{BLACK}Пока STR_BUY_VEHICLE_TRAIN_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранного локомотива/вагона STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели автомобиля -STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели корабля +STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели судна STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели воздушного судна STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Название модели поезда STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}Название модели автомобиля -STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Название модели корабля +STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Название модели судна STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Название модели возд. судна # Depot window @@ -3787,14 +3788,14 @@ STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE} STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} единиц{P а "" ""}{STRING} STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO_LONG} ({CARGO_SHORT}) -STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Поезда - используйте перетаскивание для изменения состава; нажмите ПКМ для получения информации. Удерживайте Ctrl для перетаскивания вагона вместе со всеми следующими за ним. -STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Автомобили - нажмите ПКМ для получения информации -STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Корабли - нажмите ПКМ для получения информации -STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Авиатранспорт - нажмите ПКМ для получения информации +STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Поезда в депо. Изменяйте составы с помощью перетаскивания; нажмите ПКМ для получения информации.{}При нажатой Ctrl обе функции применяются от выбранного вагона до конца состава. +STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Автомобили в гараже. Нажмите ПКМ для получения информации. +STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Суда в доке. Нажмите ПКМ для получения информации. +STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Воздушный транспорт в ангаре. Нажмите ПКМ для получения информации. STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Перетащите сюда транспорт, чтобы продать его STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}Перетащите сюда автомобиль, чтобы продать его -STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Перетащите сюда корабль, чтобы продать его +STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Перетащите сюда судно, чтобы продать его STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Перетащите сюда транспорт, чтобы продать его STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP :{BLACK}Перетащите сюда локомотив для продажи всего состава @@ -3816,7 +3817,7 @@ STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON :{BLACK}Ново STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый поезд STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый автомобиль -STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый корабль +STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новое судно STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый авиатранспорт STR_DEPOT_CLONE_TRAIN :{BLACK}Копировать @@ -3826,7 +3827,7 @@ STR_DEPOT_CLONE_AIRCRAFT :{BLACK}Копи STR_DEPOT_CLONE_TRAIN_DEPOT_INFO :{BLACK}Создать копию состава. Нажмите на кнопку, а затем на поезд внутри или снаружи депо. Ctrl+щелчок создаст поезд с общим маршрутом. Shift+щелчок - оценка стоимости покупки. STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Создать копию автомобиля. Нажмите на кнопку, а затем на машину внутри или снаружи гаража. Ctrl+щелчок создаст автомобиль с общим маршрутом. Shift+щелчок - оценка стоимости покупки. -STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Создать копию корабля. Нажмите на кнопку, а затем на корабль внутри или снаружи дока. Ctrl+щелчок создаст корабль с общим маршрутом. Shift+щелчок - оценка стоимости покупки. +STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Создать копию судна. Нажмите на кнопку, а затем на судно внутри или снаружи дока. Ctrl+щелчок создаст судно с общим маршрутом. Shift+щелчок - оценка стоимости покупки. STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Создать копию воздушного судна. Нажмите на кнопку, а потом на воздушное судно внутри или снаружи ангара. Ctrl+щелчок создаст копию с общим маршрутом. Shift+щелчок - оценка стоимости покупки. STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Показать депо в основном окне. Ctrl+щелчок - показать в дополнительном окне. @@ -3841,13 +3842,13 @@ STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP :{BLACK}Пока STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP :{BLACK}Нажмите для остановки всех поездов в депо STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP :{BLACK}Нажмите для остановки всех авто в гараже -STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP :{BLACK}Нажмите для остановки всех кораблей в доке +STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP :{BLACK}Нажмите для остановки всех судов в доке STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP :{BLACK}Нажмите для остановки всего авиатранспорта в ангаре STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP :{BLACK}Нажмите для запуска всех поездов в депо STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP :{BLACK}Нажмите для запуска всех авто в гараже STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP :{BLACK}Нажмите для запуска всех судов в доке -STR_DEPOT_MASS_START_HANGAR_TOOLTIP :{BLACK}Нажмите для запуска всего авиатранспорта в ангаре +STR_DEPOT_MASS_START_HANGAR_TOOLTIP :{BLACK}Нажмите для запуска всего воздушного транспорта в ангаре STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Весь транспорт в депо будет продан. Вы уверены? @@ -3871,8 +3872,8 @@ STR_ENGINE_PREVIEW_TRAM_VEHICLE.gen :трамвая STR_ENGINE_PREVIEW_AIRCRAFT :воздушное судно STR_ENGINE_PREVIEW_AIRCRAFT.gen :воздушного судна -STR_ENGINE_PREVIEW_SHIP :корабль -STR_ENGINE_PREVIEW_SHIP.gen :корабля +STR_ENGINE_PREVIEW_SHIP :судно +STR_ENGINE_PREVIEW_SHIP.gen :судна STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Цена: {CURRENCY_LONG} Вес: {WEIGHT_SHORT}{}Скорость: {VELOCITY} Мощность: {POWER}{}Стоимость обслуж.: {CURRENCY_LONG}/год{}Ёмкость: {CARGO_LONG} STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Цена: {CURRENCY_LONG} Вес: {WEIGHT_SHORT}{}Скорость: {VELOCITY} Мощность: {POWER} Макс. ТУ: {6:FORCE}{}Стоимость обслуж.: {4:CURRENCY_LONG}/год{}Ёмкость: {5:CARGO_LONG} @@ -3888,8 +3889,8 @@ STR_REPLACE_VEHICLE_TRAIN :Поезд STR_REPLACE_VEHICLE_TRAIN.gen :ж/д транспорта STR_REPLACE_VEHICLE_ROAD_VEHICLE :Автотранспорт STR_REPLACE_VEHICLE_ROAD_VEHICLE.gen :автотранспорта -STR_REPLACE_VEHICLE_SHIP :Корабль -STR_REPLACE_VEHICLE_SHIP.gen :кораблей +STR_REPLACE_VEHICLE_SHIP :Судно +STR_REPLACE_VEHICLE_SHIP.gen :судов STR_REPLACE_VEHICLE_AIRCRAFT :Авиатранспорт STR_REPLACE_VEHICLE_AIRCRAFT.gen :воздушного транспорта @@ -3934,22 +3935,26 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Разр # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} +STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Показать поезд в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне. +STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Показать автомобиль в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне. +STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Показать судно в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне. +STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Показать воздушное судно в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне. STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить поезд в депо. Ctrl+щелчок - только для обслуживания. STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить автомобиль в гараж. Ctrl+щелчок - только для обслуживания. -STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить корабль в док. Ctrl+щелчок - только для обслуживания. +STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить судно в док. Ctrl+щелчок - только для обслуживания. STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить воздушное судно в ангар. Ctrl+щелчок - только для обслуживания. STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Создать копию состава. Ctrl+щелчок создаст поезд с общим маршрутом. Shift+щелчок - оценка стоимости покупки. STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Создать копию автомобиля. Ctrl+щелчок создаст автомобиль с общим маршрутом. Shift+щелчок - оценка стоимости покупки. -STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Создать копию корабля. Ctrl+щелчок создаст корабль с общим маршрутом. Shift+щелчок - оценка стоимости покупки. +STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Создать копию судна. Ctrl+щелчок создаст судно с общим маршрутом. Shift+щелчок - оценка стоимости покупки. STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Создать копию воздушного судна. Ctrl+щелчок создаст копию с общим маршрутом. Shift+щелчок - оценка стоимости покупки. STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Заставить поезд проехать на красный сигнал светофора STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP :{BLACK}Переоборудование поезда для перевозки иного типа груза STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Переоборудование автомобиля для перевозки иного типа груза -STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудование корабля для перевозки иного типа груза +STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудование судна для перевозки иного типа груза STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Переоборудование возд. судна для перевозки иного типа груза STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP :{BLACK}Развернуть поезд @@ -3962,7 +3967,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Пока STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о поезде STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию об автомобиле -STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о корабле +STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о судне STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Показать сведения об авиатранспорте. @@ -3996,7 +4001,7 @@ STR_VEHICLE_NAME_BUTTON :{BLACK}Назв STR_VEHICLE_DETAILS_TRAIN_RENAME :{BLACK}Переименовать поезд STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME :{BLACK}Переименовать автомобиль -STR_VEHICLE_DETAILS_SHIP_RENAME :{BLACK}Переименовать корабль +STR_VEHICLE_DETAILS_SHIP_RENAME :{BLACK}Переименовать судно STR_VEHICLE_DETAILS_AIRCRAFT_RENAME :{BLACK}Переименовать воздушное судно STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Возраст: {LTBLUE}{STRING}{BLACK} Стоимость обслуживания: {LTBLUE}{CURRENCY_LONG}/год @@ -4033,7 +4038,7 @@ STR_VEHICLE_DETAILS_PERCENT :В процен STR_QUERY_RENAME_TRAIN_CAPTION :{WHITE}Название поезда STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION :{WHITE}Название автомобиля -STR_QUERY_RENAME_SHIP_CAPTION :{WHITE}Название корабля +STR_QUERY_RENAME_SHIP_CAPTION :{WHITE}Название судна STR_QUERY_RENAME_AIRCRAFT_CAPTION :{WHITE}Название возд. судна # Extra buttons for train details windows @@ -4075,12 +4080,12 @@ STR_REFIT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Выбе STR_REFIT_TRAIN_REFIT_BUTTON :{BLACK}Переоборудовать поезд STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON :{BLACK}Переоборудовать авто -STR_REFIT_SHIP_REFIT_BUTTON :{BLACK}Переоборудовать корабль +STR_REFIT_SHIP_REFIT_BUTTON :{BLACK}Переоборудовать судно STR_REFIT_AIRCRAFT_REFIT_BUTTON :{BLACK}Переоборудовать возд. судно STR_REFIT_TRAIN_REFIT_TOOLTIP :{BLACK}Переоборудовать поезд для перевозки выбранного типа груза STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Переоборудовать автомобиль для перевозки выбранного типа груза -STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудовать корабль для перевозки выбранного типа груза +STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудовать судно для перевозки выбранного типа груза STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Переоборудовать авиатранспорт для перевозки выбранного типа груза # Order view @@ -4737,47 +4742,47 @@ STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}Нево # Generic vehicle errors STR_ERROR_TRAIN_IN_THE_WAY :{WHITE}Поезд мешает STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Автомобиль мешает -STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Корабль мешает +STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Судно мешает STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Воздушное судно мешает STR_ERROR_CAN_T_REFIT_TRAIN :{WHITE}Невозможно переоборудовать поезд... STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE :{WHITE}Невозможно переоборудовать автомобиль... -STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}Невозможно переоборудовать корабль... +STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}Невозможно переоборудовать судно... STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}Невозможно переоборудовать самолёт... STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Невозможно переименовать поезд... STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Невозможно переименовать автомобиль... -STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Невозможно переименовать корабль... +STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Невозможно переименовать судно... STR_ERROR_CAN_T_RENAME_AIRCRAFT :{WHITE}Невозможно переименовать воздушное судно... STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Невозможно остановить/запустить поезд... STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE :{WHITE}Невозможно остановить/запустить автомобиль... -STR_ERROR_CAN_T_STOP_START_SHIP :{WHITE}Невозможно остановить/запустить корабль... +STR_ERROR_CAN_T_STOP_START_SHIP :{WHITE}Невозможно остановить/запустить судно... STR_ERROR_CAN_T_STOP_START_AIRCRAFT :{WHITE}Невозможно остановить/запустить авиатранспорт... STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Невозможно отправить поезд в депо... STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT :{WHITE}Невозможно отправить автомобиль в гараж... -STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Невозможно отправить корабль в док... +STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Невозможно отправить судно в док... STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Невозможно отправить самолёт в ангар... STR_ERROR_CAN_T_BUY_TRAIN :{WHITE}Невозможно купить ж/д транспорт... STR_ERROR_CAN_T_BUY_ROAD_VEHICLE :{WHITE}Невозможно купить автомобиль... -STR_ERROR_CAN_T_BUY_SHIP :{WHITE}Невозможно купить корабль... +STR_ERROR_CAN_T_BUY_SHIP :{WHITE}Невозможно купить судно... STR_ERROR_CAN_T_BUY_AIRCRAFT :{WHITE}Невозможно купить воздушное судно... STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Невозможно изменить название модели поезда... STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Невозможно изменить название модели автомобиля... -STR_ERROR_CAN_T_RENAME_SHIP_TYPE :{WHITE}Невозможно изменить название модели корабля... +STR_ERROR_CAN_T_RENAME_SHIP_TYPE :{WHITE}Невозможно изменить название модели судна... STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE :{WHITE}Невозможно изменить название модели возд. судна... STR_ERROR_CAN_T_SELL_TRAIN :{WHITE}Невозможно продать поезд... STR_ERROR_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Невозможно продать автомобиль... -STR_ERROR_CAN_T_SELL_SHIP :{WHITE}Невозможно продать корабль... +STR_ERROR_CAN_T_SELL_SHIP :{WHITE}Невозможно продать судно... STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Невозможно продать самолёт... STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Локомотив и/или вагон недоступен STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}Автотранспорт недоступен -STR_ERROR_SHIP_NOT_AVAILABLE :{WHITE}Корабль недоступен +STR_ERROR_SHIP_NOT_AVAILABLE :{WHITE}Судно недоступно STR_ERROR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Авиатранспорт недоступен STR_ERROR_TOO_MANY_VEHICLES_IN_GAME :{WHITE}Слишком много транспорта в игре From 6e1581a17d3da04a35466ed9c229cf058ef9b072 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 20 Jan 2021 18:44:27 +0000 Subject: [PATCH 41/47] Update: Translations from eints german: 2 changes by Wuzzy2 russian: 13 changes by Ln-Wolf --- src/lang/german.txt | 4 ++-- src/lang/russian.txt | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/lang/german.txt b/src/lang/german.txt index 365710e3d9..479dc26cdb 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3128,8 +3128,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER :{ORANGE}{STRING STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL :{ORANGE}{STRING}{GREEN} geliefert STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (noch benötigt) STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (geliefert) -STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}-ten{NBSP}Tag -STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}-ten{NBSP}Tag (finanziert) +STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}.{NBSP}Tag +STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}.{NBSP}Tag (finanziert) STR_TOWN_VIEW_TOWN_GROW_STOPPED :{BLACK}Die Stadt wächst {RED}nicht{BLACK} STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Lärmbelastung in der Stadt: {ORANGE}{COMMA}{BLACK} Grenzwert: {ORANGE}{COMMA} STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Hauptansicht zur Stadt scrollen. Strg+Klick öffnet neue Zusatzansicht bei der Stadt diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 8838c2214c..8638e8330b 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1768,12 +1768,12 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT :Зависим STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL :квадратичная зависимость (оригинальная) STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :линейная зависимость -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Размножение деревьев в игре: {STRING} -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Настройка возможности самостоятельного размножения деревьев в игре. Это может влиять на работоспособность некоторых предприятий, например, лесопилок. +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Рост деревьев в игре: {STRING} +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Настройка роста и произвольного появления новых деревьев со временем. Это может влиять на работоспособность некоторых предприятий, например, лесопилок. STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Растут, но не распространяются {RED}(ломается лесопилка) -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Растут, но распространяются только в тропических лесах -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Растут и распространяются везде -STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Не растут, не распространяются {RED} (ломается лесопилка) +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :существующие растут, новые - только в тропических лесах +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :растут старые и появляются новые +STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :нет {RED}(ломается лесопилка) STR_CONFIG_SETTING_TOOLBAR_POS :Положение главной панели инструментов: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Горизонтальное расположение основной панели инструментов в верхней части экрана @@ -1985,6 +1985,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}Вы у # Cheat window STR_CHEATS :{WHITE}Читы STR_CHEATS_TOOLTIP :{BLACK}Галочки показывают, использовали ли Вы этот чит раньше +STR_CHEATS_NOTE :{BLACK}Внимание! Их использование записывается при сохранении игры! STR_CHEAT_MONEY :{LTBLUE}Добавить {CURRENCY_LONG} STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Игра за компанию: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Волшебный динамит (снос ВСЕГО): {ORANGE}{STRING} @@ -3546,6 +3547,8 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Пере STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Переместить штаб-квартиру компании в другое место за 1% оценочной стоимости капитала компании. Shift+щелчок - оценка стоимости переноса. STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Подробности STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Посмотреть подробный состав инфраструктуры +STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Передать деньги +STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Передать некоторую сумму денег этой компании STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Внешность STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Изменить внешность директора @@ -3563,6 +3566,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Прод STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Компания STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Имя директора +STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Введите сумму, которую собираетесь передать STR_BUY_COMPANY_MESSAGE :{WHITE}Мы ищем потенциального покупателя для нашей компании.{}{}Не желаете ли Вы приобрести {COMPANY} за {CURRENCY_LONG}? @@ -3970,6 +3974,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пока STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о судне STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Показать сведения об авиатранспорте. +STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Текущее состояние поезда. Нажмите, чтобы остановить/запустить его. +STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Текущее состояние автомобиля. Нажмите, чтобы остановить/запустить его. +STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Текущее состояние судна. Нажмите, чтобы остановить/запустить его. +STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Текущее состояние воздушного судна. Нажмите, чтобы остановить/запустить его. # Messages in the start stop button in the vehicle view From 33e27e9480a6fa00c9d40baee9917081c0df6b54 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 21 Jan 2021 18:42:13 +0000 Subject: [PATCH 42/47] Update: Translations from eints estonian: 15 changes by siimsoni russian: 23 changes by Ln-Wolf --- src/lang/estonian.txt | 25 +++++++++++++++---------- src/lang/russian.txt | 29 +++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 09a055c13e..bacb177717 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -284,10 +284,10 @@ STR_LIST_FILTER_OSKTITLE :{BLACK}Sisesta STR_LIST_FILTER_TOOLTIP :{BLACK}Sisesta märksõna mida loendist otsida STR_TOOLTIP_GROUP_ORDER :{BLACK}Vali rühmitamise järjestus -STR_TOOLTIP_SORT_ORDER :{BLACK}Vali järjekord (kahanev/kasvav) -STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vali järjekord +STR_TOOLTIP_SORT_ORDER :{BLACK}Vali järjestus (kahanev/kasvav) +STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vali järjestus STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vali sõelumisalused -STR_BUTTON_SORT_BY :{BLACK}Järjekord: +STR_BUTTON_SORT_BY :{BLACK}Järjestus: STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulge aken STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Akna pealkiri. Liigutamiseks lohista seda hiirega. @@ -479,7 +479,7 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Veotasude mää ############ range for company league menu starts STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Ettevõtete edetabel STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Täpsustatud tulemushinnang -STR_GRAPH_MENU_HIGHSCORE :Punktitabel +STR_GRAPH_MENU_HIGHSCORE :Edetabel ############ range ends here ############ range for industry menu starts @@ -1040,6 +1040,7 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Tavaline STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Topeltsuurus STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus +STR_GAME_OPTIONS_FONT_ZOOM :{BLACK}Kirja suurus STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Vali kasutatav liideseelementide suurus STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus @@ -1778,14 +1779,14 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Pildipuh STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} STR_INTRO_NEW_GAME :{BLACK}Uus mäng -STR_INTRO_LOAD_GAME :{BLACK}Jätkuv mäng +STR_INTRO_LOAD_GAME :{BLACK}Mängu jätk STR_INTRO_PLAY_SCENARIO :{BLACK}Stsenaarium STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Kõrguskaart STR_INTRO_SCENARIO_EDITOR :{BLACK}Stsenaariumiredaktor STR_INTRO_MULTIPLAYER :{BLACK}Mitmikmäng STR_INTRO_GAME_OPTIONS :{BLACK}Liidese seadistus -STR_INTRO_HIGHSCORE :{BLACK}Punktitabel +STR_INTRO_HIGHSCORE :{BLACK}Edetabel STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Seaded STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF-i seadistus STR_INTRO_ONLINE_CONTENT :{BLACK}Aineste allalaadimine @@ -1805,7 +1806,7 @@ STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE :{BLACK}Vali 'l STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Vali 'mänguasjamaa' maastik STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Ava liidese seadistamine -STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Ava punktitabel +STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Ava edetabel STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Ava seaded STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Ava NewGRF-i seadistamine STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Otsi allalaadimiseks uusi ja uuendatud aineseid @@ -2770,6 +2771,7 @@ STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Mängust STR_SAVELOAD_DETAIL_NOT_AVAILABLE :{BLACK}Andmed puuduvad STR_SAVELOAD_DETAIL_COMPANY_INDEX :{SILVER}{COMMA}: {WHITE}{STRING} STR_SAVELOAD_DETAIL_GRFSTATUS :{SILVER}NewGRF: {WHITE}{STRING} +STR_SAVELOAD_FILTER_TITLE :{BLACK}Märksõna: STR_SAVELOAD_OSKTITLE :{BLACK}Sisesta salvestatavale mängule nimi @@ -3337,7 +3339,7 @@ STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Tööstu # Industry view STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY} -STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Eelmise kuu valmistoodang: +STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Eelmise kuu toodang: STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% veetud) STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Vaate keskendamine tööstusele STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Tootlikkuse tase: {YELLOW}{COMMA}% @@ -3346,6 +3348,7 @@ STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Tööst STR_INDUSTRY_VIEW_REQUIRES_N_CARGO :{BLACK}Vajab: {YELLOW}{STRING}{STRING} STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION :, {STRING}{STRING} +STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Nõuab: STR_CONFIG_GAME_PRODUCTION :{WHITE}Tootlikuse muutmine (kaheksaga jaguv, kuni 2040) STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}Muuda tootlikkuse taset (protsent, kuni 800%) @@ -3361,7 +3364,7 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Veokid - STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Laevad - info saamiseks klõpsa laevale STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Lennuk - info saamiseks vajuta lennukile -STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Kasum sellel aastal: {CURRENCY_LONG} (eelneval: {CURRENCY_LONG}) +STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Selle aasta kasum: {CURRENCY_LONG} (eelneval: {CURRENCY_LONG}) STR_VEHICLE_LIST_AVAILABLE_TRAINS :Saadaval rongid STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Saadaval sõidukid @@ -3410,7 +3413,9 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Eemalda kõik s STR_GROUP_RENAME_CAPTION :{BLACK}Rühma nime vahetamine -STR_GROUP_PROFIT_THIS_YEAR :Kasum sellel aastal: +STR_GROUP_PROFIT_THIS_YEAR :Selle aasta kasum: +STR_GROUP_PROFIT_LAST_YEAR :Eelmise aasta kasum: +STR_GROUP_OCCUPANCY :Kasutuses: STR_GROUP_OCCUPANCY_VALUE :{NUM}% # Build vehicle window diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 8638e8330b..4e380c1f12 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -892,6 +892,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Бездорожье STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Трава STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Пустырь +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Джунгли STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Поля STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Деревья STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Камни @@ -1601,6 +1602,8 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Инструм STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Инструменты строительства мостов, туннелей и{NBSP}т.{NBSP}п. не отключаются самостоятельно после использования STR_CONFIG_SETTING_EXPENSES_LAYOUT :Группировать расходы в окне финансов компании: {STRING} STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Разделять доходы и расходы в окне финансовой информации компании +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Убирать мешающие ж/д сигналы при строительстве: {STRING} +STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Автоматически убирать сигналы, мешающие постройке новых рельсовых путей. Это может привести к столкновению поездов. STR_CONFIG_SETTING_SOUND_TICKER :Бегущая строка: {STRING} STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Воспроизводить звук при появлении бегущей строки с новостями @@ -2518,6 +2521,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Объе STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Поставить отдельную точку пути # Generic toolbar +STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Отключено, так как нет подходящих транспортных средств для этой инфраструктуры # Rail construction toolbar STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Неэлектрифицированная ж/д @@ -2534,7 +2538,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Уста STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Строительство ж/д мостов. При нажатом Shift - оценка стоимости строительства. STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Строительство ж/д туннелей. При нажатом Shift - оценка стоимости строительства. STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Переключение между строительством и удалением ж/д путей, сигналов, станций. При нажатом Ctrl убирает станции с рельсами. -STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Преобразовать/модернизировать рельсы. При нажатом Shift - оценка стоимости преобразования. +STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Преобразовать/модернизировать рельсы. При нажатом Shift - оценка стоимости модернизации. STR_RAIL_NAME_RAILROAD :Ж/д STR_RAIL_NAME_RAILROAD.m :Ж/д @@ -2725,6 +2729,12 @@ STR_TREES_RANDOM_TYPE :{BLACK}Дере STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Высадка деревьев случайного типа. При нажатом Shift - оценка стоимости высадки. STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Расставить по карте STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Разместить деревья на местности случайным образом +STR_TREES_MODE_NORMAL_BUTTON :{BLACK}Дерево +STR_TREES_MODE_NORMAL_TOOLTIP :{BLACK}Высадка отдельных деревьев +STR_TREES_MODE_FOREST_SM_BUTTON :{BLACK}Роща +STR_TREES_MODE_FOREST_SM_TOOLTIP :{BLACK}Создание небольших рощ +STR_TREES_MODE_FOREST_LG_BUTTON :{BLACK}Лес +STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Создание крупных лесов # Land generation window (SE) STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Генератор карты @@ -2801,6 +2811,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Выбе # Land area window STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Информация о территории +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Показать этот участок земли в основном окне. Ctrl+щелчок - показать в дополнительном окне. STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Стоимость очистки: {LTBLUE}(недоступна) STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Стоимость очистки: {RED}{CURRENCY_LONG} STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Выручка от продажи: {LTBLUE}{CURRENCY_LONG} @@ -3271,6 +3282,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Пере # Sign window STR_EDIT_SIGN_CAPTION :{WHITE}Изменить текст таблички +STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Показать знак в основном окне. Ctrl+щелчок - показать в дополнительном окне. STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}К следующей табличке STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}К предыдущей табличке @@ -3797,17 +3809,17 @@ STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Авто STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Суда в доке. Нажмите ПКМ для получения информации. STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Воздушный транспорт в ангаре. Нажмите ПКМ для получения информации. -STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Перетащите сюда транспорт, чтобы продать его +STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Перетащите сюда транспортное средство, чтобы продать его STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}Перетащите сюда автомобиль, чтобы продать его STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Перетащите сюда судно, чтобы продать его -STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Перетащите сюда транспорт, чтобы продать его +STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Перетащите сюда воздушное судно, чтобы продать его STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP :{BLACK}Перетащите сюда локомотив для продажи всего состава STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP :{BLACK}Продать все поезда в депо -STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP :{BLACK}Продать все авто в гараже +STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP :{BLACK}Продать все автомобили в гараже STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP :{BLACK}Продать все суда в доке -STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP :{BLACK}Продать весь авиатранспорт в ангаре +STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP :{BLACK}Продать все воздушные суда в ангаре STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP :{BLACK}Автозамена всех поездов в депо STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP :{BLACK}Автозамена всех авто в гараже @@ -3934,7 +3946,7 @@ STR_REPLACE_ROAD_VEHICLES :Автотра STR_REPLACE_TRAM_VEHICLES :Трамваи STR_REPLACE_REMOVE_WAGON :{BLACK}Удаление вагонов: {ORANGE}{STRING} -STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Разрешить при автозамене сохранять длину поездов путём удаления вагонов (начиная с головы поезда), если при автозамене локомотива увеличится длина поезда. +STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Разрешить при автозамене сохранять длину поездов путём удаления вагонов (начиная с головы поезда), если при автозамене локомотива увеличится длина состава. # Vehicle view STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE} @@ -3979,6 +3991,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Теку STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Текущее состояние судна. Нажмите, чтобы остановить/запустить его. STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Текущее состояние воздушного судна. Нажмите, чтобы остановить/запустить его. +STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Показать станцию назначения в основном окне. Ctrl+щелчок - показать в дополнительном окне. # Messages in the start stop button in the vehicle view STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Разгрузка/Погрузка @@ -4206,6 +4219,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Переобо STR_ORDER_STOP_ORDER :(Стоп) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} +STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(Неверный тип){POP_COLOUR} {STRING} {STATION} {STRING} STR_ORDER_IMPLICIT :(Автоматически) @@ -4531,6 +4545,7 @@ STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... за STR_ERROR_CURRENCY_REQUIRED :{WHITE}... требуется {CURRENCY_LONG} STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Невозможно погасить заём... STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}Невозможно отдать занятые у банка деньги... +STR_ERROR_CAN_T_GIVE_MONEY :{WHITE}Невозможно передать деньги этой компании... STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Невозможно приобрести компанию... STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Невозможно построить штаб-квартиру компании... STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Невозможно купить 25% акций этой компании... @@ -4657,6 +4672,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Неверны STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}ТС «{VEHICLE}» слишком длинное после замены STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Правила автозамены/обновления не были применены STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(недостаточно денег) +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Новое транспортное средство не может возить {STRING.acc} +STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Ошибка в {NUM}-м пункте расписания: нельзя переоборудовать ТС # Rail construction errors STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Недопустимая комбинация путей From 3345d54ad932773b74171a7ae6c00a3ec3c8556b Mon Sep 17 00:00:00 2001 From: Andy <1780327+andythenorth@users.noreply.github.com> Date: Fri, 22 Jan 2021 09:26:45 +0000 Subject: [PATCH 43/47] Doc: add a png representation of the palette overlaid with indexes (decimal) (#8547) --- docs/palettes/palette_key.png | Bin 0 -> 10061 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/palettes/palette_key.png diff --git a/docs/palettes/palette_key.png b/docs/palettes/palette_key.png new file mode 100644 index 0000000000000000000000000000000000000000..70e9452199ed87ce6a97ea764b5f7145e64560a6 GIT binary patch literal 10061 zcmb`N3p`YL|HsdaaY;)2(Nq(ysn)fojSac&Qxg@k#$_@t^DHf5qNs)jgZ`~$BD;!h zMM)GUDux)Gc`9rdliOsC%h^Zm(1Zz-+u;8j+H3ZCp8x;#@0H`sZ_Z0ozxVlEzNfEU zT^v@au2+R1Xw`nly>1YMLgZg63Si}cs!I_BDL}4H?nDS$ShHr$rcIj&1cJT2y{oHh zU|?WWRMgqCXEQT1Z{ECFU0vPW+}zdGH8?mZlgZ4i9rrrW5FC z_Yh1l_SR~yPFhqS9Gz~TnHgAKe)j3pn~o+Jvb9#Qs|h36G5f4f^;LQYH*=z=+#bS^ zF>4~$Y)al_cGbd(>mK$rn9+0g!ke4|85fp4hh&4+G8xm!0HRu}M3HgHQ5HGLuH`vl z4=a-QVj-#thPhWIhq|Vkj_t_VG+4bx)&a?;m@*l>2?N<{skr0Tgqh%&76zG)7B_vI zs>8?+nPDB7OcgU|jXku<6+@t6>?73N&uRr{;+Qv0aAsJOy_>Ab1lM5eV1^Sj(+`9Kg8g04c)LkI%s$iQz` zNEQakk|9|EB!eMY4~sO~K_+C)Z>B1G-kjxjk+VxDpb04?eFwdpgeIq;scC3>2AY|L zW@V6U4w{>X<`=L^p9|5ZsxLffoYL-t3x?QJDpMsjP*Cg(qGIuR+jemHm4^ zbEoGF3ze%)_@3GlFN000i7BedwuFxozq$UC#$KnrpM8VY#Qd=7s{R2NO|5&HnXJuQ zQoc4wMyuX@X>#={Qx*M1@Ip{c&7}94vhKT)ehYilfc_lM}a}!v9eaSt&gzj2Yp?_$zGaf|Wik zPgoU3{ln?hekJa+HrSy!A>Ca;@0OCS+bTxE`YA_qNybqG-zk4%SFzgD5T&2Z6e2Gt zSU!VuRFU4}E3Ea*B=a8|BR0MY{SQ|n_odpBzHv02VVzWN;6 zLqVzCf^q|ffBp)ppO!K@wWq%B@58J_NQcpU&PwFFZ3zx58PT7uM1CCCq=zztYM|U9 zG~I6fc(^L~6x5>>rlBd^6lk?s@}p-uqC17c)5YK_w66Mko~eYR%Zse7f*36ARWesR zy&cZHy-z}au2Qdvh>Hf_LJ0f2e23jceqBvWO149T1I?<;| zQR+SE$d6O+n3Hz*k7D?E4wP%ByIpeqN|I1RW&qEMW8GX@OCkw3UYOqXgd@F!bqP6_?%WR+K!&m*G&|}nQbN<%T*zgI9`DV5Rc>?sX}?6qOy7aXa$JLV{5x$T!j zA-RJ7Idtq3LeaYH_CN0QmsFRX%PbpFt3&<<<-O=QNDVe-e#C|q+ElF({V`P*&6rTA zO^1mu!9mQ1yCM}EIoepEC)G**1~%P8QCH#it?h884)wrF!VN|G!kp7eiAKo#JszK& z{oD|4bv;jgeIFuu%eQ^$%8ezRD!JQ3b|i|@AF24ENX3PNN*3oDa6Ece^5uNI2WjF+ zl@6YslyswT5b+{Kg?Tx*t|HtxnsSUeL}n+{8phcA*$_ji$Xa+<>-;U~SW$4#ZRngk z^x%#rT<(R&zB>R;y`5SQB5^5&Sy9>%c8MbOldJpIQ-h88yd8cWmh{~lN+KnvdQ$Ox zUaRMoq=39mON)1huOwY(TPZi43J=0m!LvW>iM4Db+`AUaWz1W{7e!Q?#GnU?1S!`- znctW9lL$GLVV*YI{Ze0Sz4=7ONzTR8(w*9HQ-0*P@V%jD>L^B`CN@R~CR|^ETo*Z` z_wdnE+5622725Cxzsi){rpI|nw{ln5DwiFIPkIEGwDnVW{DGAZmWzuxNB(%jzn1|< zJk$Rsd+jmtiz?}c?wRwnxk64{BxQS>AUs4&6wa_|b!5u+K0$b>xT;F3Nn5wPe00I5 zRkO=}cmn7A1uGvc8!_Kr7OJvB6dQL-jR<`-uY^0IMQ}K5INJ!RMju8s5nrlWbQ>X# z+7UkKZ05j$a7CPrF%nEk7%HAdJB6UqLSJh~nDt-?QlDQKQIsTu-Td!SG`3rn>ZnNI zj$$Hu{I4>v1p)EN$sf1^$Z+h`ij593-6xrDaf2OVqW2$7NgFOUtU(o4pz-mFjY50y zf!?_#>;Ockc_=ng?2QSlFRHSHzAmjoDQSX?3aH8cRZBeK>x#Oja)@!0TYoUT%vqEv zh3S=q;m#A7(WdcY4eQaA!z^UFT9`eGKffmzgFQyfk4)jH1|rH$PW1N{LRMjNJ|Kd#tle8QOEmqAImLtAvIcC>ZN z!8~n3AM5jkTQr~vke-cy%{I7cm3~%(A>0v(D�cLV1#j_@IsF$cbxc81!`rHa{Y za!o2+R$^8eK*>2`U|Hc$>rJt{rD=A7+Vra!F0iKubrfA*r{ZTDK0WgNM<^(PZ zLvZ>B8pJiin~Tu7;YI2D?F?s(QaiJS`S&sm0awzgWdr2Msr6nu_({N1e8K5k8Z;Vz z7wwmZC=7j_w-T8SSWyZD2j!Pe?HZZEadYyUqKo=Y!e>U)r8vg=5GuV6y=3Q-H_0;O zZOj{0hF`jk7U7-GuS_i(U4X~p>k9P1onm+@#+cB%$Ca7xsIVwiDBF>nSWS!d$Ix;C z`z093nQAIt5;Ig`fCq>%zRKM7yr70v5+^TsPde3#9Ev!fr*@C*#L>+YL&|jEoxUh_ zn?#Uz3J0|b&bvztV-A&F&Tm3zw>{Fb={AfR>Fgv`p!?#1N}U3KxKYtyt4pis)GMvn z!m3XaCkLWI#yY(Q*kjn4POUn0T(*Ywh7zKuGM9I%Q{Oo4qIaMEsKZPULy)iCCE|FIBlb_=g#{Ah|F_`6Vk6_S$& zOM+upH;##@rDxuP6#To5{+EJMNBoNvJE=TnDx4Xh)p=0Ddj-M@DTg-qHK*@3yDD6K zh$CH1s|%ovb_jM?Nw?AJLjU52d>DoM_9~ViP$1txm9{~iAyA1K(_=ksw2FFB>HV@B zdPzo}Ey)PbfEqhZf-ElH1-@a5%F1Nk5j}}lv1pqvUQs>aw7AB>__(3Z4U`vQ)Q0Ah z;V9==xz;SD-KJ+2l3fsJTRJopxd37fS$jh{-F;e6YOegXi5sM22<7eC_9$0@P$b`f zWM|A9Sj4u{#I|>;6vi6kv)evNRPHPD+DE9n^H`-2@41gat70MA<-m%n(RNf!_;_E% zot%9B9+Rd0|Nga3!dE%@>i_ttD7bq>b80Mai{t{yY`7Cmr#Q7{*t$>|2a5p(EE<4- z6MY7r{S=tkxNW|oM8=Q7q#xfR&&u(-YYDUy=EPB2UM6Y6Kt#>BT{y_z$V*3aC+7pd z%dZ+Z4#EhEBrJ;5wsGKpp?!Xck*jk!^AgeXwWaCZmI_FeTXnbjfK3rmr(gxS!a21x zvydqGe5Z4&$!%+*!*pZ>d-wbwNSSlK)KF};Y%_`@Bd0^fy~3Du&b&Ki^hd#&N@*W$ zZiqAQM2Y9HCqu;iN@+c9ZkjXyH_GUXOCPl2UqW&bv(r5KFE{@~Ce~rMW%rfc--3Lj zN$@)nJN+3KiYPmhW|dRTTu^8g@pN53XYpRbhQaY6hAxA6NJrBu=yU^o$`FTDyvl zjY7F&7M}hD*7rS+yuGTyHFc1@iCt<3ghiEX~n5eBn## z=kqw$$tFAH+3!ow%sVf?{Sq4}Zh>Qam8~8oPU@aPIJO0Bb(;7=_l$&No6m0O5;$`PzMgT&}qD@%yf730KMi|N?)G8IWb+E zPzcWWj0J0~#eTv8cC;ww(! zR(+3Ngb2i8MW^sm@GUd4+;Log<%sh^QiWr?ekks=WH>z}<7B~jw0Gd=-a3bGi7J|{ z+R?v5Wh=GyQ`5U{mvs&YmCfD*@3u`_o8C1rO)c%XXQxc+74v!XTgAEY-~L6(R%b4p zpy&w&{vqNrj`T(MjF>ieo-_X?CBB5+&@1Q<5f60FOmS?lu@8lbNB^R#gV@_|NImK7 zw~YTROAxBmO{wwV?d|Cp)>;q$Z8ck{!L|MwKwW?%ExAw0t;tO0N4>Kjy_ck}@mF>j z+>mSodYjE6Zt_dD5(2{c;z|^@J-QiXabwp43TRKcqns=T_tJRp9(g2c)sf3mc1wWb zpJggV!#Z3*W+BH}{{TMKZl6Zw@(RGA^?Di=lqgR)`xJgE=Oa+0NS2BG7h4=8)4P5v zRAf|Y1zO!YQ@+R67aAbFcUfPdttGkDXxuHOb9G>9<13#k{_YIaD0$G8r{91Z%cD@M2Y;_~*bvy)ROJcqIhYViSHO<6?|UYU$<-z@A*cI>2~m zL@J`je|wVO@Wb*^wO$#HFJm7%D*jeDlgY8IWFHC@w+m-j9NT;BhJHa%rSwNytP3Si zC=gXj)&EuAEw9Ky+D0u2?j(!f|s{#L+V($RtMTSGeRUrwQm3 zMQ(tp0IYwKJ2e>f=9+}U5)DSdIgjNX7(IucN}&F+axTGhSvyo%mW5{IOhG@L@# z@iyo_`y??y6U>4i^ln=WMCn)BL2@m55~-**s)15dCdsS*0Ii7m_geW_Ky40;UY4p7 z7=l0WTS293!4iW-oWi`owGI(n<4%>d(>K=h-g3O~7M!wu5{uCe5*|3225z==A8@nv zU@8bo{Rn7OhrHk?8Vv4q?$muSLO!NImn+X&c-(F!^40)!DKAtym_%6zQ!QG4ZBx@@ z_t2y2+Vq?!WsxTwQ%mtz`0c+MnBY4dq-Wf7Nud(WP^p}djEil+=Bi#kO9yOSi-`Up zOj#!$luv#(F5upT-yNCWb$I#l?<6#($B|CcVn3t!cL~7LgGaR3{gj29?CmtMUX}Dv z_e>FO4m7A}ioZaRRkgg%{ht)-T*>9hlA|j?Hs19MPq%IQ^j2Ww8tgv)qb~J;sPvmI zWy(X;EAmH@3CNNktfuaLer9PnWTZ6c0&)*4X6#c z{a2+suH$81(%_ov-2Ot z(n2zb%GXWqx(O?q4}^FJ4krydwd;!=MdKCC`4wQD4~(r)(PEN&@q>sYx3eKKfTOc+ z{@=o3+&%M{Q(w$3J0|w8kebtCX_SS#?6Od?f2FicI5Wekzs3#^6Zcn0!~fzj#bUSq zUu#V#2WSoGPar4D`%|>^li!Ev6!?093ag=i_A{hgCm|HP#2I6BUrF^NhSw#8QZTyL zeazM6`|c#tfh;QP457tr{5}*l_VcxvmXG0lQwU_Bp~=}hXr$+Y!(zntc98rSj@AJ( zva?t3iArIT2WV0SpCpFV9>J6`iH}K93f$Ih@?lfCV{}SdRQyXrtA;!DlopvaQ8fJ8 zaE7t}M2haPR_rl*m)0QAvB$UkU^vrbY)Q;Jv!!V8xV2`)Pajhm0Uq*-P~Yp2n=d{k z4|+c5R8d*L)tOvIf?ZWoQ`%fDXFis)01%>yh21mnIQ7@r zqhVq&K_21M7qLfa;@SU42SW|WsY1WdN^tObWRr&{6v|(5RD4L7!rbk4Yp`w6&j{!j zxf<0R;(M;7j{2Z&jiTgG-8Mw0E(L3b?8HM~mES5DYlz|eVNXxRuYhq!78BBCFuNlc zSQFC+PRxLTGM1P5B{gGAYvWM8Z*KnI%eEbgPHBwo9uq)XapxfAw1HN}C!k)(GMHDs3}FwTqvTqI$Q65A;L$>RKO!VpLZ$D zCrePhGrE%WmUhvBP;gHjP!m!#jpN?v{b!^^skV|fjZ>om!iW9Rw&W#6Qf!q)u|G#f z^aX(v4r6tT@Kq$CzDJFfs9il(7)huw#nV}`(IFe~XbU_b$){N=le}AaQPz(w=^Rry zUvy%1VU@2Xc$XN{X<3a<<*3K6);WD!0|W&+>p1J$-IT_t`BkVQGdU~3b)VXVFU~~3 z7=Ni32gTs_gMRbQ9yW9a4JUqeVa(!Jl6dzBqdoEDtNcDs>*En(2 zY`qY%U8OWnIMd3BD`hXV3F2wuCgIH2oVdIH>WM^2=otE6%z6Hli$J>{=lTb*;0rCr z;Tl-sNVEe#rwr$l zKolDDd09;W8ZhQsD_N zlfFqV7_96>fdQI4fZqBKYZ-;IP{&?q6&$LRw$tYLoVY@E9!)Ijp7E#6F(?bQ?1gs0 z0!_S7d8597wR{p^GPace6q{Hp=3ArwIZJdvjoqdtRH(0~$C3d<;y8`!cPzNl^t~E2 zf_|n2{yF`1ev>C(JfT3;kC7a|GM_B|Ckou>Cf)KjhHal#`E&I`N65ywy-G~*zcrRT zZpRf6s7b&nM77%UX+?uOwLvacGjYq!$8S7>X$Mak5X1G8(Lx|TRZmD!adnG44MxTr z5emP+kS-_4jj!N3i`rfCtpzjSv^If@MajpQ6)vqOYvlvY#;BKuH6z-mevoVk zo`_MMCPi}Ez{fnbeYO#}oKC`_^_Gcp4Psj;?=foONeo(eSsyEsC%~hu2!lre!IVfs zffUDu8Y_SfNpY+Y8)Z=0M9BGhrG%df?$~WX97SioVv;U15Ardrk4scP5F`A%p!m(; psyq6>_qp>4#Q!8zpVpgNQ1B>7_(6rZmkfbl`-v`lZ~u*&_&=*~X`lcA literal 0 HcmV?d00001 From 4b42ecb0f64c0044786412c15fb31b3705016375 Mon Sep 17 00:00:00 2001 From: Pavel Stupnikov Date: Fri, 22 Jan 2021 12:28:26 +0300 Subject: [PATCH 44/47] Feature: Add tile parameter for GSCompany.ChangeBankBalance to show text effect if needed (#8573) --- bin/game/compat_1.10.nut | 7 +++++++ bin/game/compat_1.2.nut | 7 +++++++ bin/game/compat_1.3.nut | 7 +++++++ bin/game/compat_1.4.nut | 8 ++++++++ bin/game/compat_1.5.nut | 7 +++++++ bin/game/compat_1.6.nut | 7 +++++++ bin/game/compat_1.7.nut | 7 +++++++ bin/game/compat_1.8.nut | 7 +++++++ bin/game/compat_1.9.nut | 7 +++++++ src/misc_cmd.cpp | 8 +++++++- src/script/api/game_changelog.hpp | 3 +++ src/script/api/script_company.cpp | 6 ++++-- src/script/api/script_company.hpp | 3 ++- 13 files changed, 80 insertions(+), 4 deletions(-) diff --git a/bin/game/compat_1.10.nut b/bin/game/compat_1.10.nut index 1c85766c0f..92cef84c53 100644 --- a/bin/game/compat_1.10.nut +++ b/bin/game/compat_1.10.nut @@ -6,3 +6,10 @@ */ GSLog.Info("1.10 API compatibility in effect."); + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.2.nut b/bin/game/compat_1.2.nut index c042e988b5..5fb29efedf 100644 --- a/bin/game/compat_1.2.nut +++ b/bin/game/compat_1.2.nut @@ -28,3 +28,10 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.3.nut b/bin/game/compat_1.3.nut index 161f4fd0a0..7546e54c69 100644 --- a/bin/game/compat_1.3.nut +++ b/bin/game/compat_1.3.nut @@ -28,3 +28,10 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.4.nut b/bin/game/compat_1.4.nut index 0ebb850675..c90b3e550b 100644 --- a/bin/game/compat_1.4.nut +++ b/bin/game/compat_1.4.nut @@ -20,3 +20,11 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} + diff --git a/bin/game/compat_1.5.nut b/bin/game/compat_1.5.nut index 86283cc0dd..0c62e56462 100644 --- a/bin/game/compat_1.5.nut +++ b/bin/game/compat_1.5.nut @@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.6.nut b/bin/game/compat_1.6.nut index 4a091b81ea..198b863a77 100644 --- a/bin/game/compat_1.6.nut +++ b/bin/game/compat_1.6.nut @@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.7.nut b/bin/game/compat_1.7.nut index febd335c36..76dc424353 100644 --- a/bin/game/compat_1.7.nut +++ b/bin/game/compat_1.7.nut @@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.8.nut b/bin/game/compat_1.8.nut index bd33b79f09..b9d27458a9 100644 --- a/bin/game/compat_1.8.nut +++ b/bin/game/compat_1.8.nut @@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id) { return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL); } + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/bin/game/compat_1.9.nut b/bin/game/compat_1.9.nut index ab9ffbccaf..32eec114af 100644 --- a/bin/game/compat_1.9.nut +++ b/bin/game/compat_1.9.nut @@ -6,3 +6,10 @@ */ GSLog.Info("1.9 API compatibility in effect."); + +/* 1.11 adds a tile parameter. */ +GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance; +GSCompany.ChangeBankBalance <- function(company, delta, expenses_type) +{ + return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID); +} diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp index c943a2027f..2d1bbdf7a7 100644 --- a/src/misc_cmd.cpp +++ b/src/misc_cmd.cpp @@ -19,6 +19,8 @@ #include "company_func.h" #include "company_gui.h" #include "company_base.h" +#include "tile_map.h" +#include "texteff.hpp" #include "core/backup_type.hpp" #include "table/strings.h" @@ -207,7 +209,7 @@ CommandCost CmdMoneyCheat(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 /** * Change the bank bank balance of a company by inserting or removing money without affecting the loan. - * @param tile unused + * @param tile tile to show text effect on (if not 0) * @param flags operation to perform * @param p1 the amount of money to receive (if positive), or spend (if negative) * @param p2 (bit 0-7) - the company ID. @@ -230,6 +232,10 @@ CommandCost CmdChangeBankBalance(TileIndex tile, DoCommandFlag flags, uint32 p1, Backup cur_company(_current_company, company, FILE_LINE); SubtractMoneyFromCompany(CommandCost(expenses_type, -delta)); cur_company.Restore(); + + if (tile != 0) { + ShowCostOrIncomeAnimation(TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE, GetTilePixelZ(tile), -delta); + } } /* This command doesn't cost anything for deity. */ diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index cbb862f1ca..82f0c0523b 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -35,6 +35,9 @@ * \li GSStoryPage::MakeVehicleButtonReference * \li GSPriorityQueue * + * Other changes: + * \li GSCompany::ChangeBankBalance takes one extra parameter to refer to a location to show text effect on + * * \b 1.10.0 * * API additions: diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp index 93bba63328..20f1b3f7a1 100644 --- a/src/script/api/script_company.cpp +++ b/src/script/api/script_company.cpp @@ -226,17 +226,19 @@ return GetLoanAmount() == loan; } -/* static */ bool ScriptCompany::ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type) +/* static */ bool ScriptCompany::ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type, TileIndex tile) { EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY); EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END); EnforcePrecondition(false, (int64)delta >= INT32_MIN); EnforcePrecondition(false, (int64)delta <= INT32_MAX); + EnforcePrecondition(false, tile == INVALID_TILE || ::IsValidTile(tile)); company = ResolveCompanyID(company); EnforcePrecondition(false, company != COMPANY_INVALID); - return ScriptObject::DoCommand(0, (uint32)(delta), company | expenses_type << 8 , CMD_CHANGE_BANK_BALANCE); + /* Network commands only allow 0 to indicate invalid tiles, not INVALID_TILE */ + return ScriptObject::DoCommand(tile == INVALID_TILE ? 0 : tile , (uint32)(delta), company | expenses_type << 8 , CMD_CHANGE_BANK_BALANCE); } /* static */ bool ScriptCompany::BuildCompanyHQ(TileIndex tile) diff --git a/src/script/api/script_company.hpp b/src/script/api/script_company.hpp index ea2f0cdd14..635b6fdee0 100644 --- a/src/script/api/script_company.hpp +++ b/src/script/api/script_company.hpp @@ -242,6 +242,7 @@ public: * @param company The company to change the bank balance of. * @param delta Amount of money to give or take from the bank balance. A positive value adds money to the bank balance. * @param expenses_type The account in the finances window that will register the cost. + * @param tile The tile to show text effect on or ScriptMap::TILE_INVALID * @return True, if the bank balance was changed. * @game @pre No ScriptCompanyMode active in scope. * @pre ResolveCompanyID(company) != COMPANY_INVALID. @@ -250,7 +251,7 @@ public: * @note You need to create your own news message to inform about costs/gifts that you create using this command. * @api -ai */ - static bool ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type); + static bool ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type, TileIndex tile); /** * Get the income of the company in the given quarter. From bab7de6cf23dce124ef8b1e284d0d1f3996dc8b8 Mon Sep 17 00:00:00 2001 From: dP Date: Fri, 15 Jan 2021 17:38:14 +0300 Subject: [PATCH 45/47] Feature: Allow GameScripts to add additional text to Industry view window --- src/command.cpp | 2 +- src/industry.h | 8 ++++++++ src/industry_cmd.cpp | 26 ++++++++++++++++---------- src/industry_gui.cpp | 7 +++++++ src/saveload/industry_sl.cpp | 1 + src/saveload/saveload.h | 1 + src/script/api/game_changelog.hpp | 1 + src/script/api/script_industry.cpp | 15 +++++++++++++++ src/script/api/script_industry.hpp | 10 ++++++++++ 9 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index de5f8397d5..7c7ca13e4b 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -266,7 +266,7 @@ static const Command _command_proc_table[] = { DEF_CMD(CmdChangeServiceInt, 0, CMDT_VEHICLE_MANAGEMENT ), // CMD_CHANGE_SERVICE_INT DEF_CMD(CmdBuildIndustry, CMD_DEITY, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_BUILD_INDUSTRY - DEF_CMD(CmdIndustryCtrl, CMD_DEITY, CMDT_OTHER_MANAGEMENT ), // CMD_INDUSTRY_CTRL + DEF_CMD(CmdIndustryCtrl, CMD_STR_CTRL | CMD_DEITY, CMDT_OTHER_MANAGEMENT ), // CMD_INDUSTRY_CTRL DEF_CMD(CmdSetCompanyManagerFace, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_COMPANY_MANAGER_FACE DEF_CMD(CmdSetCompanyColour, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_COMPANY_COLOUR diff --git a/src/industry.h b/src/industry.h index 401051d5a2..ce30114cb8 100644 --- a/src/industry.h +++ b/src/industry.h @@ -33,6 +33,13 @@ enum ProductionLevels { PRODLEVEL_MAXIMUM = 0x80, ///< the industry is running at full speed }; +enum class IndustryAction : byte { + SetControlFlags = 0, ///< Set IndustryControlFlags + SetExclusiveSupplier = 1, ///< Set exclusive supplier + SetExclusiveConsumer = 2, ///< Set exclusive consumer + SetText = 3, ///< Set additional text +}; + /** * Flags to control/override the behaviour of an industry. * These flags are controlled by game scripts. @@ -91,6 +98,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { byte selected_layout; ///< Which tile layout was used when creating the industry Owner exclusive_supplier; ///< Which company has exclusive rights to deliver cargo (INVALID_OWNER = anyone) Owner exclusive_consumer; ///< Which company has exclusive rights to take cargo (INVALID_OWNER = anyone) + std::string text; ///< General text with additional information. uint16 random; ///< Random value used for randomisation of all kinds of things diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 69d67b9d8c..20c38e5456 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -40,6 +40,8 @@ #include "object_base.h" #include "game/game.hpp" #include "error.h" +#include "cmd_helper.h" +#include "string_func.h" #include "table/strings.h" #include "table/industry_land.h" @@ -2063,16 +2065,13 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin * @param flags Type of operation. * @param p1 IndustryID * @param p2 various bitstuffed elements - * - p2 = (bit 0 - 7) - action to perform: - * 0 = set control flags - * 1 = set exclusive supplier - * 2 = set exclusive consumer + * - p2 = (bit 0 - 7) - IndustryAction to perform * - p2 = (bit 8 - 15) - IndustryControlFlags * (only used with set control flags) * - p2 = (bit 16 - 23) - CompanyID to set or INVALID_OWNER (available to everyone) or * OWNER_NONE (neutral stations only) or OWNER_DEITY (no one) * (only used with set exclusive supplier / consumer) - * @param text unused + * @param text - Additional industry text (only used with set text action) * @return Empty cost or an error. */ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) @@ -2082,10 +2081,10 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint Industry *ind = Industry::GetIfValid(p1); if (ind == nullptr) return CMD_ERROR; - uint8 action = GB(p2, 0, 8); + auto action = static_cast(GB(p2, 0, 8)); switch (action) { - case 0: { + case IndustryAction::SetControlFlags: { IndustryControlFlags ctlflags = (IndustryControlFlags)GB(p2, 8, 8) & INDCTL_MASK; if (flags & DC_EXEC) ind->ctlflags = ctlflags; @@ -2093,15 +2092,15 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint break; } - case 1: - case 2: { + case IndustryAction::SetExclusiveSupplier: + case IndustryAction::SetExclusiveConsumer: { Owner company_id = (Owner)GB(p2, 16, 8); if (company_id != OWNER_NONE && company_id != INVALID_OWNER && company_id != OWNER_DEITY && !Company::IsValidID(company_id)) return CMD_ERROR; if (flags & DC_EXEC) { - if (action == 1) { + if (action == IndustryAction::SetExclusiveSupplier) { ind->exclusive_supplier = company_id; } else { ind->exclusive_consumer = company_id; @@ -2111,6 +2110,13 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint break; } + case IndustryAction::SetText: { + ind->text.clear(); + if (!StrEmpty(text)) ind->text = text; + InvalidateWindowData(WC_INDUSTRY_VIEW, ind->index); + break; + } + default: NOT_REACHED(); } diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index a89d4b4c50..58f4a6097a 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -913,6 +913,13 @@ public: } } } + + if (!i->text.empty()) { + SetDParamStr(0, i->text.c_str()); + y += WD_PAR_VSEP_WIDE; + y = DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, y, UINT16_MAX, STR_JUST_RAW_STRING, TC_BLACK); + } + return y + WD_FRAMERECT_BOTTOM; } diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index 99e25856c8..6f41e34552 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -72,6 +72,7 @@ static const SaveLoad _industry_desc[] = { SLE_CONDNULL(1, SLV_82, SLV_197), // random_triggers SLE_CONDVAR(Industry, random, SLE_UINT16, SLV_82, SL_MAX_VERSION), + SLE_CONDSSTR(Industry, text, SLE_STR | SLF_ALLOW_CONTROL, SLV_INDUSTRY_TEXT, SL_MAX_VERSION), SLE_CONDNULL(32, SLV_2, SLV_144), // old reserved space diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index fb7761128b..ac4658455c 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -323,6 +323,7 @@ enum SaveLoadVersion : uint16 { SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 and PR#8115 GS industry control. SLV_VEH_MOTION_COUNTER, ///< 288 PR#8591 Desync safe motion counter + SLV_INDUSTRY_TEXT, ///< 289 PR#8576 Additional GS text for industries. SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index 82f0c0523b..edc5884072 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -30,6 +30,7 @@ * \li GSIndustry::SetControlFlags * \li GSIndustry::SetExclusiveConsumer * \li GSIndustry::SetExclusiveSupplier + * \li GSIndustry::SetText * \li GSStoryPage::MakePushButtonReference * \li GSStoryPage::MakeTileButtonReference * \li GSStoryPage::MakeVehicleButtonReference diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp index 14ba8e4022..0a5ca98d35 100644 --- a/src/script/api/script_industry.cpp +++ b/src/script/api/script_industry.cpp @@ -15,6 +15,7 @@ #include "script_map.hpp" #include "../../company_base.h" #include "../../industry.h" +#include "../../string_func.h" #include "../../strings_func.h" #include "../../station_base.h" #include "../../newgrf_industries.h" @@ -47,6 +48,20 @@ return GetString(STR_INDUSTRY_NAME); } +/* static */ bool ScriptIndustry::SetText(IndustryID industry_id, Text *text) +{ + CCountedPtr counter(text); + + const char *encoded_text = nullptr; + if (text != nullptr) { + encoded_text = text->GetEncodedText(); + EnforcePreconditionEncodedText(false, encoded_text); + } + EnforcePrecondition(false, IsValidIndustry(industry_id)); + + return ScriptObject::DoCommand(0, industry_id, static_cast(IndustryAction::SetText), CMD_INDUSTRY_CTRL, encoded_text); +} + /* static */ ScriptIndustry::CargoAcceptState ScriptIndustry::IsCargoAccepted(IndustryID industry_id, CargoID cargo_id) { if (!IsValidIndustry(industry_id)) return CAS_NOT_ACCEPTED; diff --git a/src/script/api/script_industry.hpp b/src/script/api/script_industry.hpp index dac3d32fd7..95133da0ec 100644 --- a/src/script/api/script_industry.hpp +++ b/src/script/api/script_industry.hpp @@ -81,6 +81,16 @@ public: */ static char *GetName(IndustryID industry_id); + /** + * Set the custom text of an industry, shown in the GUI. + * @param industry_id The industry to set the custom text of. + * @param text The text to set it to (can be either a raw string, or a ScriptText object). If null is passed, the text will be removed. + * @pre IsValidIndustry(industry_id). + * @return True if the action succeeded. + * @api -ai + */ + static bool SetText(IndustryID industry_id, Text *text); + /** * See whether an industry currently accepts a certain cargo. * @param industry_id The index of the industry. From b61670f9297dc52adff1a8cb6d57a86faec552f1 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Wed, 13 Jan 2021 13:01:17 +0000 Subject: [PATCH 46/47] Doc: Forwardport changelog & doc changes from 1.10 branch --- changelog.txt | 119 +++++++++++++++++++++++++++++++++++++++++++++++++ known-bugs.txt | 4 +- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 143513dbe3..33a9a06b18 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,122 @@ +1.10.3 (2020-08-09) +------------------------------------------------------------------------ +Change: Also make roadside trees match the tree transparency option (#8245) +Fix: Center text and icons in the status bar vertically (#8273) +Fix: [NRT] Set invalid road and tram types for rail tunnel ends (#8269) +Fix #7980: Properly invalidate mouse-over station coverage highlight (#8263) +Fix #8250: [NRT] Company infrastructure window always omits last road/tramtype (#8251) +Fix #8162: [NRT] Improve error message when converting town owned road (#8247) +Fix #8216: Don't show floating text on autoreplace if cost is 0 (#8244) +Fix #8129: Crash if a news message expires while viewing the endgame screen (#8243) +Fix #8221: Use more specific error message when a bridge is too long (#8240) +Fix #8230: Resolve ".." when opening files in .tar (#8231) +Fix: A few race conditions in netcode (#8227, #8228, #8229) +Fix #7838: Crash relating to group creation and renaming (#8223) +Fix #8104: [SDL2] Fix window resizability when going from fullscreen to windowed mode (#8211) +Fix: Display banlist's indexes correctly (#8209) +Fix: Possible desync with subsidy creation (#8159) +Fix #8131: Draw small bridges pillars in more places (#8149) + + +1.10.2 (2020-06-01) +------------------------------------------------------------------------ +Add: Ubuntu 20.04 packages (#8127) +Fix: [OSX] Possible crash on failure to set colourspace (#8181) +Fix #8166: Prevent crash from a NewGRF with an invalid RoadType (#8180) +Fix #8024: Make Online Content GUI more responsive while loading (#8179) +Fix #7970: Disable event loop when generating crash dump (#8176) +Fix: [Build] Compatibility with modern Visual Studio (#8170) +Fix: Trees would disappear completely after a few years if tree spread was disabled (#8160) +Fix #8155: Roadtype speed limit in scenario editor toolbar dropdown was doubled (#8156) +Fix: Desync after house replacement (#8151) +Fix #8137: New clients can't join (desync) after funding an industry (#8140) +Fix #8132: Corrupted savegame with station with multiple owners caused a crash (#8134, #8142) +Fix: Stop gamelog when recovering from a savegame load error (#8133) +Fix: Exceptionally unlikely issue when reading MIDI files (#8125) +Fix #8119: Docking areas were not properly updated when clearing, causing desyncs (#8124, #8130) +Fix #8117: Memory leak for incoming admin port packets (#8122) +Fix: Non-roadbridges potentially had roadtype information set (#8111) +Fix #8108: Possible crash on loading TTD savegames with phantom oil rigs (#8109, #8110) +Fix #8093: Build & refit test run changed game state and could cause desyncs (#8103) +Fix: [Script] AreWaterTilesConnected did not handle aqueducts properly (#8074) + + +1.10.1 (2020-04-13) +------------------------------------------------------------------------ +Fix #8081: Crash when placing a ship depot next to a dock (#8082) +Fix: [GS] A Goal's QuestionID was getting truncated (#8072) +Fix #8064: Refit capacity could be displayed incorrectly in extreme edgecases (#8065) +Fix #8060: Restore admin network API compatibility (#8061) +Fix #8055: Crash when roadtype availability changes with the road construction toolbar open (#8058) + + +1.10.0 (2020-04-01) +------------------------------------------------------------------------ +Change: Open company window when clicking on a company goal (#8033) +Change: [SDL2] Support pasting from clipboard on Linux (#8004) +Fix: [Script] Random deviation upper bound range should be inclusive (#8052) +Fix #8043: Incorrect handling of global road/tram hotkeys caused a crash (#8044) +Fix #8039: [Script] SetOrderFlags and GetOrderDestination didn't work for oil rigs (#8040) +Fix: [Script] CanBuildConnectedRoadPartsHere neighbours tiles were incorrect if you started a new game with a different world size (#8036) +Fix: Ignore clicks on non-applicable global goals (#8035) +Fix #7613: Limit News Window to 1024 messages to keep it usable and avoid overflowing scrollbars (#8026) +Fix #7644: [OSX] Hopefully improve performance by manually set colorspace to sRGB (#8023) +Fix #8020: Add missing docking tiles around industry neutral stations (#8021) +Fix: GUI tramway icon only contained a single set of tram tracks (#8015) +Fix: Station with multiple docks had the wrong tile area (#8014) +Fix #8011: Crash when loading TTD scenario containing a dock (#8012) +Fix #7998: Crash when scripts tried to access companies with invalid IDs (#8010) +Fix: Crash when attempting to draw a string containing nonprintable characters (#8005) +Fix #6399: Directory ~/.local/share not created if it didn't already exist (#8003) +Fix #7958: Custom catenary missing on road bridges (#7991) +Fix #7944: Demolishing locks built on rivers didn't always restore the river (#7946) + + +1.10.0-RC1 (2020-02-09) +------------------------------------------------------------------------ +Feature: Allow server to supply a reason to kicked/banned clients (#7859) +Feature: [NewGRF] Station variable 6A, querying GRFID of nearby station tiles (#7956) +Feature: Improved logic of sharing industry production between 3 or more stations (#7922) +Feature: Highlight the item under mouse cursor in file browser (#7900) +Feature: [GS] Methods to change town rating of companies (#7898) +Feature: [NewGRF] Callback profiling command (#7868) +Feature: Add a setting to show the name of the NewGRF of a vehicle in the build window (#7852) +Feature: Ability to filter industry directory window by cargo (#7843) +Feature: Minimap screenshot type (#7817) +Feature: [GS] Methods to control engine availability of a specific company (#7791) +Feature: Configurable game ending year (#7747) +Feature: Separate window for taking screenshots (#7550) +Change: Move autorenew setting to basic category (#7984) +Change: Improved algorithm for transfer feeder payments (#7935) +Change: Show volume sliders with wedges instead of boxy slider (#7902) +Change: Auto-restart loads the original resources (e.g. save or scenario) again (#7688) +Change: Improve readability of integer lists saved to config files (#7396) +Fix #7976: Crash when attempting to kick the host via rcon (#7985) +Fix #7592: Road vehicles no longer balanced between multiple road stop stations (#7979) +Fix: Station rating effects affecting too large area (#7977) +Fix #7974: Crash when Ctrl+click to show a collapsed vehicle group (#7975) +Fix #7969: Crash when executing a recursive console alias (#7973) +Fix #6566: Very long loading of the maximum "zoom out" level at high resolutions (#7968) +Fix #7952: Crash when switching input languages (#7953) +Fix: [OSX] Don't show a crash/assertion message box for a GUI-less video driver (#7934) +Fix #7925: Corrupt savegames could lead to corruption of the titlegame (#7932) +Fix: [Fluidsynth] Music notes from previous song were not properly reset (#7930) +Fix: Invalid string usage within music window (#7928) +Fix: Non-deterministic name sorting in industry directory window (#7915) +Fix #7899: Various issues with town list window sorting (#7906, #7916) +Fix #7587: Fix possible crashes when loading old save games with invalid waypoint positions (#7894) +Fix: Avoid a crash by properly resetting timetable duration when loading old savegames (#7894) +Fix: Possible crash when post road-works cleanup removes all road pieces (#7903) +Fix #7891: Fix crash when loading save from 1.7.2 (#7892) +Fix #7887: Missing sound effects for some main toolbar buttons (#7888) +Fix #6667: Avoid confusion by also recalculating bridge costs for 'spectated' AI companies (#7884) +Fix: Allow old NewGRF industries to hide in/out cargo slots (#7882) +Fix: [Windows] Fix bootstrap GUI with Uniscribe but no Freetype (#7878) +Fix: Missing keycodes for hotkeys.cfg (#7850) +Fix #7625: Ensure road infrastructure cost is correctly updated when upgrading your own roads (#7628) +Fix #7088: Avoid crash by closing AI/GS textfile windows when changing their in-game slot (#7094) + + 1.10.0-beta2 (2019-12-25) ------------------------------------------------------------------------ - Feature: [Script] More error mappings (#7857) diff --git a/known-bugs.txt b/known-bugs.txt index 440a4709ff..99abb83a88 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2019-12-25 -Release version: 1.10.0-beta2 +Last updated: 2020-08-09 +Release version: 1.10.3 ------------------------------------------------------------------------ From a252679a121a3e989ba76fae29007151fdac26a1 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Wed, 13 Jan 2021 13:03:37 +0000 Subject: [PATCH 47/47] Doc: Prepare for 1.11.0-beta1 release --- changelog.txt | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ known-bugs.txt | 4 +- 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 33a9a06b18..068dad577f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,113 @@ +1.11.0-beta1 (2021-01-22) +------------------------------------------------------------------------ +Feature: [GS] Ability to set some extra text in the industry window (#8576) +Feature: Show rainforest under vegetation on smallmap (#8562) +Feature: Automatically determine window size on new install (#8536) +Feature: Towns can build tunnels (#8473) +Feature: Make maximum length of town bridges depend on population (with a minimum limit of 4) (#8439) +Feature: New icons for renaming and go-to-location on GUI windows, and improve consistency of usage (#8455) +Feature: Support for ARM64 on Apple Silicon and Windows (#8340, #8577, #8583) +Feature: Add an option to disable tree growth completely (#8415) +Feature: Support for Emscripten (play-OpenTTD-in-the-browser!) (#8355) +Feature: Show group name as part of the default vehicle name (#8307) +Feature: "Frozen" economy setting that stops production changes and industry closures (#8282) +Feature: New velocity unit "tiles/day" (#8278) +Feature: Option to automatically remove signals when placing rail (#8274) +Feature: Increase max possible distance from border for oil refineries and rigs (#8237) +Feature: Improve tree planting window, and allow planting 'clumps' of trees by dragging in the scenario editor (#8234) +Feature: Indian Rupee (INR) currency (#8136) +Feature: [GS] Ability to give a company exclusive access to an industry (#8115) +Feature: Hotkeys for Land Info window, News window & close error window (#8053, #8266) +Feature: Improve rendering of large viewports (#7962) +Feature: [GS] Influence industry production changes from GameScript (#7912) +Feature: [GS] Push-buttons on storybook pages (#7896) +Feature: Option to group vehicle lists by shared orders (#7028) +Feature: Drag-and-drop vehicles in group GUI for shared order groups (#7028) +Add: [GS] A tile parameter to GSCompany::ChangeBankBalance for showing changes more visually (#8573) +Add: [NewGRF] Allow NewGRF vehicles to query the current rail/road/tram type (#8554) +Add: [Script] ScriptCargo::GetName for the human readable name of cargoes (#8544) +Add: "reload" console command to reload the current scenario or heightmap (#8527) +Add: [NewGRF] Flag to test if inflation is on or off (#8427) +Add: [Script] Native priority queue (useful for things like pathfinders) (#8091) +Add: [NewGRF] Industry behaviour flag to override second cargo production clamping for water industries when using smooth economy (#8079) +Change: [SDL2] Start game on the screen where the cursor is (#8572) +Change: Use a dark background for all profit graphs to increase contrast (#8557) +Change: Reword warning in cheat window (#8538) +Change: Enable the toolbar for road/rail/dock/airport, regardless of vehicle availability (#8521) +Change: For arctic and tropical climates, make sure at least a few hills are generated (#8513) +Change: Destroying a tunnel/bridge now sells the tracks before destroying the tunnel/bridge (#8508) +Change: Move "give money" from client-list to company window (#8500) +Change: [MacOS] Hide Dock and menu when in fullscreen mode (#8487) +Change: Improve performance for complex vehicle chains by resolving sprites less frequently (#8485) +Change: Make engine reliability independent of introduction date (#8470) +Change: Some default settings to improve gameplay for new players - default non-stop orders on, disable inflation, quick goto orders, show track reservations, and more (#8463) +Change: Converting town-owned road types now requires a positive town rating (#8457) +Change: Rework server list buttons for searching LAN/internet servers (#8426) +Change: Add some styling to GS question windows depending on the type (#8422) +Change: [Linkgraph] Speed up game exit by allowing job threads to be aborted early (#8416) +Change: Prevent towns from building dead-end road bridges (#8401) +Change: Send network error to the server before making an emergency save (#8387) +Change: Extend the allowed range for max loan setting up to £2 billion (#8386) +Change: Don't display OS name when exiting the game (#8366) +Change: Save openttd.cfg immediately on changing a setting (#8358) +Change: Autorenew now defaults to on (#8352) +Change: [NewGRF] Also use aircraft property 12 for helicopters (#8347) +Change: Service at depot also resets breakdown chance (#8317) +Change: Use key names instead of characters in hotkey.cfg (#8291) +Change: Allow command cost-estimation while paused (#8222) +Change: Always apply inflation from 1920 to 2090, no matter the game start year (#7589) +Change: Use CMake for build system (#7270) +Change: [Linkgraph] Pause the game when linkgraph jobs lag (#7081) +Change: Place "Group by" above "Sort by" in station window for consistency (#7028) +Fix #8589: Prevent desyncs with vehicle motion counters and NewGRFs (#8591) +Fix #7670: Improve pathfinder performance when lost vehicles are blocked from moving (#8568) +Fix: Inform user if a custom font failed to load due to missing glyphs (#8559) +Fix: Don't allow wagon chains (without an engine) to exceed maximum train length (#8533) +Fix #7619: Super fast NewGRF aircraft could be unable to land (#8531) +Fix: Improve connection retries for the content server in cases of broken networking (#8530) +Fix #7972: Show invalid orders to stations that don't accept the vehicle (#8516) +Fix: Error when trying to clone a vehicle with invalid orders (#8515) +Fix #8050: Various off-by-one errors in how the end-year of the game was used (#8512) +Fix #8332: Aborting vehicle group drag & drop could cause crashes (#8511) +Fix #8168: Allow relocating HQ partially over an existing HQ (#8510) +Fix #8068: Allow selling tram track regardless of bank balance (#8509) +Fix #7604: Prevent houses from wandering away from roads (#8507) +Fix: Make the "password" button the same size as the other buttons in the Company window (#8500) +Fix #7611: Keep news about vehicle accidents around after the vehicle is cleaned up (#8497) +Fix: [MacOS] Full animation in fullscreen mode was reducing the height of the window (#8491) +Fix: [MacOS] Loading custom fonts (#8484) +Fix: Network client makes emergency saves twice if the server is disconnected (#8477) +Fix #8462: Stop towns from trying to build roads on water (#8471) +Fix: [NewGRF] GetCurveSpeedLimit should use the railtype from the current tile (#8466) +Fix #8437: Crash when using certain heliports with certain rotated airports (#8458) +Fix #8437: Planes would land at the wrong height if the top corner of the airport was lowered (#8458) +Fix #8297: Infrastructure counters for road tunnels, bridges & depots (#8454) +Fix #6468: Don't store the version of AIs that are started via console (#8430) +Fix: Don't lower tree density if spreading is not enabled (#8413) +Fix: Prevent savegame version conflicts with certain old patchpacks (#8411) +Fix: [NewGRF] Variable 0x44 was always HZB_TOWN_EDGE for road stops (#8400) +Fix #8313: Use correct capitalization for TTO / DOS music files in the baseset metadata (#8385) +Fix: [NewGRF] Action 7/9 conditions 0x0F to 0x12 failed, if 'param' was 0x88 (#8382) +Fix: Change the working-dir searchpath when using '-c' (#8367) +Fix: Useless warning with -snull and no BaseSounds available (#8361) +Fix: Crash trying to load TTO/TTD savegames. (#8356) +Fix: [Script] Don't echo script exceptions to console (#8331) +Fix: Slovak ownname was using the wrong form (#8326) +Fix #8311: [NewGRF] Industry probability at map generation was scaled differently when set via property or callback (#8312) +Fix: Only check houses for cargo when generating subsidies with towns (#8305) +Fix: Sprite preview in sprite aligner was too small with scaled UI (#8288) +Fix: Spell 'Viewport' consistently (#8260) +Fix #7772: Show vehicle destination on mouseover when vehicle stopped (#8236, #8543) +Fix #8232: Huge screenshot warning was shown incorrectly (#8224) +Fix #8153: Report incompatible cargo/order when autoreplace fails (#8169) +Fix: [Script] ScriptMarine::AreWaterTilesConnected did not work for aqueducts (#8074) +Fix #7645: Add cost of clearing the sloped tile to the price of a dock (#7947) +Fix #6452: Reset only editable and visible settings from GUI (#7890) +Fix: Original terrain generator did not keep a single gap of water at the borders (#7883) +Remove: In-game console command "content select all" (#8363) +Remove: [OSX] Support for OSX older than 10.7, including QuickTime music driver (#8078) + + 1.10.3 (2020-08-09) ------------------------------------------------------------------------ Change: Also make roadside trees match the tree transparency option (#8245) diff --git a/known-bugs.txt b/known-bugs.txt index 99abb83a88..a687dff4a5 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2020-08-09 -Release version: 1.10.3 +Last updated: 2021-01-22 +Release version: 1.11.0-beta1 ------------------------------------------------------------------------