From b04f131f9bedc98c6bf746aa4a5999d6ac352239 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Tue, 5 Sep 2023 11:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=85=B3=E4=BA=8E=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner2/Scanner_zh_CN.qm | Bin 38633 -> 38493 bytes app/scanner2/Scanner_zh_CN.ts | 10 +++------- app/scanner2/Scanner_zh_EN.qm | Bin 50059 -> 49837 bytes app/scanner2/Scanner_zh_EN.ts | 12 ++++-------- app/scanner2/mainwindow.cpp | 4 ++-- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/app/scanner2/Scanner_zh_CN.qm b/app/scanner2/Scanner_zh_CN.qm index 1f0c33a68155924a3d7ddc651794284f9b744675..f5028050a5c57fae11bed3e43f84b97aa518cd43 100644 GIT binary patch delta 2383 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 - <p>Company website: <a href=%1>%1</p> + + <p>Company website: <a href="%1">%1</a></p> + <p>Company website: <a href=%1>%1</p> <p>公司网址: <a href="%1">%1</p> @@ -2805,12 +2807,6 @@ Please finish scanning first. <p>Company telephone: %1</p> <p>公司电话: %1</p> - - - <p>Company website: <a href="%1">%1</a></p> - <p>Company GPS: <a href=%1>%2</p> - <p>公司网址: <a href="%1">%1</a></p> - Baidu map access diff --git a/app/scanner2/Scanner_zh_EN.qm b/app/scanner2/Scanner_zh_EN.qm index 5c81663c37e377a40ae70d9e1a7147ef65c8204e..f56a279bb41bb29bb8d838028a9d354c2aa9fa1f 100644 GIT binary patch delta 2344 zcmX9=dt6QF8h+N=d#&AGd#}BVl9=igLR1pDMyOx8MbjBhX_IPHMLFRS(>-l|qt?&Jw_j#W0U3}=RKwRa~2=FhXNcJe1yW|`*jWu93docP3NYyjuUA3nznoIU5k)^Sdb zC9|QtnGTdb>Bh21C?9VF)@~tuO<2e3xq&w0Ak6UvMp<`bM89ra|1T!+1Kr&q9H)2P zUqQHd0vH|x@l%aM#ZV2ST_eJw8l6vg7^4kwbN}e7K1UQf9S*n{uTBC|JwQP~HOkowK5riME=s}2ZLazB2w0swG#F5WeQ# z`E~%_9^8jplc;nh*A+As*m#N;M^nQ+7V+ly`vdDA@jZ)91Ea6;Hb1;4lbm?lF}Z-| z4nOGGEMVC(-u+1c*mA*!KX{F$3wD#&tl?J;I0CGx;8%4Dgq?h5WePB(mM_^zT^zm0 zpZ+Zo*bv2^^I8gQPUOD}q;+~S-`aQz*teWL6(&v!QN$z%0qcHLY^bG199p|Ev_P@T z+795(Dyj!q0Q+kd4MRr&J0lc#;sbzjt%^GdQRIm;ixb^!B;~Y+r9f(ha=I^_5gn!s zZK1YOI$5O{Wnrt#KcfcJF3SCf2GFlc=Av@r7Bhot0XLM@s_X*?DIeG_pf=l;?RBoe z1Aw+DaiTsF++?AcX&qB->OV#6GGgH>LRT0Xcz{s#JMk>47pmjCfY^B9x`qn(a~E2t&Ig=Zg-17u zND>pe%vMuh_e90NN%fo*Q5(Jj*p~k#E^M9JPTIdl%qp#*7}PV9+Rr#v%&n$_@&m-Y32lV6VqtkdATL@xa*Ph1l_wq_ zYNA}aij@}MkuriS%u&BZ&<;a`=hrx^oLf@TTfPAG)4>>r@?KH-Lr9R8O2s zfx-4>{97wv_XV?F5nVLA9+>%EBGJ5hna%$PDR88N&D6|Y7^9AEp8)js>qh?yb!_Ad zAnk)Xb}d=dQ>$J&n3%6jRmU4?eb8T>me>r0E>h?3J4A|YQ5T(;s1t?y%)-HdE?C{< zPp8c+RJWY|2<+Iz1g)FVUGn+iJ}~=tY3_?i;#??&&LZymrfxLMmJGHu54LTV3`>;6 znbuA1q*sfycJD?q{DzcrJ{#D(RLa`@hUP(=v^zQgh>Ml>87P6Ko|35{kxc$xGIe^> zpsbOKTuF;Pu2Ru7QnbfjZ>cDZ4BdNNDk`ibgU7IX?ch<@m#Im~2hvZDgj1JF&6jk* zl4_}CYXcxzN^R4~%nUQBLr3H@K1!WlzI5ASnTu@g;H{Z*;2}lej3&^JEY;*{f;FG0 z6lxZky`*`Q$-b1GdXyw-w!Yj+!?~{}%|x9QZ)OFupIW1N)tBfL-(^o_yRnH(+xLhI zv3sB$l1DRa=Mb%HK^xs$H?4W26b7}XK5bc7LPMX{Av|*=0fJJMyadoslU}V`kPkvPnyQ&*#942cs9mzjW zxp(A5AjV7X>ql+mzL)=2wt|W}$_}9yDJ=o=phzRIy-argqZCLm%C5m-l=yVnZEG@h zGDi0KX9@{xlBZsbqyZWw&lCh;Y^WR%a>33 zP$WwW097fp!__Uw9YJ+Ki&wU0d~0?OK#{CV=E~x8+H0G z>F)RWTsOQhn@GISjkl)jn%}7lO1(yo8km*&D0jW?Sn~+_GC1n0!pf<|uXNw1TGDCj zb7R>vvuayHpBIvt0!us&`=c~xDD@-Nfq>%IU0 delta 2336 zcmX9=2~-qU7QJ2FRoz|P)eUY422f;EBLq=gqM!nUGAJT31QA4bB8UnIN}xqTf(rC@+)U-kd1d*8kPSJmXoH-0N0 zJoQ-A&c-Xq5OnajgNqG(oVvCP{wuw_5Ws}oSEz`OXd8{A4BE1>2x*2!6`%Q0sAdEn4J_Kq_%zY5nh6)+|n<0m--VZBD&cbAQo&mE8w z1HaM;V09km*Z^6-fAS(@|-}iqTkEF9(#DkX*4F*m@kvw?89H zW|G3%uoWdsQ-QTBv3GthFryQd!41ISR8)o#YG31E%QL{{Cp2Gc0(MM8>&7f#{XX=* zQ2>FbW%4`aK>A9VMb;T$O}NZ@d;u`^6PfE)s#|nf<{_sJt?re1UTg%)d6}Q$Ct%iS z+1#fc06VBKm7QWO3MX!l7ki?x;+DHJiMKM8d&u4g&IWR(a>68{KOlxPxn~PxFXIMQ z9R(&`=FES13sfBDEGL%&n%kV?Q-5IjpPb8YbAciIx#|5W6pqE5uc{pw%yU7f@6!A) zxZp>2z|0~p@@gOukjJHIsD~;`BW5VLG`nhiiVSxyt&gYXrgMc&Ie=daSF?^39GuG? z?WMxm&$(06l7MgCb7uo+T%h7^UONKpddq(0J=726@mW+pYXKW8SXq4MBX9qBJWYBc zzrBLkeR@-VJ2@6GG_q*H*}Pcc`%5jAa##G_n@YunD;9N<*00l9jSy@4Sh4eaHJ~1= z*j+))a|)Q9(pmP3El@6&HM1tAwc&{3zU5+IMWUjo)rqwAD;~dlNs<0d(HF1)FiBLr z@T&y2C-4JZH<2m1{J@{Rfi1&%^BHeQdl)~`trduksFqyUe0RdoEjG`J(fP4rSrBuYskd z%Cc#7z;0XR0o$uUeyj38Lez6A{jEA7gPJ^0t4YgU?PStQvk(XVrWMX;NK}`Y+px~g^4+*OGwWjVo~ucaz0Khj-&mNm>}*7 zB^xTs#LD&*S~pLu?3+%9mX}!Nbc5C%6RUiwKLfU35Uav31Ep?aRe2LRahA1cM|qs` zq-)Ef#VgBccszcWk8 zY{UhP=bm54MQ=@j&mWYKQcbXiC{;OXVpK2a9I#*uB>MrizM8xj1@u~ZsM%CW3J;jD ze91>$qUj$-6b{6)Zpms&s-<>V^;lxLR6AxzH5~&@TBkC~PwH{4tCHH~{5v7ZcYUe# z2qJj}p<15}$&{onHbH0Y(y0w_rn{zhjJP*M8&FECJr`;h=k(E8`af;>k%d4^hBmR4 z#(UK)SLep14`(ep2g3w4&qO9zOyv@TojP`T$;o4z?4N&Kpc_Vd_#&| z;Y4Q+lj0JIoMn#@S)_h?M82I=??nl$TPmHh2_ZWT()kV4Q|m6N>&a{C2jAnnraMy%bVlTT>^O0+tCH0@%G`MPoCB}5`aH`VMcWieeBn0uL=?q$5mM3++C z!RzDc9dt<79Ns_@Io-c<2hr0+-SyK%aa*tM=1CnTdx`GhbYin-KT9+*Ge4-puVxK7+4slKM_P2{FlD1o^%>Q^w;MQwUy?q+r(a( znGsK~^ewl`U(I9`fJvtCPl(^luFwYLQs5EY;+3i MZXMUaw^l3u4_1@bRsaA1 diff --git a/app/scanner2/Scanner_zh_EN.ts b/app/scanner2/Scanner_zh_EN.ts index 428cca0f..5a969ec8 100644 --- a/app/scanner2/Scanner_zh_EN.ts +++ b/app/scanner2/Scanner_zh_EN.ts @@ -2806,7 +2806,9 @@ Please contact the equipment supplier promptly to purchase a replacement paper r - <p>Company website: <a href=%1>%1</p> + + <p>Company website: <a href="%1">%1</a></p> + <p>Company website: <a href=%1>%1</p> <p>Website: <a href="%1">%1</p> @@ -2827,12 +2829,6 @@ Please contact the equipment supplier promptly to purchase a replacement paper r <p>Company telephone: %1</p> <p>Phone Number: %1</p> - - - <p>Company website: <a href="%1">%1</a></p> - <p>Company GPS: <a href=%1>%2</p> - <p>Website: <a href="%1">%2</a></p> - Baidu map access @@ -3139,7 +3135,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor Widget zuobiaozhou - Coordinate axis + Coordinate axis diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 03e62a40..30d4d3a3 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -3221,7 +3221,7 @@ void MainWindow::on_act_about_triggered() content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME)); content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS)); content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT)); } else if(appLang == "english") @@ -3229,7 +3229,7 @@ void MainWindow::on_act_about_triggered() content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME_EN)); content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_EN)); content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL_EN)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_EN)); } #else