diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index a582f200..a7cfbfab 100644 Binary files a/app/scanner/Scanner_zh_CN.qm and b/app/scanner/Scanner_zh_CN.qm differ diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 7b7a1bb3..a153c2a6 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -159,7 +159,7 @@ 现有配置方案： - + delete all configurations 删除所有配置方案 @@ -168,12 +168,12 @@ 配置信息： - + change name 重命名配置方案 - + delete 删除配置方案 @@ -182,167 +182,167 @@ 应用 - + found scheme 新建配置方案 - + Directory 目录 - + ... - + Use subfolder based on current date 使用当前日期建立子文件夹 - + Use subfolder based on blank pages 按照空白页建立子文件夹 - + Use subfolder based on image color type 按照图片颜色类型建立子文件夹 - + File name 文件名 - + File name index 文件索引 - + Start index 开始索引 - + Digit(s) 数字 - + 1 - + 2 - + 3 - + 4 - + 5 - + e.g. 'HGScan001' 例如 “HGScan001” - + Even and odd pages 偶数和奇数页 - + Odd pages 奇数页 - + Even pages 偶数页 - + Format 格式 - + JPG - JPG / JFIF(*.jpg) - + BMP - Windows Bitmap(*.bmp) - + PNG - Portable Network Graphics(*.png) - + PPM - Portable Pixmap(*.ppm) - + PGM - Portable Greymap(*.pgm) - + PBM - Portable Bitmap(*.pbm) - + TIF - TIFF Revision 6(*.tif) - + PDF - Portable Document Format(*.pdf) - + OFD - Open Fixed-layout Document(*.ofd) - + GIF - Graphics Interchange Format(*.gif) - + Compression option 压缩选项 - + Save as multipages (TIFF/PDF/OFD/GIF) 多页保存(TIFF/PDF/OFD/GIF) - + 用户自定义页数 用户自定义页数 @@ -351,7 +351,7 @@ 多页保存(TIFF/PDF/OFD) - + 所有页 所有页 @@ -360,33 +360,46 @@ 默认配置 - + + default scheme - 默认设置方案 + 默认配置方案 - - - - + + + + e.g. '%1%2' 例如.“%1%2” - + ok 确定 - + cancel 取消 - + Browse directory 文件夹路径 + + + + tips + 提示 + + + + + The configuration scheme already exists + 配置方案已存在 + Dialog_ClrCache @@ -1230,17 +1243,17 @@ Page range will be 'Chosen Pages'. 取消 - + configuration scheme name change 配置改名 - + tips 提示 - + The content can not be empty 内容不能为空 @@ -2387,22 +2400,22 @@ bug description: 没有发现扫描仪 - - - - - + + + + + Question 询问 - + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2411,7 +2424,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2428,17 +2441,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2453,12 +2466,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2471,33 +2484,33 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - - + - + - + - + + Please wake up the device manually 请手动唤醒设备 @@ -2507,238 +2520,239 @@ Do you want to clear? 紫光扫描软件 - + + default scheme - 默认设置方案 + 默认配置方案 - + thumbnailBar enabled 显示缩略图栏 - + thumbnailBar hidden 隐藏缩略图栏 - + cancel 取消 - - - + + + save succeed 保存成功 - - + + find savePath in thumbnail 图片名在列表中已存在 - + Please select at least one picture before export 请至少选中一张图片再进行导出 - + 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 彩色 - + Not supported 不支持 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - + cache path folder limit:%1 无法访问当前缓存路径：%1 请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径。 - + aquireinto folder limit:%1 无法访问当前缓存路径：%1 请尝试在【扫描到】更改缓存路径。 - + Image processing failed 图像处理失败 - + Ocr init failed OCR初始化错误 - + Ocr failed OCR错误 - + File does not exist 文件不存在 - + Failed to load dynamic library 加载动态库失败 - + File data error 文件数据错误 - + Image format processing error 图像格式处理错误 - + Out of memory 内存不足 - + Failed 错误 - - + + The language switch is successful and takes effect the next time the software is started! 语言切换成功，下次启动软件时生效! - + Are you sure to delete selected file? 您确定彻底删除选中项文件？ - - + - + - + - + + already waked up device 已唤醒设备 - + be ready 就绪 @@ -2748,7 +2762,7 @@ Please finish scanning first. 请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径 - + Insufficient access rights 文件访问权限不足 @@ -2761,46 +2775,46 @@ Please finish scanning first. 图像处理失败 - + Are you sure to close 您确定要断开设备： - + ? 吗? - + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - + + error 错误 @@ -2815,17 +2829,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2834,36 +2848,36 @@ Continue to close? 请重新进入关于界面以获取最新值 - - + + <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 @@ -2880,22 +2894,22 @@ Continue to close? 失败 - - + + failed 失败 - - - + + + warning 警告 - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2905,7 +2919,7 @@ Continue to close? 配置丢失 - + apply setting 应用配置 @@ -2913,21 +2927,21 @@ Continue to close? - - + - + - + - + + start failed 启动失败 @@ -3017,7 +3031,7 @@ Continue to close? 取消自动保存 - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 @@ -3038,26 +3052,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - + save image failed: 存图失败： - - + + create savepath failed: 创建文件夹失败： @@ -3066,102 +3080,102 @@ Continue to close? %1%2%3.%4 - + create image doc failed: 创建图片文件失败： - - + - + - + - + + save image doc failed: 保存图片文件失败： - + start failed! 启动安装程序失败！ - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - + found device : %1 发现设备 : %1 - - - - - - - - - - - - - + + + + + + + + + + + + + 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. 文档丢失！文档可能已被删除或被重命名。 @@ -3202,21 +3216,21 @@ Are you sure to close? <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/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index e8eea80c..a6b6207c 100644 Binary files a/app/scanner/Scanner_zh_EN.qm and b/app/scanner/Scanner_zh_EN.qm differ diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index b408bb1d..6fb14d4b 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -159,7 +159,7 @@ Existing configuration plan: - + delete all configurations Delete all configurations @@ -168,12 +168,12 @@ Configuration information: - + change name Rename - + delete Delete @@ -182,203 +182,216 @@ Apply - + found scheme Found scheme - + Directory Table of Contents - + ... - + Use subfolder based on current date Create a subfolder using the current date - + Use subfolder based on blank pages Create subfolders according to blank pages - + Use subfolder based on image color type Create a subfolder according to the image color type - + File name File name - + File name index File index - + Start index Start index - + Digit(s) Number - + 1 - + 2 - + 3 - + 4 - + 5 - + e.g. 'HGScan001' For example HGScan001 - + Even and odd pages Even number and odd number pages - + Odd pages Odd number page - + Even pages Even number page - + Format Format - + JPG - JPG / JFIF(*.jpg) - + BMP - Windows Bitmap(*.bmp) - + PNG - Portable Network Graphics(*.png) - + PPM - Portable Pixmap(*.ppm) - + PGM - Portable Greymap(*.pgm) - + PBM - Portable Bitmap(*.pbm) - + TIF - TIFF Revision 6(*.tif) - + PDF - Portable Document Format(*.pdf) - + OFD - Open Fixed-layout Document(*.ofd) - + GIF - Graphics Interchange Format(*.gif) - + Compression option Compression options - + Save as multipages (TIFF/PDF/OFD/GIF) Save multiple pages(TIFF/PDF/OFD/GIF) - + 所有页 All pages - + 用户自定义页数 User custom pages - + + default scheme Default scheme - - - - + + + + e.g. '%1%2' For example"%1%2" - + ok OK - + cancel Cancel - + Browse directory Folder path + + + + tips + Prompt + + + + + The configuration scheme already exists + The configuration scheme already exists + Dialog_ClrCache @@ -1151,17 +1164,17 @@ The page range will be “selected pages” Cancel - + configuration scheme name change Rename configuration - + tips Prompt - + The content can not be empty The content can not be empty @@ -2307,21 +2320,21 @@ Please make sure the two passwords are the same. Cancel auto save - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save Save edited images automatically when switching images. If you want to cancel, please deselect the menu item: Auto save images. - - - - - + + + + + Question Ask - + modified, save it? Image modified, save changes? @@ -2338,7 +2351,7 @@ Please make sure the two passwords are the same. No - + file lost, remove it? File lost; delete? @@ -2347,89 +2360,89 @@ Please make sure the two passwords are the same. Device discovered - + found device : %1 Device discovered: %1 - + reconnected reconnect - + already connected, but open faild connected, but failed to open - + disconnected disconnected - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. Insufficient disk space for the current path. Please reselect a path or clear disk space immediately. - - - + + + warning Warning - + save image failed: Failed to save image: - - + + create savepath failed: Failed to create folder: - + create image doc failed: Failed to create image file: - - + - + - + - + + save image doc failed: Failed to save image: - + binary Black and white - + gray Grayscale - + rgb Color @@ -2437,21 +2450,21 @@ Please reselect a path or clear disk space immediately. - - + - + - + - + + start failed Failed to start @@ -2461,299 +2474,300 @@ Please reselect a path or clear disk space immediately. UNI scanning software - + + default scheme Default scheme - - + - + - + - + + Please wake up the device manually Please wake up the device manually - - + - + - + - + + already waked up device Device is awake - + thumbnailBar enabled Show thumbnail bar - + thumbnailBar hidden Hide thumbnail bar - + Clear, then start scan Clear and start scan - + Do NOT clear, then start scan Do not clear and start scan - + cancel Cancel - + Already exist images in image list. Do you want to clear? Image already exists in the list of images. Clear? - + Open images Open image - + Insert images Insert image - - - - - - - - - - - - - + + + + + + + + + + + + + tips prompt - - - + + + save succeed Saved successfully - - + + find savePath in thumbnail Image name already exists in the list - + Please select at least one picture before export Please select at least one image and then export - + File name File name - + File path File path - + File size File size - + Creation date/time Creation time - + Modified date/time Modification time - + Accessed date/time Access time - + Format Format - + Width Width - + Height Height - + depth Depth - + Color model Color mode - + DPI Pixels per inch - + Print size Print size - + Frame Frame - + None None - + Mono Black and white - + Gray Gray scale - + Color Color - + Not supported Not supported - + Warning Warning - + Device is Running! Please finish scanning first. Device is currently running! Please stop scanning first. - + There are pictures that have not been saved. Are you sure to close? There are unsaved images; are you sure you want to close? - + Are you sure to close? Are you sure you want to close? - + Sure to sign out administrator account? Are you sure you want to log out of the administrator account? - + confirm operation Confirm operation - + are you sure to clear the roller count? Are you sure you want to clear the roller count? - - - + + + hint Prompt - - + + Roller scanned count has been set to 0. Roller count reset to zero. - - + + Roller scanned count reset failed. Failed to reset roller count. - + Error Error - + Document missing! It would be deleted or renamed. File lost! File may be deleted or renamed. - + confirm the operation Confirm operation - + Are you sure to clear the rollor acount? Are you sure you want to clear the roller count? - + cache path folder limit:%1 Unable to access the current path:%1 Please try to log in to the administrator account in the [User] menu and go to the [Cache settings] to change the cache path. - + aquireinto folder limit:%1 Unable to access the current path:%1 Please try to change the cache path in [Scan to]. @@ -2767,76 +2781,76 @@ Please try to change the cache path in [Scan to]. <p>%1</p><p>Version: %2<br>Copyright: &#169; %3</p><p>%4%5%6%7%8%9</p> - - + + about %1 About %1 - - + + <p>Version: %1</p> <p>Version: %1</p> - - + + <p>CopyRight: &#169; %1</p> <p>Copyright: &#169; %1</p> - - + + <p>%1: <a href='%2'>%3</a> <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 <p>%1: %2 - + roller number Number of rollers - + open scanner Open scanner - - + + app name HUAGOSCAN scanning software - - + + success successfully - + be ready Ready - - + + failed failed - - + + error Error - + start failed! Failed to start! @@ -2846,106 +2860,106 @@ Please try to change the cache path in [Scan to]. Please go to “Scan to” and change the accessible scan folder and then perform the scan. - + Insufficient access rights Insufficient file access permissions - + Image processing failed Image processing failed - + Ocr init failed OCR initialization error - + Ocr failed OCR failed - + File does not exist File does not exist - + Failed to load dynamic library Failed to load dynamic library - + File data error File data error - + Image format processing error Image format processing error - + Out of memory Insufficient memory - + Failed Failed - + apply setting Apply configuration - + Are you sure to close Are you sure you want to disconnect device: - + ? ? - + close Close - + tip Prompt - + Other versions not available No other versions obtained - - + + The device does not support this operation Device does not support this operation - - + + IO error IO error - - + + The language switch is successful and takes effect the next time the software is started! The language switch is successful and takes effect the next time the software is started! - + Are you sure to delete selected file? Are you sure to delete the selected file completely? diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp index ed3901bf..106a24ac 100644 --- a/app/scanner/dialog_aquireinto.cpp +++ b/app/scanner/dialog_aquireinto.cpp @@ -159,6 +159,12 @@ void Dialog_AquireInto::replaceCfgName(QString originName, QString newName) HGBase_GetConfigPath(cfgPath, 512); strcat(cfgPath, "config.ini"); + QString currentKeyName = getCurrentCfgName(); + if (currentKeyName == originName) + { + saveCfgValue("aquire", "currentKeyName", newName); + } + QString allCfgName = getCfgValue("aquire", "cfgNameList", QString("")); QStringList allCfgNameList = allCfgName.split(","); for (int i = 0; i < allCfgNameList.size(); ++i) @@ -303,7 +309,10 @@ void Dialog_AquireInto::on_buttonBox_accepted() } } - saveCfgBaseOnSection(currentCfgName); + if (ui->comboBox_cfgScheme->currentIndex() != 0) + { + saveCfgBaseOnSection(currentCfgName); + } } saveCfgValue("aquire", "currentKeyName", currentCfgName); @@ -360,6 +369,16 @@ void Dialog_AquireInto::on_pbtn_changeName_clicked() if (dlg.exec()) { QString newCfgName = dlg.getText(); + + for (int i = 0; i < ui->comboBox_cfgScheme->count(); ++i) + { + if (newCfgName == ui->comboBox_cfgScheme->itemText(i)) + { + QMessageBox::information(this, tr("tips"), tr("The configuration scheme already exists")); + return; + } + } + int count = ui->comboBox_cfgScheme->count(); for (int i = 0; i < count; ++i) { diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index c057537f..709101cd 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -216,7 +216,7 @@ FORMS += \ RESOURCES += \ ../../../app/fwupgrade/FWUpgrade_resource.qrc -DISTFILES += \ +TRANSLATIONS += \ ../../../app/fwupgrade/FWUpgrade_zh_CN.qm \ ../../../app/fwupgrade/FWUpgrade_zh_CN.ts \ ../../../app/fwupgrade/qt_zh_CN.qm \ diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro index 6f69c7c6..f702ee6f 100644 --- a/build2/qt/HGScanner/HGScanner.pro +++ b/build2/qt/HGScanner/HGScanner.pro @@ -338,7 +338,7 @@ FORMS += \ RESOURCES += \ ../../../app/scanner/Scanner_resource.qrc -DISTFILES += \ +TRANSLATIONS += \ ../../../app/scanner/Scanner_zh_CN.qm \ ../../../app/scanner/Scanner_zh_CN.ts \ ../../../app/scanner/Scanner_zh_EN.qm \ diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro index eb38e1b3..b7d7aaaa 100644 --- a/build2/qt/HGUpgrade/HGUpgrade.pro +++ b/build2/qt/HGUpgrade/HGUpgrade.pro @@ -192,6 +192,6 @@ FORMS += \ RESOURCES += \ ../../../app/upgrade/Upgrade_resource.qrc -DISTFILES += \ +TRANSLATIONS += \ ../../../app/upgrade/Upgrade_zh_CN.qm \ ../../../app/upgrade/Upgrade_zh_CN.ts