lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整版本描述信息的显示，翻译

This commit is contained in:
yangjiaxuan 2022-07-22 11:51:22 +08:00
parent 714aec8209
commit e545199cf9
8 changed files with 244 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
app/scanner/Scanner_zh_CN.ts
View File

@ -1544,42 +1544,60 @@ Please make sure the two passwords are the same.</source>
<translation>取消</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="15"/>
<location filename="dialog_upgrade.cpp" line="17"/>
<source>upgrade online</source>
<translation>检查更新</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="35"/>
<source>upgrade contents: </source>
<translation>升级内容：</translation>
<translation type="vanished">升级内容：</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="35"/>
<source> bug description: </source>
<translation>错误描述：</translation>
<translation type="vanished">错误描述：</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="52"/>
<location filename="dialog_upgrade.cpp" line="34"/>
<source>bug description:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="38"/>
<location filename="dialog_upgrade.cpp" line="42"/>
<source>upgrade contents:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="42"/>
<source>
bug description:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="60"/>
<source>The current version is the latest! The current version number is : </source>
<translation>当前为最新版本！版本号为：</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="59"/>
<location filename="dialog_upgrade.cpp" line="66"/>
<source>Discover the new version : </source>
<translation>发现新版本：</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="61"/>
<location filename="dialog_upgrade.cpp" line="68"/>
<source> ,the current version is : </source>
<translation> ，当前版本为：</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="98"/>
<location filename="dialog_upgrade.cpp" line="104"/>
<source>tip</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_upgrade.cpp" line="98"/>
<location filename="dialog_upgrade.cpp" line="104"/>
<source>Already in current version</source>
<translation>当前版本已安装！</translation>
</message>
@ -2003,46 +2021,46 @@ Please make sure the two passwords are the same.</source>
<translation>华高扫描软件</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="228"/>
<location filename="mainwindow.cpp" line="231"/>
<source>Grid</source>
<translation>多列显示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="233"/>
<location filename="mainwindow.cpp" line="236"/>
<source>Move To...</source>
<translation>移动到...</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="237"/>
<location filename="mainwindow.cpp" line="240"/>
<source>Insert files</source>
<translation>插入文件</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="263"/>
<location filename="mainwindow.cpp" line="264"/>
<location filename="mainwindow.cpp" line="265"/>
<location filename="mainwindow.cpp" line="266"/>
<location filename="mainwindow.cpp" line="267"/>
<location filename="mainwindow.cpp" line="268"/>
<source>nodevice</source>
<translation>没有发现扫描仪</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="479"/>
<location filename="mainwindow.cpp" line="534"/>
<location filename="mainwindow.cpp" line="1373"/>
<location filename="mainwindow.cpp" line="1397"/>
<location filename="mainwindow.cpp" line="2124"/>
<location filename="mainwindow.cpp" line="2444"/>
<location filename="mainwindow.cpp" line="482"/>
<location filename="mainwindow.cpp" line="537"/>
<location filename="mainwindow.cpp" line="1464"/>
<location filename="mainwindow.cpp" line="1488"/>
<location filename="mainwindow.cpp" line="2215"/>
<location filename="mainwindow.cpp" line="2535"/>
<source>Question</source>
<translation>警告</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="480"/>
<location filename="mainwindow.cpp" line="1374"/>
<location filename="mainwindow.cpp" line="483"/>
<location filename="mainwindow.cpp" line="1465"/>
<source>modified, save it?</source>
<translation>图像已被修改。
是否保存修改？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="535"/>
<location filename="mainwindow.cpp" line="538"/>
<source>file lost, remove it?</source>
<translation>文件已丢失，是否删除？</translation>
</message>
@ -2051,7 +2069,7 @@ Please make sure the two passwords are the same.</source>
<translation type="vanished"> 已连接</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="765"/>
<location filename="mainwindow.cpp" line="768"/>
<source> disconnected</source>
<translation> 已断开连接</translation>
</message>
@ -2068,189 +2086,189 @@ Please make sure the two passwords are the same.</source>
<translation type="vanished">扫描完成</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1394"/>
<location filename="mainwindow.cpp" line="1485"/>
<source>Clear, then start scan</source>
<translation>清空并启动扫描</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1395"/>
<location filename="mainwindow.cpp" line="1486"/>
<source>Do NOT clear, then start scan</source>
<translation>不清空并启动扫描</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1398"/>
<location filename="mainwindow.cpp" line="1489"/>
<source>Already exist images in image list.
Do you want to clear?</source>
<translation>图像列表中已存在图像。
是否清空？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1432"/>
<location filename="mainwindow.cpp" line="1523"/>
<source>Information</source>
<translation>消息</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1433"/>
<location filename="mainwindow.cpp" line="1524"/>
<source>Insufficient disk space</source>
<translation>磁盘空间不足，请删除不需要的文件，以保证有足够的空间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1619"/>
<location filename="mainwindow.cpp" line="1710"/>
<source>Open images</source>
<translation>打开图片</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1630"/>
<location filename="mainwindow.cpp" line="1721"/>
<source>Insert images</source>
<translation>插入图片</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1804"/>
<location filename="mainwindow.cpp" line="1809"/>
<location filename="mainwindow.cpp" line="1864"/>
<location filename="mainwindow.cpp" line="1940"/>
<location filename="mainwindow.cpp" line="1945"/>
<location filename="mainwindow.cpp" line="1895"/>
<location filename="mainwindow.cpp" line="1900"/>
<location filename="mainwindow.cpp" line="1955"/>
<location filename="mainwindow.cpp" line="2031"/>
<location filename="mainwindow.cpp" line="2036"/>
<source>info</source>
<translation>信息</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1804"/>
<location filename="mainwindow.cpp" line="1864"/>
<location filename="mainwindow.cpp" line="1940"/>
<location filename="mainwindow.cpp" line="1895"/>
<location filename="mainwindow.cpp" line="1955"/>
<location filename="mainwindow.cpp" line="2031"/>
<source>save failed</source>
<translation>保存失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1809"/>
<location filename="mainwindow.cpp" line="1945"/>
<location filename="mainwindow.cpp" line="1900"/>
<location filename="mainwindow.cpp" line="2036"/>
<source>find savePath in thumbnail</source>
<translation>图片名在列表中已存在</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2029"/>
<location filename="mainwindow.cpp" line="2120"/>
<source>File name</source>
<translation>文件名</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2029"/>
<location filename="mainwindow.cpp" line="2120"/>
<source>File path</source>
<translation>文件路径</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2029"/>
<location filename="mainwindow.cpp" line="2120"/>
<source>File size</source>
<translation>文件大小</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2029"/>
<location filename="mainwindow.cpp" line="2120"/>
<source>Creation date/time</source>
<translation>创建时间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2029"/>
<location filename="mainwindow.cpp" line="2120"/>
<source>Modified date/time</source>
<translation>修改时间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2029"/>
<location filename="mainwindow.cpp" line="2120"/>
<source>Accessed date/time</source>
<translation>访问时间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>Format</source>
<translation>格式</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>Width</source>
<translation>宽度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>Height</source>
<translation>高度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>depth</source>
<translation>深度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>Color model</source>
<translation>色彩模式</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>DPI</source>
<translation>每英寸像素点</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>Print size</source>
<translation>打印尺寸</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2072"/>
<location filename="mainwindow.cpp" line="2163"/>
<source>Frame</source>
<translation>帧</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2080"/>
<location filename="mainwindow.cpp" line="2171"/>
<source>None</source>
<translation>无</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2080"/>
<location filename="mainwindow.cpp" line="2171"/>
<source>Mono</source>
<translation>黑白</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2080"/>
<location filename="mainwindow.cpp" line="2171"/>
<source>Gray</source>
<translation>灰度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2080"/>
<location filename="mainwindow.cpp" line="2171"/>
<source>Color</source>
<translation>彩色</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2101"/>
<location filename="mainwindow.cpp" line="2192"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2101"/>
<location filename="mainwindow.cpp" line="2192"/>
<source>Device is Running!
Please finish scanning first.</source>
<translation>设备正在运行！
请先结束扫描。</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3112"/>
<location filename="mainwindow.cpp" line="3203"/>
<source>Are you sure to close </source>
<translation>您确定要关闭</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3112"/>
<location filename="mainwindow.cpp" line="3203"/>
<source> ?</source>
<translation>吗?</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3121"/>
<location filename="mainwindow.cpp" line="3122"/>
<location filename="mainwindow.cpp" line="3212"/>
<location filename="mainwindow.cpp" line="3213"/>
<source>close </source>
<translation>关闭</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3159"/>
<location filename="mainwindow.cpp" line="3303"/>
<source>error</source>
<translation>错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3159"/>
<location filename="mainwindow.cpp" line="3303"/>
<source>get versionlist failed</source>
<translation>获取版本列表错误</translation>
</message>
@ -2261,115 +2279,115 @@ Continue to close?</source>
是否继续关闭？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2445"/>
<location filename="mainwindow.cpp" line="2536"/>
<source>Sure to sign out administrator account?</source>
<translation>是否确定登出管理员账户？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2566"/>
<location filename="mainwindow.cpp" line="2657"/>
<source>confirm the operation</source>
<translation>确认操作</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2567"/>
<location filename="mainwindow.cpp" line="2658"/>
<source>Are you sure to clear the rollor acount?</source>
<translation>你确定要清除滚轴计数吗</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2583"/>
<location filename="mainwindow.cpp" line="2674"/>
<source>Please re-enter the Abount screen to obtain the latest value</source>
<translation>请重新进入关于界面以获取最新值</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2628"/>
<location filename="mainwindow.cpp" line="2719"/>
<source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2630"/>
<location filename="mainwindow.cpp" line="2721"/>
<source>&lt;p&gt;%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2632"/>
<location filename="mainwindow.cpp" line="2723"/>
<source>roller number</source>
<translation>滚轴张数</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2982"/>
<location filename="mainwindow.cpp" line="3073"/>
<source>open scanner </source>
<translation>打开扫描仪</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2983"/>
<location filename="mainwindow.cpp" line="3046"/>
<location filename="mainwindow.cpp" line="3074"/>
<location filename="mainwindow.cpp" line="3137"/>
<source>app name</source>
<translation>华高扫描软件</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2988"/>
<location filename="mainwindow.cpp" line="3085"/>
<location filename="mainwindow.cpp" line="3079"/>
<location filename="mainwindow.cpp" line="3176"/>
<source>success</source>
<translation>成功</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2997"/>
<location filename="mainwindow.cpp" line="3088"/>
<source>apply setting </source>
<translation>应用配置</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2997"/>
<location filename="mainwindow.cpp" line="3088"/>
<source> success</source>
<translation>成功</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2997"/>
<location filename="mainwindow.cpp" line="3088"/>
<source> failed</source>
<translation>失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3015"/>
<location filename="mainwindow.cpp" line="3100"/>
<location filename="mainwindow.cpp" line="3106"/>
<location filename="mainwindow.cpp" line="3191"/>
<source>failed</source>
<translation>失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3038"/>
<location filename="mainwindow.cpp" line="3129"/>
<source>warning</source>
<translation>警告</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3038"/>
<location filename="mainwindow.cpp" line="3129"/>
<source>the disk space in the current path is unsufficient, please select a new path or clear the disk space in time.</source>
<translation>当前路径磁盘空间不足,
请重新选择路径或及时清理磁盘空间。</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3054"/>
<location filename="mainwindow.cpp" line="3145"/>
<source>lost config</source>
<translation>配置丢失</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="3081"/>
<location filename="mainwindow.cpp" line="3172"/>
<source>apply setting</source>
<translation>应用配置</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1052"/>
<location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="1054"/>
<location filename="mainwindow.cpp" line="2718"/>
<location filename="mainwindow.cpp" line="2719"/>
<location filename="mainwindow.cpp" line="2720"/>
<location filename="mainwindow.cpp" line="2766"/>
<location filename="mainwindow.cpp" line="2767"/>
<location filename="mainwindow.cpp" line="2768"/>
<location filename="mainwindow.cpp" line="2829"/>
<location filename="mainwindow.cpp" line="2830"/>
<location filename="mainwindow.cpp" line="2831"/>
<location filename="mainwindow.cpp" line="2892"/>
<location filename="mainwindow.cpp" line="2893"/>
<location filename="mainwindow.cpp" line="2894"/>
<location filename="mainwindow.cpp" line="1055"/>
<location filename="mainwindow.cpp" line="1056"/>
<location filename="mainwindow.cpp" line="1057"/>
<location filename="mainwindow.cpp" line="2809"/>
<location filename="mainwindow.cpp" line="2810"/>
<location filename="mainwindow.cpp" line="2811"/>
<location filename="mainwindow.cpp" line="2857"/>
<location filename="mainwindow.cpp" line="2858"/>
<location filename="mainwindow.cpp" line="2859"/>
<location filename="mainwindow.cpp" line="2920"/>
<location filename="mainwindow.cpp" line="2921"/>
<location filename="mainwindow.cpp" line="2922"/>
<location filename="mainwindow.cpp" line="2983"/>
<location filename="mainwindow.cpp" line="2984"/>
<location filename="mainwindow.cpp" line="2985"/>
<source>start failed</source>
<translation>启动失败</translation>
</message>
@ -2384,135 +2402,135 @@ Continue to close?</source>
<translation>立思辰扫描软件</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="284"/>
<location filename="mainwindow.cpp" line="287"/>
<source>auto save</source>
<translation>自动保存</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="285"/>
<location filename="mainwindow.cpp" line="288"/>
<source>when switching pictures, save the edited pictures directly without reminding</source>
<translation>切换图片时，不提醒，直接保存编辑过的图片</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="437"/>
<location filename="mainwindow.cpp" line="440"/>
<source>enabling automatic saving</source>
<translation>启用自动保存</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="441"/>
<location filename="mainwindow.cpp" line="444"/>
<source>cancel auto save</source>
<translation>取消自动保存</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="474"/>
<location filename="mainwindow.cpp" line="477"/>
<source>Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-&gt; automatically save</source>
<translation>切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像-&gt;自动保存</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="482"/>
<location filename="mainwindow.cpp" line="537"/>
<location filename="mainwindow.cpp" line="1376"/>
<location filename="mainwindow.cpp" line="1434"/>
<location filename="mainwindow.cpp" line="2127"/>
<location filename="mainwindow.cpp" line="2141"/>
<location filename="mainwindow.cpp" line="2446"/>
<location filename="mainwindow.cpp" line="2500"/>
<location filename="mainwindow.cpp" line="2569"/>
<location filename="mainwindow.cpp" line="3114"/>
<location filename="mainwindow.cpp" line="485"/>
<location filename="mainwindow.cpp" line="540"/>
<location filename="mainwindow.cpp" line="1467"/>
<location filename="mainwindow.cpp" line="1525"/>
<location filename="mainwindow.cpp" line="2218"/>
<location filename="mainwindow.cpp" line="2232"/>
<location filename="mainwindow.cpp" line="2537"/>
<location filename="mainwindow.cpp" line="2591"/>
<location filename="mainwindow.cpp" line="2660"/>
<location filename="mainwindow.cpp" line="3205"/>
<source>yes</source>
<translation>确定</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="483"/>
<location filename="mainwindow.cpp" line="486"/>
<source>save, do not remind again</source>
<translation>保存，不再提醒</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="484"/>
<location filename="mainwindow.cpp" line="538"/>
<location filename="mainwindow.cpp" line="1377"/>
<location filename="mainwindow.cpp" line="2128"/>
<location filename="mainwindow.cpp" line="2142"/>
<location filename="mainwindow.cpp" line="2447"/>
<location filename="mainwindow.cpp" line="2501"/>
<location filename="mainwindow.cpp" line="2570"/>
<location filename="mainwindow.cpp" line="3115"/>
<location filename="mainwindow.cpp" line="487"/>
<location filename="mainwindow.cpp" line="541"/>
<location filename="mainwindow.cpp" line="1468"/>
<location filename="mainwindow.cpp" line="2219"/>
<location filename="mainwindow.cpp" line="2233"/>
<location filename="mainwindow.cpp" line="2538"/>
<location filename="mainwindow.cpp" line="2592"/>
<location filename="mainwindow.cpp" line="2661"/>
<location filename="mainwindow.cpp" line="3206"/>
<source>no</source>
<translation>取消</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="717"/>
<location filename="mainwindow.cpp" line="720"/>
<source>found device </source>
<translation>发现设备</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="727"/>
<location filename="mainwindow.cpp" line="730"/>
<source> reconnected</source>
<translation>重新连接</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="729"/>
<location filename="mainwindow.cpp" line="732"/>
<source>already connected, but open faild</source>
<translation>已经连接，但打开失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="845"/>
<location filename="mainwindow.cpp" line="944"/>
<location filename="mainwindow.cpp" line="848"/>
<location filename="mainwindow.cpp" line="947"/>
<source>%1%2%3.%4</source>
<translation>%1%2%3.%4</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2125"/>
<location filename="mainwindow.cpp" line="2216"/>
<source>There are pictures that have not been saved.
Are you sure to close?</source>
<translation>有图像未保存，确定关闭？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2138"/>
<location filename="mainwindow.cpp" line="2229"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2139"/>
<location filename="mainwindow.cpp" line="2230"/>
<source>Are you sure to close?</source>
<translation>确定关闭？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2497"/>
<location filename="mainwindow.cpp" line="2588"/>
<source>confirm operation</source>
<translation>确认操作</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2498"/>
<location filename="mainwindow.cpp" line="2589"/>
<source>are you sure to clear the roller count?</source>
<translation>您确定要清除滚轴计数吗</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2510"/>
<location filename="mainwindow.cpp" line="2512"/>
<location filename="mainwindow.cpp" line="2588"/>
<location filename="mainwindow.cpp" line="2601"/>
<location filename="mainwindow.cpp" line="2603"/>
<location filename="mainwindow.cpp" line="2679"/>
<source>hint</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2510"/>
<location filename="mainwindow.cpp" line="2580"/>
<location filename="mainwindow.cpp" line="2601"/>
<location filename="mainwindow.cpp" line="2671"/>
<source>Roller scanned count has been set to 0.</source>
<translation>辊轴计数已置零</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2512"/>
<location filename="mainwindow.cpp" line="2586"/>
<location filename="mainwindow.cpp" line="2603"/>
<location filename="mainwindow.cpp" line="2677"/>
<source>Roller scanned count reset failed.</source>
<translation>重置辊轴计数失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2555"/>
<location filename="mainwindow.cpp" line="2646"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2555"/>
<location filename="mainwindow.cpp" line="2646"/>
<source>Document missing! It would be deleted or renamed.</source>
<translation>文档丢失！文档可能已被删除或被重命名。</translation>
</message>
@ -2545,28 +2563,28 @@ Are you sure to close?</source>
<translation type="vanished">&lt;br&gt;导航地址: &lt;a href=&apos;https://j.map.baidu.com/7e/1TO&apos;&gt;百度地图访问&lt;/a&gt;</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2606"/>
<location filename="mainwindow.cpp" line="2697"/>
<source>About %1</source>
<translation>关于 %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2607"/>
<location filename="mainwindow.cpp" line="2698"/>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Version: %2&lt;br&gt;CopyRight: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</source>
<translation>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;版本: %2&lt;br&gt;版权: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2622"/>
<location filename="mainwindow.cpp" line="2713"/>
<source>about %1</source>
<translation>关于 %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2623"/>
<location filename="mainwindow.cpp" line="2714"/>
<source>&lt;p&gt;Version: %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;版本: %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt;版本： %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2624"/>
<location filename="mainwindow.cpp" line="2715"/>
<source>&lt;p&gt;CopyRight: &amp;#169; %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;版权: &amp;#169; %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt;版权： &amp;#169; %1&lt;/p&gt;</translation>

