diff --git a/modules/twainui/TwainUI_zh_CN.qm b/modules/twainui/TwainUI_zh_CN.qm
index c1518ba7..4153bc81 100644
Binary files a/modules/twainui/TwainUI_zh_CN.qm and b/modules/twainui/TwainUI_zh_CN.qm differ
diff --git a/modules/twainui/TwainUI_zh_CN.ts b/modules/twainui/TwainUI_zh_CN.ts
index 927b1025..5e2d8bbd 100644
--- a/modules/twainui/TwainUI_zh_CN.ts
+++ b/modules/twainui/TwainUI_zh_CN.ts
@@ -1519,6 +1519,12 @@ Please make sure the two passwords are the same.
Cancel Scan
取消扫描
+
+
+ Close
+ close
+ 关闭
+
Dialog_updateProgress
@@ -2777,78 +2783,78 @@ Are you sure to close?
删除配置
-
+
existing configuration scheme
现有配置方案：
-
+
change name
改名
-
+
delete
删除
-
+
apply
应用
-
+
delete all configurations
删除所有配置
-
+
confgiuration information:
配置信息：
-
+
scan
扫描
-
-
+
+
ok
确定
-
+
cancel
取消
-
+
configuration scheme management
配置方案管理
-
+
regional crop
区域裁剪
-
+
custom tone curve
自定义色调曲线
-
+
Please select to overwrite the original configuration:
请选择覆盖原来的配置：
-
+
,or add a new configuration
，或者新增配置
-
+
save the configuration
保存配置
@@ -2882,82 +2888,82 @@ No: add new configuration
否
-
+
<h6><b>
<h6><b>
-
+
cover original configuration:
覆盖原来配置：
-
+
add new configuration
新增配置
-
+
rename:
更名：
-
-
-
+
+
+
tips
提示
-
+
scheme name cannot be empty
配置名不能为空
-
-
+
+
scheme name:
配置名：
-
-
+
+
already exists
已存在
-
+
:</b></h6>
:</b></h6>
-
+
<p>
<p>
-
+
</p>
</p>
-
+
configuration scheme name change
配置改名
-
-
+
+
be sure to delete the configuration
确认删除配置
-
+
Are you sure you want to delete the configuration "
您确认要删除配置
-
+
" ?
？
@@ -2970,7 +2976,7 @@ No: add new configuration
’ 吗？
-
+
Are you sure you want to delete the configuration?
您确认要删除所有配置吗？
diff --git a/modules/twainui/TwainUI_zh_EN.qm b/modules/twainui/TwainUI_zh_EN.qm
index 8a9a757d..ed0b1482 100644
Binary files a/modules/twainui/TwainUI_zh_EN.qm and b/modules/twainui/TwainUI_zh_EN.qm differ
diff --git a/modules/twainui/TwainUI_zh_EN.ts b/modules/twainui/TwainUI_zh_EN.ts
index 95100c87..6218fad2 100644
--- a/modules/twainui/TwainUI_zh_EN.ts
+++ b/modules/twainui/TwainUI_zh_EN.ts
@@ -1396,6 +1396,12 @@ Please make sure the two passwords are the same.
Cancel Scan
取消扫描
+
+
+ Close
+ close
+ Close
+
Dialog_updateProgress
@@ -2436,158 +2442,158 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
hg_settingdialog
-
+
existing configuration scheme
Existing configuration plan:
-
+
change name
Rename
-
+
delete
Delete
-
+
apply
Apply
-
+
delete all configurations
Delete all configurations
-
+
confgiuration information:
Configuration information:
-
+
scan
Scan
-
-
+
+
ok
OK
-
+
cancel
Cancel
-
+
configuration scheme management
Configuration plan management
-
+
regional crop
Regional crop
-
+
custom tone curve
Custom tone curve
-
+
Please select to overwrite the original configuration:
Please select overwrite original configuration:
-
+
,or add a new configuration
, or add new configuration
-
+
save the configuration
Save configuration
-
+
cover original configuration:
Overwrite original configuration:
-
+
add new configuration
Add new configuration
-
+
rename:
Rename:
-
-
-
+
+
+
tips
Prompt
-
+
scheme name cannot be empty
Configuration name cannot be blank
-
-
+
+
scheme name:
Configuration name:
-
-
+
+
already exists
already exists
-
+
<h6><b>
<h6><b>
-
+
:</b></h6>
:</b></h6>
-
+
<p>
<p>
-
+
</p>
</p>
-
+
configuration scheme name change
Rename configuration
-
-
+
+
be sure to delete the configuration
Delete configuration
-
+
Are you sure you want to delete the configuration "
Are you sure you want to delete configuration
-
+
" ?
?
@@ -2600,7 +2606,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
No
-
+
Are you sure you want to delete the configuration?
Are you sure you want to delete all configurations?
diff --git a/modules/twainui/dialog_progress_ui.ui b/modules/twainui/dialog_progress_ui.ui
index ef6a4d19..c0523b5b 100644
--- a/modules/twainui/dialog_progress_ui.ui
+++ b/modules/twainui/dialog_progress_ui.ui
@@ -76,7 +76,7 @@
-
- close
+ Close
diff --git a/modules/twainui/twainui.cpp b/modules/twainui/twainui.cpp
index 9f84602f..10d4218f 100644
--- a/modules/twainui/twainui.cpp
+++ b/modules/twainui/twainui.cpp
@@ -37,13 +37,7 @@ int choose_scanner(const std::vector &devs)
char *apply_current_config(const char *dev_name, SANE_Handle device, LPSANEAPI api)
{
- hg_settingdialog dlg(device, api, false, dev_name, nullptr);
- gb::sane_config_schm *cfgScheme = dlg.getCurScheme();
- dev_que::apply_scheme(api, device, cfgScheme);
-
- std::string name = cfgScheme->get_scheme_name();
- char *str = const_cast(name.c_str());
- return str;
+ return NULL;
}
void twain_ui_free(void *buf)