merge branch into master
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user