15
app/scanner/dialog_upgrade.cpp
View File

@ -28,7 +28,20 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
{
QListWidgetItem *listwidgetItem = new QListWidgetItem;
listwidgetItem->setText(QString(m_versionInfo[i].version));
listwidgetItem->setToolTip(tr("upgrade contents: ") + m_versionInfo[i].desc + tr(" bug description: ") + m_versionInfo[i].bugInfo);
if(m_versionInfo[i].desc[0] == '\0' && m_versionInfo[i].bugInfo[0] != '\0')
{
listwidgetItem->setToolTip(tr("bug description: \n") + m_versionInfo[i].bugInfo);
}
if(m_versionInfo[i].bugInfo[0] == '\0' && m_versionInfo[i].desc[0] != '\0')
{
listwidgetItem->setToolTip(tr("upgrade contents: \n") + m_versionInfo[i].desc);
}
if(m_versionInfo[i].desc[0] != '\0' && m_versionInfo[i].bugInfo[0] != '\0')
{
listwidgetItem->setToolTip(tr("upgrade contents: \n") + m_versionInfo[i].desc + tr("\nbug description: \n") + m_versionInfo[i].bugInfo);
}
ui->listWidget->addItem(listwidgetItem);
}

24
app/scanner/qt_zh_CN.ts
View File

