From 6bfb280c16fe7e0fd169948bc4afc7a4c5f5c68a Mon Sep 17 00:00:00 2001 From: like Date: Tue, 11 Jun 2024 17:27:17 +0800 Subject: [PATCH] fix Error message is different from the actual requirement in plymouth --- src/fileProcess/filecheck.cpp | 2 +- src/module/plymouththemewidget.cpp | 4 +-- translation/themebuilder_en_US.ts | 43 ++++++++++++++--------------- translation/themebuilder_zh_CN.qm | Bin 14891 -> 14800 bytes translation/themebuilder_zh_CN.ts | 41 +++++++++++++-------------- 5 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/fileProcess/filecheck.cpp b/src/fileProcess/filecheck.cpp index 2757af3..3c218c1 100644 --- a/src/fileProcess/filecheck.cpp +++ b/src/fileProcess/filecheck.cpp @@ -154,7 +154,7 @@ bool FileCheck::isLegalMP4File(const QString &filePath) qint64 maxSize = 1024 * 1024 *10; if (fileSize > maxSize) { - QMessageBox::information(nullptr, tr("error"), tr("The file size cannot exceed 1MB")); + QMessageBox::information(nullptr, tr("error"), tr("The file size cannot exceed 10MB")); return false; } diff --git a/src/module/plymouththemewidget.cpp b/src/module/plymouththemewidget.cpp index 930fe90..06839cb 100644 --- a/src/module/plymouththemewidget.cpp +++ b/src/module/plymouththemewidget.cpp @@ -224,13 +224,13 @@ void PlymouthThemeWidget::initEditWidget() }); QLabel *tipLabel = new QLabel(); - tipLabel->setText("*视频为 MP4 格式
*大小不超过 1 MB"); + tipLabel->setText("*视频为 MP4 格式
*大小不超过 10 MB"); connect(btngroup, QOverload::of(&QButtonGroup::buttonClicked), [=](QAbstractButton* button) { if (button == pic) { tipLabel->setText("*尺寸为 400*400 的 PNG 图片
*大小不超过 20 KB"); a->setType("pic"); } else { - tipLabel->setText("*视频为 MP4 格式
*大小不超过 1 MB"); + tipLabel->setText("*视频为 MP4 格式
*大小不超过 10 MB"); a->setType("video"); } }); diff --git a/translation/themebuilder_en_US.ts b/translation/themebuilder_en_US.ts index 804fcd2..0cbc357 100644 --- a/translation/themebuilder_en_US.ts +++ b/translation/themebuilder_en_US.ts @@ -132,6 +132,7 @@ + The file size cannot exceed 10MB @@ -162,11 +163,6 @@ The file is not a mp4 - - - The file size cannot exceed 1MB - - The file size cannot exceed 20KB @@ -763,14 +759,14 @@ - + ThemeName-CN - + ThemeName-EN @@ -801,54 +797,55 @@ - - + + Please enter less than 15 characters - - - - + + + + Input format error! - - - - + + + + + Input is empty! - + Please enter more than 1 characters - + Please don't duplicate the name of a package that already exists! - + Please keep theme names in lowercase! - + Please enter more than 6 characters - + Set as a theme for system use during installation - + Please enter less than 35 characters diff --git a/translation/themebuilder_zh_CN.qm b/translation/themebuilder_zh_CN.qm index ba494ae44a4c91afc6102e6dd363e46bfc76b2c7..6a4ebe71a19fbf38554ddb9db7d9f161f123dd46 100644 GIT binary patch delta 1626 zcmXYxc~n$o7{=c_bMKvd=iWQRZioyZ`!b3Gi9m2Lz@xNq6vSg4PMK?2oIphp9G66K z-*5rbBymUtQIMmiW}wGZL?ciTToQ9BDFRaSDE5rE`R6y^_I~gCJnwfa=3dR-=ww+y z#6=T%9a9;4nAnviM4q#Vi%BCIZXj;QIieB$#FwujlH!TK!V-lt#6J!N{YY$cA{uNZ zk3k!-uY|ms_7OQ=rs$e%BDYQ&AG{dzGim&rMMT4vQc6-H;)cGY1m@AqZD(nvK=j%)j;GlpNbm3 zA`*zszQtkw23^R%MHKKob&auN{u8#7FJKkp-glQQq&v^V{rdwJ{F!98 z79!(3W@65EqBqts=@i#`m+a+!jNOSqV0&VJiTWsr`0rpbFy25CDqE0t!9OSe=q z9v_!#U6&q*9vZFL1^PG|wQ1`hBonUvG8nsDztJw(mw<7;Hvinus5eeqz56>NFPF>8if*0ULA+#Tq|el~wPRL^A#gJGZ30e0O7 zy|C55mdl%n1|4F{k71t|$F{{35)HY?-guY=aZYgT{H;XVN|lNO=f4{61XglE!ytm2 zCudHA+U|dG(bcEmLOGXssGZ2%%Dodm8TNZ@;tC#|C-SdXX`aBXJ-Hq>7jSzjj^F|} zUgsGDb${gTyo=z%r+i317;=UWwT*q3^HD26qr^v*fqp*x*hVDa_ywPL%7ZA3<#&ub zNi@=zFWK7x+2-)Ow$@`kfj>3)AJ`w7|N0M&-1t9#;!jUUhQ?~X<8~|bJEv0Fz(4#0 z6+4a6yA zD3mxR%zn8W31kU#ZDYe8;lz0#B&rkYUm>v}DZ<6NRw$bxH11>Zuo{H+2+N0f>P13( zQW4lB^dv=~4x%B!|DiTN<)Sj$8x}oipV))&weYLUkWJ-Y!o( zfCN0I$+J5-oQsunMg&0eO1b*s02LfMSvV7XbL19TA{@265-ibO6JgesNlX*T(tsC8Vlk=zjURtVGPdcmFufv zp_HlIQKDdFoWU>E6-xbTh&h;y#9a&-%YQ?Uv4(|DoA41$$}=2x`2-i28D;AXc%5u~ zeWACVF+2x}=m(7XCN~5y8W$J8i_f^H@n~T)Ds3_jRH0(eklA=+u{Fi~es0U}l0!|I HTwwkWhtaJk delta 1652 zcmX9;XH*nd82x5>1xmfl&UdI+EiMBu3L#3%^IM2=!VDMs*!4c8Ju5DQJP z1P>??3n-!_8qpK%NQ+`28jV8K7&QhkF({b3&i=XkX5M?>{qDWrbYvV{yw%#Ynuv`e zauZ|>R*@=aCy~pK#6~9(jhsnr*?FRn1mdbU5(&k`wX2AN5{Y{n1YAa%Th>JO1LQn> z3sLZMa&6m7WbHyx^%+EtBWb+kbDMGMdq5`Q?V0!gJ40kx&P;IV zB+_4Ereu~9jkwDsH}?_QB{1olc|^LeW%ORbtc|K8a&2X@!>^!l3UhAH9Vj-Axzh`! z0@|2oO=E~WOMxKZnZmsN(gF>ID(rN%M9h$k7FG(MMQa@)d!@oB3kq-(6e}N9p`$=W zj&v2zUlvs{&NE*s?be)tE=fwGEp}O@DU&uqP$o>d$RE4x`jkuej>S4lnRWhWoGw%z zDc_HNFUTkrDv!P~uNNyjDvX_4$%HAls_S z^*7r%sM_>tFYKMEsul|%ib7TW1NOP5sBT5)5;-}ketDb@780vkQcR?*kx`n%dgs9< zKVtm?A%;T+YmA5LhFCW0NF!W&&Bh(>LRUWQM=>dgfpZU={pccWv60bO#pa*djGT0_ zyAK{k;jcKgOEgrr=7zbKz>P*OpdVv~AWpW8EAYk~Z{2nkO8Kh~MI3_}?*!V4Qd)N2iqM?N2O7zX?0^OL+ELDCsAYV%~&dCF)xRYvbX z8I4o<#Cyllxxg-d(vDonI3-xY59 z4AMU4yW&gWttqpQ#Ym?bp;`D#40|jP$0ZIsGV!ZpmJ@4J0u_8qCIge4k6v8y)v*G%G?lyXZ?6y zDi~UH@N|i=JR9NEdkf3I1A2WRL8pL_-4B0h>kVyG}@Zisb5Qx1TD^Y`L{J1ou>h?&7YXoSS-9w;RYh_%mPk;fCU+ZWjw9%z!77n5)x zM^gWdkD1LD$#U>ABrB7A{^-R8&63|VNa{8u#i-*D#+%YYw;ovYp0uNOJvuG`qM+9S zspf1f&P|tY=D|XtN%~ES#F!Q8yb|qTMVK!7&;$@)pi5o%J2IB6TlR08+1hqpo$V|X zex(=p&BeEq}1`z(D}CWr{1=(7wCV49|1wPPYOkfA@Gdljj6)eqI8V;9o`%veFu i=n#kc8g3(7v{|%df{Q9dKV|U5*rFK0sy;$2GyV^9w7F~m diff --git a/translation/themebuilder_zh_CN.ts b/translation/themebuilder_zh_CN.ts index c8841b1..4efd691 100644 --- a/translation/themebuilder_zh_CN.ts +++ b/translation/themebuilder_zh_CN.ts @@ -132,6 +132,7 @@ + The file size cannot exceed 10MB 文件大小不能超过10MB @@ -163,9 +164,8 @@ 该文件不是mp4格式 - The file size cannot exceed 1MB - 文件大小不能超过1MB + 文件大小不能超过1MB @@ -787,14 +787,14 @@ - + ThemeName-CN 主题名称-中文 - + ThemeName-EN 主题名称-英文 @@ -825,49 +825,50 @@ - - + + Please enter less than 15 characters 请保障输入内容小于15个字节 - - - - + + + + Input format error! 输入格式错误！ - - - - + + + + + Input is empty! 输入为空！ - + Please enter more than 1 characters 请保障输入内容多于1个字节 - + Please don't duplicate the name of a package that already exists! 请不要重复已经存在的软件包名称！ - + Please keep theme names in lowercase! 请保持主题名字小写！ - + Please enter more than 6 characters 请保障输入内容多于6个字节 - + Set as a theme for system use during installation 安装时设置为系统使用主题 @@ -880,7 +881,7 @@ themename 不符合规范 - + Please enter less than 35 characters 请保障输入内容小于35个字节