From 1be5952185b36bc43db8e9d452a7da62d0a48072 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Sun, 29 Jan 2023 10:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=BB=98=E8=AE=A4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 37457 -> 37516 bytes app/scanner/Scanner_zh_CN.ts | 273 +++++++++++++++++----------------- app/scanner/Scanner_zh_EN.qm | Bin 50716 -> 50804 bytes app/scanner/Scanner_zh_EN.ts | 276 ++++++++++++++++++----------------- app/scanner/cfg/gb_json.cpp | 4 +- app/scanner/qt_zh_CN.ts | 4 + 6 files changed, 288 insertions(+), 269 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index d9cbd32130c576f87e1cba9b44e2bf83df22b58d..cca5fcf8bbfcd73defb12a4a62328411312916e7 100644 GIT binary patch delta 597 zcmXAlTS!z<6o&u3&zYHX=IY3qrbCx885yEXD$HKIK-3`&?4tElmNA$^BauhP3u;b? z4{523vIvX9Q6Ds^Ng}~0GBPsIFu~^_BQOe_A~I`3PYb@qzt+b;H^4g+yjx?lJ-#9K ztY@-(%MuVQ1R6$woo;|1{y!aGfZZ8D?I+4-eR@5leObT;4bsdkuCY>E<= z68#JxjXwrzz@IFcKv_4R$lNR}Z<5Pu=nwhov`ENzBy0Q>;D0U^Wu6w>_Y}2;SPNaZ z2G~M!+!|xdq--VNy++`h?WL$?F&TB1Fz)p+8tLneHGZC zcdh_yqGeZzeI%dznp*0d+pmkCPifR`FoRO=0Lv$zXNb+yq$kD-DL3r^zm!hRX(!y( zp4E(A;OMU^pzS`bY~PVg^M*|NRw2{h4qYp+37ckBb)`*s+m4h}M8apyWN!OL*FOQM Bvbz8P delta 564 zcmXAlT}V@L7{;If|7>UHY&)Ba)pn{i9mR-J>BH=USrIzJi$$Mwu?j-6LIT^Iin&@? z7n-?VM7l7Mblw;X)(C_k!pOivBMT!igD8T6Q41<3{h_M|p7(j-d4Am^d}f&UI@x4$ z`6%m3J~~m zg{66A%RBW|?UDe0UY-B&64<#~{gD#do}{qV#ZsB5HN+e{EZrjppvi3M@q8DQoHVO> zSuN!?Kf6yJ+fB8^I#aESKG!H~3o<7aY+hz2kA0L4(NlYjSt(Fd!{hVRS#->{%f48A c3pn`uEO6xlEp9B!xE=lo{W-2>;+>lI51Y@cmjD0& diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 5a3a8e10..9ac22ef9 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -2179,51 +2179,51 @@ bug description: 导出驱动日志 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - - + + + nodevice 没有发现扫描仪 - - - - + + + + Question 询问 - - + + modified, save it? 图像已被修改。 是否保存修改? - + file lost, remove it? 文件已丢失,是否删除? @@ -2232,7 +2232,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2249,17 +2249,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2274,12 +2274,12 @@ Do you want to clear? 磁盘空间不足,请删除不需要的文件,以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2292,140 +2292,140 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - + 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 彩色 @@ -2444,53 +2444,53 @@ Please finish scanning first. 请先结束扫描。 - + 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 错误 + - @@ -2508,18 +2508,18 @@ Please finish scanning first. 就绪 - - + + folder limit 无法访问“我的文档”, 请前往“扫描至”更换可访问的扫描目录再进行扫描。 - + Insufficient access rights 文件访问权限不足 @@ -2532,47 +2532,47 @@ 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 错误 @@ -2627,13 +2627,13 @@ Continue to close? - + app name 华高扫描软件 - + success 成功 @@ -2651,20 +2651,20 @@ 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. 当前路径磁盘空间不足, @@ -2675,14 +2675,14 @@ Continue to close? 配置丢失 - + apply setting 应用配置 + - @@ -2699,119 +2699,119 @@ Continue to close? 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + CumtennScan 沧田扫描软件 - + menu_language 语言 - + act_simpCN 简体中文 - + act_English - 英语 + English - + auto save 自动保存 - + when switching pictures, save the edited pictures directly without reminding 切换图片时,不提醒,直接保存编辑过的图片 - + statusBar displayed 显示状态栏 - + statusBar hidden 隐藏状态栏 - + toolBar displayed 显示工具栏 - + toolBar hidden 隐藏工具栏 - + colorInfo enabled 启用图像信息 - + colorInfo disenabled 关闭图像信息 - + enabling automatic saving 启用自动保存 - + cancel auto save 取消自动保存 - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save 切换图片时,自动保存编辑过的图像。若想取消,请取消勾选菜单项:图像->自动保存 - - - + + + - - + + yes 确定 - + save, do not remind again 保存,不再提醒 - - - + + + - + no 取消 @@ -2820,26 +2820,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接,但打开失败 + - save image failed: 存图失败: + - + - create savepath failed: 创建文件夹失败: @@ -2848,30 +2848,30 @@ Continue to close? %1%2%3.%4 + - create image doc failed: 创建图片文件失败: + - + - + - + - + - save image doc failed: 保存图片文件失败: - + start failed! 启动安装程序失败! @@ -2882,20 +2882,20 @@ Are you sure to close? 有图像未保存,确定关闭? - + found device : %1 发现设备 : %1 - - - - - - - - - + + + + + + + + + tips 提示 @@ -3014,6 +3014,11 @@ Are you sure to close? error 错误 + + + default_setting + 默认设置 + Widget diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index cbb430353f8082db59f3d372fe29e043da4af99d..c2e24c6ff49ee6ed0ea07829f84f404a398f8ac7 100644 GIT binary patch delta 846 zcmXAndu+^E6vw~!{$}QP=b=AS?T*=IrVZ+`Qp5VAnpnG4ro?MSyk;Xs+bvyfJ%%hB z=^{;uj?xp63P$N`OWV|pVE$N=tw(8vV1ppBOJpT&NtI;NVUO$|H=mpDJ@=e@&ix*% z(%w~R2b09ZL&=v#-Ju70S>1r%0tgQ?#{7T47xex0z@$&m>&(EZ5fqoX?ilpWcEDE#^~EYyzlZ7`1j4nnO3M_l z=&;t7*y6*w+9Duh2Z|@|2I>Q})YK$aQ{3bdCn?$7_*K*{{;qxuL}!Y=-sRkCspvOv z2Ab-`$0c)ttu4|rO#@ml&`WcsxI`YyB6q!P-5mvvXUhw(fHn^Nb5*rw(lg5?v;(RBj4!NLM){omFny==f11t9-7U$Lr1s= z9}TLo_?Zq{KUeIr&X6ZZ(=c1PxJMzI&-$z7Y^;LAKhRa1PlO|bHbaQVWOn#gR;rd2 z`?$&z)jokUo!X@?PW}g2c0|SEwSYRRt{nIsnEzaL?)jJFa@2JjfSenu>&|^3GoT*4 z~y({2?5^Qvu0Nq_Kk`yv^` zmWwIX_NoRGa7?ow@bt0#rM;nx!>1S6o09`jz-;Bm0e!uYoguI-f8$@wY_# zK+0{t7H}ZAjjc0>dJ`(Gw;Xq8yMfbw+G+UZ85>P=U?gN2t-Q267Tts8=QTMC20^`%8RYx?3vYl{o>gOQOPreu9D ID^iI607=vY6aWAK delta 733 zcmXBST}YEr7zgnGIj`H^ch0@Nl8qUg5-Did>p7T6swoYoQlddjh zLk)4ySW&~6EAu>H@B_>y>=SMg4hRndD>nn)5nzoO&}aWw3j^yCfmsQ2~2ZBPlX z(i&m7)C#O#fZ?`I%nne5=UFRYc+~|s${;V>58N?8em4hrcF}$*gSC)b3dG*~j3bSQ zfwVI?wyGLv)o4#t8?#U(%EAgMPUlMvzGNS-j03^nY-YMpJhha4)13g?irD<_9l%LH z*Kd@7&QhAvWw3Ix>33T9@y_aApgEgA`ces0dU)RoyU6|%)##nPW0FGp1ZJmcy*>89 zlyuD^)}(r=CsEk7o@@p?_x=rTGF)NIL?JmrIj75;trc%@QAGAI2Q@2;H;pM-+%ryb z#wvD^+(w6zq3`Ic5n%xe869kIFk)00YoHjDL(7u=MHj^BBzL9U5Fr~W-(*h>{E^=n z0pz@u`-et>jAD80hbYqh8TtExLqJlyB3EUK_N*YcsWiUzt1_~E9>{&FOnw*y3i6e( zPw0;)Ta1NygBxNBndXeH^F{$pQuJlp3~+atn$33ZkI)lya%_8lba=Vg(o}3ht&3{udNd6IcpOt8MH$xtG*xF7v_}@ySr3@@!EFZyKd(dDeh> zq+|k+xmvdOwCGW~TK;;`vsAAYSUM-vzlqm?@9J;CEWJnkR5 CLF?)O diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index 54426c3b..efefe0ad 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -2022,167 +2022,167 @@ Please make sure the two passwords are the same. Export drive log... - + HanvonScan Hanvon scanning software - + LanxumScan LANXUM scanning software - + CumtennScan CUMTENN scanning software - + HuaGoScan HUAGOSCAN scanning software - + menu_language Language - + act_simpCN - Chinese + 简体中文 - + act_English English - + Grid Multi-column display - + Move To... Move to... - + Insert files Insert file - - - + + + nodevice No scanner detected - + auto save Auto save - + when switching pictures, save the edited pictures directly without reminding Do not show prompt and save the edited images directly when switching images. - + statusBar displayed Show status bar - + statusBar hidden Hide status bar - + toolBar displayed Show toolbar - + toolBar hidden Hide toolbar - + colorInfo enabled Enable image information - + colorInfo disenabled Disable image information - + enabling automatic saving Enable auto save - + cancel auto save 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? - - - + + + - - + + yes Yes - + save, do not remind again Save, do not prompt again - - - + + + - + no No - + file lost, remove it? File lost; delete? @@ -2191,96 +2191,96 @@ 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 + - @@ -2297,8 +2297,8 @@ Please reselect a path or clear disk space immediately. Failed to start + - @@ -2311,166 +2311,166 @@ Please reselect a path or clear disk space immediately. 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 @@ -2598,13 +2598,13 @@ Are you sure to close? - + app name HUAGOSCAN scanning software - + success successfully @@ -2615,127 +2615,135 @@ Are you sure to close? - + failed failed - - - + + + error Error - + start failed! Failed to start! - - + + folder limit Cannot access “My Documents”. 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 + + QObject + + + default_setting + Default setting + + Widget diff --git a/app/scanner/cfg/gb_json.cpp b/app/scanner/cfg/gb_json.cpp index 2e38974d..6b6e1de0 100644 --- a/app/scanner/cfg/gb_json.cpp +++ b/app/scanner/cfg/gb_json.cpp @@ -2,6 +2,7 @@ #include "gb_json.h" #include #include +#include #include "../../sdk/include/huagao/brand.h" @@ -1551,10 +1552,11 @@ namespace gb // scanner_cfg std::string scanner_cfg::global_name_ = "global"; std::string scanner_cfg::cur_sel_ = "cur"; - std::string scanner_cfg::default_setting_name_ = "\351\273\230\350\256\244\350\256\276\347\275\256"; // utf-8: 默认设置 + std::string scanner_cfg::default_setting_name_; scanner_cfg::scanner_cfg() : path_(""), scanner_name_(""), global_(new json()) { + default_setting_name_ = QObject::tr("default_setting").toStdString(); init_version(); init_select(); } diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index af3882c2..9898b37b 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -4806,6 +4806,10 @@ Please verify the correct file name was given. Write error writing to %1: %2 写入 %1 错误:%2 + + default_setting + 默认设置 + QPPDOptionsModel