@ -1236,14 +1236,6 @@ Please make sure the two passwords are the same.</source>
<source>upgrade online</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>upgrade contents: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source> bug description: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The current version is the latest! The current version number is : </source>
<translation type="unfinished"></translation>
@ -1264,6 +1256,22 @@ Please make sure the two passwords are the same.</source>
<source>Already in current version</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>bug description:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>upgrade contents:
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>
bug description:
</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GraphicsScene</name>

BIN
app/upgrade/Upgrade_zh_CN.qm
View File

Binary file not shown.

32
app/upgrade/Upgrade_zh_CN.ts
View File

@ -19,14 +19,42 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="16"/>
<location filename="mainwindow.cpp" line="23"/>
<source>Installation</source>
<translation>安装</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="19"/>
<location filename="mainwindow.cpp" line="26"/>
<source>Installation in progress, please wait...</source>
<translation>安装中，请稍候...</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="main.cpp" line="71"/>
<source>tip</source>
<translation>提示</translation>
</message>
<message>
<location filename="main.cpp" line="72"/>
<source>install succeed!</source>
<translation>安装成功！</translation>
</message>
<message>
<location filename="main.cpp" line="74"/>
<source>yes</source>
<translation>确定</translation>
</message>
<message>
<location filename="main.cpp" line="82"/>
<source>error</source>
<translation>错误</translation>
</message>
<message>
<location filename="main.cpp" line="82"/>
<source>install failed!</source>
<translation>安装失败！</translation>
</message>
</context>
</TS>

