diff --git a/src/AccountFormDialog.cpp b/src/AccountFormDialog.cpp index be459c4..abd2180 100644 --- a/src/AccountFormDialog.cpp +++ b/src/AccountFormDialog.cpp @@ -67,7 +67,7 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt:: } else {//edit mode btn_Pwd = new QPushButton(this); - btn_Pwd->setText(tr(m_mode == Self ? "Change Password" : "Reset Password")); + btn_Pwd->setText(m_mode == Self ? tr("Change Password") : tr("Reset Password")); layout->addWidget(btn_Pwd); } QLabel* lbl_endline3 = new QLabel(this); @@ -118,7 +118,7 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt:: layout->addWidget(lbl_endline0); //set default value if (m_mode == New) { - btn_Role->setText(tr("doctor")); + btn_Role->setText("doctor"); m_RoleID = User::getRoleID("doctor"); } else { diff --git a/src/GUIFormBaseDialog.cpp b/src/GUIFormBaseDialog.cpp index f2b5e01..96644b0 100644 --- a/src/GUIFormBaseDialog.cpp +++ b/src/GUIFormBaseDialog.cpp @@ -27,7 +27,7 @@ GUIFormBaseDialog::GUIFormBaseDialog(QWidget* parent, Qt::WindowFlags f) : QDial btnCancel->setText(tr("Cancel")); hLayout->addWidget(btnOk); hLayout->addWidget(btnCancel); - btnOk->setObjectName(tr("btnOK")); + btnOk->setObjectName("btnOK"); connect(btnOk, &QPushButton::clicked, [t = this]() { if (t->updateReferenceData()) t->accept(); diff --git a/src/editpatientform.ui b/src/editpatientform.ui index 5f91cc4..f769d60 100644 --- a/src/editpatientform.ui +++ b/src/editpatientform.ui @@ -62,7 +62,7 @@ - Sex + Gender diff --git a/src/network/getadminpsw.cpp b/src/network/getadminpsw.cpp index 27da659..4796ede 100644 --- a/src/network/getadminpsw.cpp +++ b/src/network/getadminpsw.cpp @@ -12,7 +12,7 @@ GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog setWindowModality(Qt::WindowModal); QFormLayout* form = new QFormLayout(formWidget); - QString value1 = QString("Admin Password"); + QString value1 = QString(tr("Admin Password")); _psw = new QLineEdit(this); _psw->setEchoMode(QLineEdit::Password); form->addRow(value1, _psw); diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak index b5371e1..de2e402 100644 --- a/src/translations/zh_CN.ts.bak +++ b/src/translations/zh_CN.ts.bak @@ -68,9 +68,8 @@ 类型 - doctor - 医生 + 医生 @@ -498,14 +497,12 @@ - LEFT ONLY 左侧 - RIGHT ONLY - 右侧 + 右侧 @@ -526,7 +523,7 @@ Protocol - 协议 + 扫描协议