diff --git a/src/dicom/CEchoAction.cpp b/src/dicom/CEchoAction.cpp
index 8742b19..f45cfa3 100644
--- a/src/dicom/CEchoAction.cpp
+++ b/src/dicom/CEchoAction.cpp
@@ -38,7 +38,7 @@ void CEchoAction::run(){
scu.setConnectionTimeout(3);
OFCondition cond = scu.initNetwork();
- QString errorMessage = QString(tr("Connection from device test to %1:%2 failed")).arg(mSettings[i].IP.data()).arg(mSettings[i].Port);
+ QString errorMessage = QString(tr("Connection test from device to %1:%2 failed")).arg(mSettings[i].IP.data()).arg(mSettings[i].Port);
if (cond.bad())
{
doCompletedEmit(ActionResult(Failed,errorMessage),i,mSettings.length());
@@ -70,7 +70,7 @@ void CEchoAction::run(){
doCompletedEmit(ActionResult(Sucessed,message),i,mSettings.length());
}
else{
- QString errorMessage = QString(tr("Connection test from Recon to %1:%2 failed"))
+ QString errorMessage = QString(tr("Connection test from server to %1:%2 failed"))
.arg(mSettings[i].IP.data()).arg(mSettings[i].Port);
doCompletedEmit(ActionResult(Failed,errorMessage),i,mSettings.length());
}
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index 69e1c66..0465033 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -224,6 +224,40 @@
+
+ CEchoAction
+
+ Connecting from device to %1:%2......
+
+
+
+ Connection test from device to %1:%2 successed
+
+
+
+ Connection test from server to %1:%2 successed
+
+
+
+ Connection test from device to %1:%2 failed
+
+
+
+ Connecting test from server to %1:%2......
+
+
+
+ Connection test from server to %1:%2 failed
+
+
+
+
+ CEchoTestDialog
+
+ Test DICOM Connection
+
+
+
ChangePasswordFormDialog
@@ -620,6 +654,13 @@ progress:99%
+
+ GetPACSSettingAction
+
+ Fail to get PACSSettings
+
+
+
GetRouteDialog
@@ -1064,6 +1105,10 @@ progress:99%
Mpps Settings
Mpps
+
+ Test Connection
+
+
NetworkCfgDialog
@@ -1164,6 +1209,37 @@ progress:99%
+
+ PACSSettingsDataModel
+
+ Yes
+
+
+
+ No
+
+
+
+ AETitle
+
+
+
+ IP
+
+
+
+ Port
+
+
+
+ Server AE
+
+
+
+ Use SC
+
+
+
PacsSettingsDialog
@@ -1171,27 +1247,7 @@ progress:99%
- AE can't be empty
-
-
-
- Server AE can't be empty
-
-
-
- Server Ip can't be empty
-
-
-
- Server Port can't be empty
-
-
-
- Ip Address is not valid
-
-
-
- Port is not valid
+ Test Connection
@@ -1366,11 +1422,7 @@ progress:99%
ReconManager
- Set PACS settings failed
-
-
-
- Set PACS settings succeed
+ Can't connect to Recon server
@@ -1960,5 +2012,9 @@ progress:99%
Server Port can't be empty
+
+ Test Connection
+
+
diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm
index 8be6486..1400af0 100644
Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ
diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index 375b3f8..060ad4e 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -356,6 +356,51 @@
警告
+
+ CEchoAction
+
+
+ Connecting from device to %1:%2......
+ 尝试从设备到%1:%2的连接......
+
+
+ Connection from device test to %1:%2 failed
+ 尝试从设备到%1:%2的连接......
+
+
+
+ Connection test from device to %1:%2 failed
+ 从设备到%1:%2的连接失败
+
+
+
+ Connection test from device to %1:%2 successed
+ 从设备到%1:%2的连接成功
+
+
+
+ Connecting from server to %1:%2......
+ 尝试从服务器到%1:%2的连接......
+
+
+
+ Connection test from server to %1:%2 successed
+ 从服务器到%1:%2的连接成功
+
+
+
+ Connection test from server to %1:%2 failed
+ 从服务器到%1:%2的连接失败
+
+
+
+ CEchoTestDialog
+
+
+ Test DICOM Connection
+ 测试DICOM通讯连接
+
+
ChangePasswordFormDialog
@@ -416,9 +461,9 @@
DeviceManager
-
-
-
+
+
+
DMS connection error
DMS失去连接
@@ -470,17 +515,17 @@ progress:99%
扫查结束
-
+
Error:
错误:
-
+
Start scan failed. Reason:time out.
扫查启动失败，原因：超时
-
+
Start scan failed. Reason:%1
扫查启动失败，原因：%1
@@ -538,13 +583,13 @@ progress:99%
重建服务器错误，无法开始检查流程
-
-
+
+
Start auto locate failed
自动化定位启动失败
-
+
The data quality is low, please restart the data scan.
扫查数据质量较低，请重新开始检查流程
@@ -552,62 +597,62 @@ progress:99%
DicomCfgDialog
-
+
Dialog
检查对象信息
-
+
DICOM Settings
DICOM 配置
-
-
-
+
+
+
IP
-
-
-
+
+
+
AE
AE
-
-
-
+
+
+
Port
-
-
-
+
+
+
Name
姓名
-
-
-
+
+
+
...
DICOM
-
+
Worklist
新增(拉取)
-
+
PACS
-
+
3D Recon
@@ -625,27 +670,27 @@ progress:99%
DicomSettingsArea
-
+
Form
-
+
Local AE
本机AE
-
+
Server Ip
服务器地址
-
+
Server AE
服务器AE
-
+
Server Port
服务器端口
@@ -749,7 +794,7 @@ progress:99%
GUIMessageDialog
-
+
Dialog
@@ -898,6 +943,14 @@ progress:99%
子网掩码错误！
+
+ GetPACSSettingAction
+
+
+ Fail to get PACSSettings
+
+
+
GetRouteDialog
@@ -1001,7 +1054,7 @@ progress:99%
InputModeMenu
-
+
Form
@@ -1047,200 +1100,200 @@ progress:99%
Keyboard
-
+
Form
-
+
q
-
+
w
-
+
e
-
+
r
-
+
t
-
+
y
-
+
u
-
+
i
-
+
o
-
+
p
-
-
+
+
Back
-
+
a
-
+
s
-
+
d
-
+
f
-
+
g
-
+
h
-
+
j
-
+
k
-
+
l
-
+
Enter
-
+
小写
-
+
z
-
+
x
-
+
c
-
+
v
-
+
b
-
+
n
-
+
m
-
+
↑
-
+
?123
-
-
+
+
En
-
+
Space
-
-
+
+
Hide
-
+
←
-
+
↓
-
+
→
-
+
Clear
@@ -1376,7 +1429,7 @@ progress:99%
MainWindow
-
+
MainWindow
@@ -1455,37 +1508,42 @@ progress:99%
MppsSettingsDialog
-
+
Mpps Settings
Mpps通讯设置
-
+
+ Test Connection
+ 测试连接
+
+
+
AE can't be empty
AE不能为空
-
+
Server AE can't be empty
服务器AE不能为空
-
+
Server Ip can't be empty
服务器地址不能为空
-
+
Server Port can't be empty
服务器端口不能为空
-
+
Ip Address is not valid
服务器地址不符合格式规范
-
+
Port is not valid
服务器端口格式必须为小于65535的数字
@@ -1493,102 +1551,102 @@ progress:99%
NetworkCfgDialog
-
-
+
+
Network Settings
网络配置
-
+
IP Address
IP地址
-
+
DHCP
-
+
Dev
设备
-
+
Subnet Mask
子网掩码
-
+
Additional Address
额外地址
-
-
+
+
Add
新增
-
-
+
+
Edit
编辑
-
-
+
+
Delete
删除
-
+
Address
IP配置
-
+
Default IPv4 Gateway
默认网关
-
+
Routing Table
路由表
-
+
Routing
路由配置
-
+
Name
姓名
-
+
Port
-
+
AE
AE
-
+
IP
-
+
DICOM
-
+
Result
结果
@@ -1619,42 +1677,79 @@ progress:99%
取消
+
+ PACSSettingsDataModel
+
+
+ Yes
+
+
+
+
+ No
+
+
+
+
+ AETitle
+
+
+
+
+ IP
+
+
+
+
+ Port
+
+
+
+
+ Server AE
+ 服务器AE
+
+
+
+ Use SC
+
+
+
PacsSettingsDialog
-
+
PACS Settings
PACS通讯设置
-
+
+ Test Connection
+ 测试连接
+
+
AE can't be empty
- AE不能为空
+ AE不能为空
-
Server AE can't be empty
- 服务器AE不能为空
+ 服务器AE不能为空
-
Server Ip can't be empty
- 服务器地址不能为空
+ 服务器地址不能为空
-
Server Port can't be empty
- 服务器端口不能为空
+ 服务器端口不能为空
-
Ip Address is not valid
- 服务器地址不符合格式规范
+ 服务器地址不符合格式规范
-
Port is not valid
- 服务器端口格式必须为小于65535的数字
+ 服务器端口格式必须为小于65535的数字
@@ -1770,42 +1865,42 @@ progress:99%
PatientInformationForm
-
+
Form
-
+
Current Patient
当前患者信息
-
+
Patient Name:
患者姓名:
-
+
Patient ID:
患者编码:
-
+
Patient Birthday:
出生日期:
-
+
Patient Gender:
患者性别:
-
+
Patient AccessionNum:
检查单号:
-
+
Scan Protocol:
检查身侧:
@@ -1924,14 +2019,17 @@ progress:99%
ReconManager
-
Set PACS settings failed
- PACS设置失败
+ PACS设置失败
-
Set PACS settings succeed
- PACS设置成功
+ PACS设置成功
+
+
+
+ Can't connect to Recon server
+
@@ -2162,37 +2260,37 @@ parameters
ScanSearchCriteriaForm
-
+
Form
-
+
Scan Search
按日期查找
-
+
Today
今天
-
+
Yesterday
昨天
-
+
Last 7 days
过去7天
-
+
Search All
所有信息
-
+
Scan date from
开始日期
@@ -2201,52 +2299,52 @@ parameters
DICOM
-
+
Scan date to
结束日期
-
+
Search Dates
检索
-
+
Search Criteria
按条件查找
-
+
Retrieve
检索
-
+
Accession Number
检查单号
-
+
Manual Refresh
手动刷新
-
+
Refresh
刷新
-
+
Patient ID
检查对象ID
-
+
Patient Name
检查对象姓名
-
+
Clear Fields
清空
@@ -2424,77 +2522,77 @@ parameters
StartScanProcessDialog
-
+
Dialog
检查对象信息
-
+
Patien Information
检查对象信息
-
+
PatientBirth:
出生日期:
-
+
PatientGender:
患者性别:
-
+
AccessionNumber:
检查单号:
-
+
PatientName:
患者姓名:
-
+
PatientID:
患者编码:
-
+
Protocol Settings
当前流程设置
-
+
<html><head/><body><p><br/></p></body></html>
-
+
left->right
左->右
-
+
right->left
右->左
-
+
only left
单侧左
-
+
only right
单侧右
-
+
start Scan
立即开始
-
+
Cancel
稍后开始
@@ -2559,7 +2657,7 @@ parameters
SystemSettingForm
-
+
Form
@@ -2580,7 +2678,7 @@ parameters
自动验证
-
+
IP
@@ -2589,22 +2687,22 @@ parameters
Worklist过滤器
-
+
Recon Settings
Recon
-
+
Worklist Settings
Worklist
-
+
Pacs Settings
Pacs
-
+
Mpps Settings
Mpps
@@ -2624,7 +2722,7 @@ parameters
TabFormWidget
-
+
Form
@@ -2749,37 +2847,42 @@ parameters
WorklistSettingsDialog
-
+
Worklist Settings
Worklist通讯设置
-
+
+ Test Connection
+ 测试连接
+
+
+
AE can't be empty
AE不能为空
-
+
Server AE can't be empty
服务器AE不能为空
-
+
Server Ip can't be empty
服务器地址不能为空
-
+
Server Port can't be empty
服务器端口不能为空
-
+
Ip Address is not valid
服务器地址不符合格式规范
-
+
Port is not valid
服务器端口格式必须为小于65535的数字