12
app/upgrade/main.cpp
View File

@ -68,14 +68,22 @@ int main(int argc, char *argv[])
if (w.isInstallSuccess())
{
QMessageBox::information(nullptr, QObject::tr("tip"), QObject::tr("install succeed!"));
QMessageBox msg(QMessageBox::Information, QObject::tr("tip"),
QObject::tr("install succeed!"),
QMessageBox::Ok);
msg.setButtonText(QMessageBox::Ok, QObject::tr("yes"));
msg.exec();
if (!AppIsRun(appName))
RunApp(appName);
}
else
{
QMessageBox::critical(nullptr, QObject::tr("error"), QObject::tr("install failed!"));
QMessageBox msg(QMessageBox::Critical, QObject::tr("error"),
QObject::tr("install failed!"),
QMessageBox::Ok);
msg.setButtonText(QMessageBox::Ok, QObject::tr("yes"));
msg.exec();
}
}

2
app/upgrade/mainwindow.cpp
View File

@ -86,7 +86,7 @@ void MainWindow::ThreadFunc(HGThread thread, HGPointer param)
{
(void)thread;
MainWindow* p = (MainWindow*)param;
p->m_success = p->Upgrade(p->m_pkgPath);
p->m_success = Upgrade(p->m_pkgPath);
emit p->closeWnd();
}

3
app/upgrade/mainwindow.h
View File

@ -20,10 +20,9 @@ public:
signals:
void closeWnd();
void upgradeResult();
private:
bool Upgrade(const std::string& pkgPath);
static bool Upgrade(const std::string& pkgPath);
static void ThreadFunc(HGThread thread, HGPointer param);
private: