merge branch into master

This commit is contained in:
xueyan hu
2021-12-28 10:43:59 +08:00
parent 3c56b33156
commit fff9034e0e
8 changed files with 37 additions and 7 deletions

View File

@@ -189,7 +189,7 @@
<location filename="../AdminSettingForm.cpp" line="30"/>
<location filename="../AdminSettingForm.cpp" line="69"/>
<location filename="../AdminSettingForm.cpp" line="77"/>
<location filename="../AdminSettingForm.cpp" line="80"/>
<location filename="../AdminSettingForm.cpp" line="84"/>
<source>About</source>
<translation></translation>
</message>
@@ -360,7 +360,7 @@
<context>
<name>GetAdminPsw</name>
<message>
<location filename="../network/getadminpsw.cpp" line="15"/>
<location filename="../network/getadminpsw.cpp" line="16"/>
<source>Admin Password</source>
<translation></translation>
</message>

View File

@@ -189,7 +189,7 @@
<location filename="../AdminSettingForm.cpp" line="30"/>
<location filename="../AdminSettingForm.cpp" line="69"/>
<location filename="../AdminSettingForm.cpp" line="77"/>
<location filename="../AdminSettingForm.cpp" line="80"/>
<location filename="../AdminSettingForm.cpp" line="84"/>
<source>About</source>
<translation></translation>
</message>
@@ -360,7 +360,7 @@
<context>
<name>GetAdminPsw</name>
<message>
<location filename="../network/getadminpsw.cpp" line="15"/>
<location filename="../network/getadminpsw.cpp" line="16"/>
<source>Admin Password</source>
<translation></translation>
</message>