merge fixes2

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 {

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();

src/editpatientform.ui

@@ -62,7 +62,7 @@
      <item>
       <widget class="QLabel" name="lbl_Sex">
        <property name="text">
-        <string>Sex</string>
+        <string>Gender</string>
        </property>
       </widget>
      </item>

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);

src/translations/zh_CN.ts.bak

@@ -68,9 +68,8 @@
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../AccountFormDialog.cpp" line="121"/>
         <source>doctor</source>
-        <translation>医生</translation>
+        <translation type="vanished">医生</translation>
     </message>
     <message>
         <location filename="../AccountFormDialog.cpp" line="129"/>
@@ -498,14 +497,12 @@
     </message>
     <message>
         <location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="128"/>
-        <location filename="../patientinformationform.cpp" line="36"/>
         <source>LEFT ONLY</source>
         <translation>左侧</translation>
     </message>
     <message>
-        <location filename="../patientinformationform.cpp" line="40"/>
         <source>RIGHT ONLY</source>
-        <translation>右侧</translation>
+        <translation type="vanished">右侧</translation>
     </message>
 </context>
 <context>
@@ -526,7 +523,7 @@
     <message>
         <location filename="../ScanFormWidget.cpp" line="43"/>
         <source>Protocol</source>
-        <translation>协议</translation>
+        <translation>扫描协议</translation>
     </message>
     <message>
         <location filename="../ScanFormWidget.cpp" line="88"/>