From 9f3c0c0c59c8ca5519b62790982652f34e98c36c Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Sat, 20 Aug 2022 15:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 34282 -> 34294 bytes app/scanner/Scanner_zh_CN.ts | 292 ++++++++++++++++++----------------- app/scanner/mainwindow.cpp | 14 +- app/scanner/qt_zh_CN.ts | 8 +- 4 files changed, 163 insertions(+), 151 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index e411de8ec87f7e6f471107a0d003a065a6eb2b22..9ed266cf7b9975362c7eebed4b6dc19aa0944359 100644 GIT binary patch delta 737 zcmXAnZAep57{~wTZuf5Y-d)$wbzNq2VTweIGMf_1sMH8*QjiN9qHew{&1z0VN-3}) z&59?GKr^D3FAXJ8NHe1BlO+-rC0P;rAt8&(tPiUW^x-_e59jcl-#O2JzC-xgAq*rk zrD_2%`G9DMQkl=u1*GQ#4JE+(1VAVTveSS%KeaOt+eBl`$sW)Q)8!vP+hd@qg5pef z5saNTfX#Lor`7aUX2M*o+&$=^|BZTR;;I+-dG~N%SEy4VBk)K#Wi-O0Nj_hVL zkPK|hbpus>t{~+afW`^R z5j|{_>ct{9PD8xBjWJ<1I`p$XV#fQ1!gxZrl{G&PEgF;z^s%i zXUaX&oso8+K9P3II=f3D+3mO}Ev#GxY`8Cdsr?POuS-iA-9WI8Vse+zz{snVv0K!u z6bg+h%_(h;tMc=mfA}!&$nQT)0-gf-`z_96qjXZ$9bqMleFcujnv{dtMsRjz$){Rr&;r2T!dkB_{N>JzHj6unHybnLY5ndZhx2du?AviV<+ zS^fPybkTccxB4V|El*hIVAy&jILI208=Pj}OsT(O+1@@L7C_?55-D#ArA4BZm7!3O MSgn1qrTIw0KW^LHga7~l delta 732 zcmXAnZAep57{~wT-h1wLcXu~d&gBPLlWLU3C>us)R!9*^Ga@y@)(73%(rKm%g1wOh znHD`t6d6RV2(m?ML!>uKBj`<{_lP2jUdRe#MNry-zMS8Ob9m10`9IIk4(W4;bYUX1 zgq?sX05q?oTo%aL4NNHp>Q@4@ZGcn;6ifzcOR1d|vKe%Rx!FZ}#a!A)V8=~hTRHt@ zF3(;l`%eK2oKS|R0-kA5o^%46Pyc6aEBU3UsyqOyYpGW%c07Y=Fab>d1@qmEcxa;$ zsn9VA1ubS^5-@k34+z~NzwBmlS}PxL?82raVZhyrXui;_8>5VTMkw_v6>K$S6rVOz zQs>D)(>0pK3t56{_;S`yeSCRNsr2WzxKWPF>h29d)*E?o-bSEdlnm9&J|z8Wkg;y+ zF}c|=rA+RK&f7u?P`;3#E2supOxB=cz021%o`DC6Wwf z^Ynlu7~|>7Cc&dT{rRfkQvN^}^(O4$Pge*5S0jII5joY&rXsVCl~A3zkTp=;T+d{3 zYF^Jl_1r+aXwsyn93thiZ|cCMA3z{qz1lS>Jf2gP=3{%PQ*$w*xYi}bGUT@e*-`4T zER(j5(<{pkc8IEUS5873Q_chIkVU=|1^l^|tSnJ8wt+fz7yCkSy;vKv9IF!lRgcn$ z9$+`9$Xem(&_m`?ATq9R$-V(J$`rSHwTF6F?pI-UmmXW)EJPXWUbcwZ3?FNzKEuW4 z&^>XUr1wT}dcJWzZ#_^sYz*!D4LEe;#mFxpy4Lu<{jEs%lQI5ijTruXs7B=^h(;iT@h*-Iu$*8@dn#P-KT#3X&_2daVlP|Zn K$jSDWEw+CjD%;Ee diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index e78252c2..b151a3fe 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -2110,16 +2110,16 @@ bug description: - - - - + + + + Question 警告 - + modified, save it? 图像已被修改。 是否保存修改? @@ -2134,7 +2134,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2151,220 +2151,222 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 是否清空? - + Information 消息 - + Insufficient disk space 磁盘空间不足,请删除不需要的文件,以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 - - - - - info - 信息 + 信息 - - - - - - - - - + + + + + + + + + save failed 保存失败 - + + + save succeed + 保存成功 + + + + find savePath in thumbnail 图片名在列表中已存在 - + File name 文件名 - + File path 文件路径 - + File size 文件大小 - + Creation date/time 创建时间 - + Modified date/time 修改时间 - + Accessed date/time 访问时间 - + Format 格式 - + Width 宽度 - + Height 高度 - + depth 深度 - + Color model 色彩模式 - + DPI 每英寸像素点 - + Print size 打印尺寸 - + Frame - + None - + Mono 黑白 - + Gray 灰度 - + Color 彩色 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行! 请先结束扫描。 - - - + + + folder limit 无法访问“我的文档”,建议前往设置关闭“文件夹限制访问” - + Are you sure to close 您确定要关闭 - + ? 吗? - - + + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - + + error 错误 @@ -2379,115 +2381,115 @@ Continue to close? 是否继续关闭? - + Sure to sign out administrator account? 是否确定登出管理员账户? - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 - + Please re-enter the Abount screen to obtain the latest value 请重新进入关于界面以获取最新值 - + <p>%1: <a href='%2'>%3</a> - + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 - + apply setting 应用配置 - + success 成功 - + failed 失败 - - + + failed 失败 - + warning 警告 - + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 - + lost config 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed 启动失败 @@ -2530,15 +2532,15 @@ Continue to close? - - - - - - - - - + + + + + + + + + yes 确定 @@ -2550,94 +2552,102 @@ Continue to close? - - - - - - - + + + + + + + no 取消 - + found device 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接,但打开失败 - - + + %1%2%3.%4 %1%2%3.%4 - + start failed! 启动安装程序失败! - + There are pictures that have not been saved. Are you sure to close? 有图像未保存,确定关闭? - + + + + + + + + + tips 提示 - + Are you sure to close? 确定关闭? - + confirm operation 确认操作 - + are you sure to clear the roller count? 您确定要清除滚轴计数吗 - - - + + + hint 提示 - - + + Roller scanned count has been set to 0. 辊轴计数已置零 - - + + Roller scanned count reset failed. 重置滚轴计数失败 - + Error 错误 - + Document missing! It would be deleted or renamed. 文档丢失!文档可能已被删除或被重命名。 @@ -2670,28 +2680,28 @@ Are you sure to close? <br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a> - + About %1 关于 %1 - + <p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p> <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> - + about %1 关于 %1 - + <p>Version: %1</p> <p>版本: %1</p> <p>版本: %1</p> - + <p>CopyRight: &#169; %1</p> <p>版权: &#169; %1</p> <p>版权: &#169; %1</p> diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 92e7b9f2..dac6a1c1 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -1893,17 +1893,18 @@ void MainWindow::on_act_save_triggered() m_thumb->updateItem(m_currIndex, savePath); m_currFilePath = savePath; m_modify = false; + QMessageBox::information(this, tr("tips"), tr("save succeed")); } else { - QMessageBox::information(this, tr("info"), tr("save failed")); + QMessageBox::critical(this, tr("tips"), tr("save failed")); m_dialogLog->addLog(tr("save failed"), true); m_wndStatusBar->setDeviceStatusInfo(tr("save failed"), true); } } else { - QMessageBox::information(this, tr("info"), tr("find savePath in thumbnail")); + QMessageBox::information(this, tr("tips"), tr("find savePath in thumbnail")); } return; @@ -1955,10 +1956,11 @@ void MainWindow::on_act_save_triggered() m_thumb->refreshItem(m_currFilePath); m_modify = false; updateActionStatus(); + QMessageBox::information(this, tr("tips"), tr("save succeed")); } else { - QMessageBox::information(this, tr("info"), tr("save failed")); + QMessageBox::critical(this, tr("tips"), tr("save failed")); } } @@ -2030,18 +2032,18 @@ void MainWindow::on_act_saveAs_triggered() if (HGBASE_ERR_OK == saveImage(img, &saveInfo, isOcr, getStdString(savePath).c_str())) { - + QMessageBox::information(this, tr("tips"), tr("save succeed")); } else { - QMessageBox::information(this, tr("info"), tr("save failed")); + QMessageBox::critical(this, tr("tips"), tr("save failed")); m_dialogLog->addLog(tr("save failed"), true); m_wndStatusBar->setDeviceStatusInfo(tr("save failed"), true); } } else { - QMessageBox::information(this, tr("info"), tr("find savePath in thumbnail")); + QMessageBox::information(this, tr("tips"), tr("find savePath in thumbnail")); } } } diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index f630b81f..2c53b135 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -1724,10 +1724,6 @@ Do you want to clear? Insert images - - info - - save failed @@ -2050,6 +2046,10 @@ Are you sure to close? folder limit + + save succeed + + Phonon::