merge fixes2
This commit is contained in:
@@ -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"/>
|
||||
|
||||
Reference in New Issue
Block a user