merge fixes2

This commit is contained in:
xueyan hu
2021-12-23 17:15:49 +08:00
parent b90485ab59
commit f748ce7185
5 changed files with 8 additions and 11 deletions

View File

@@ -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"/>