merge upstream 3.22.0.0

This commit is contained in:
winnerym 2022-11-01 14:39:06 +08:00
commit 018b827722
7 changed files with 95 additions and 90 deletions

View File

@ -41,7 +41,7 @@
<location filename="../src/main.cpp" line="135"/> <location filename="../src/main.cpp" line="135"/>
<location filename="../src/main.cpp" line="170"/> <location filename="../src/main.cpp" line="170"/>
<location filename="../src/main.cpp" line="179"/> <location filename="../src/main.cpp" line="179"/>
<location filename="../src/main.cpp" line="315"/> <location filename="../src/main.cpp" line="323"/>
<source>AUTHENTICATION CANCELED</source> <source>AUTHENTICATION CANCELED</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -34,52 +34,52 @@
<context> <context>
<name>BioDevices</name> <name>BioDevices</name>
<message> <message>
<location filename="../src/biodevices.cpp" line="63"/> <location filename="../src/biodevices.cpp" line="64"/>
<source>Unplugging of %1 device detected</source> <source>Unplugging of %1 device detected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="73"/> <location filename="../src/biodevices.cpp" line="74"/>
<source>%1 device insertion detected</source> <source>%1 device insertion detected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="82"/> <location filename="../src/biodevices.cpp" line="83"/>
<source>ukui-biometric-manager</source> <source>ukui-biometric-manager</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="85"/> <location filename="../src/biodevices.cpp" line="86"/>
<source>biometric</source> <source>biometric</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="351"/> <location filename="../src/biodevices.cpp" line="457"/>
<source>FingerPrint</source> <source>FingerPrint</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="353"/> <location filename="../src/biodevices.cpp" line="459"/>
<source>FingerVein</source> <source>FingerVein</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="355"/> <location filename="../src/biodevices.cpp" line="461"/>
<source>Iris</source> <source>Iris</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="357"/> <location filename="../src/biodevices.cpp" line="463"/>
<source>Face</source> <source>Face</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="359"/> <location filename="../src/biodevices.cpp" line="465"/>
<source>VoicePrint</source> <source>VoicePrint</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="361"/> <location filename="../src/biodevices.cpp" line="467"/>
<source>QRCode</source> <source>QRCode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -95,7 +95,7 @@
<context> <context>
<name>LoginOptionsWidget</name> <name>LoginOptionsWidget</name>
<message> <message>
<location filename="../src/loginoptionswidget.cpp" line="57"/> <location filename="../src/loginoptionswidget.cpp" line="59"/>
<source>Login Options</source> <source>Login Options</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -46,52 +46,52 @@
<context> <context>
<name>BioDevices</name> <name>BioDevices</name>
<message> <message>
<location filename="../src/biodevices.cpp" line="63"/> <location filename="../src/biodevices.cpp" line="64"/>
<source>Unplugging of %1 device detected</source> <source>Unplugging of %1 device detected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="73"/> <location filename="../src/biodevices.cpp" line="74"/>
<source>%1 device insertion detected</source> <source>%1 device insertion detected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="82"/> <location filename="../src/biodevices.cpp" line="83"/>
<source>ukui-biometric-manager</source> <source>ukui-biometric-manager</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="85"/> <location filename="../src/biodevices.cpp" line="86"/>
<source>biometric</source> <source>biometric</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="351"/> <location filename="../src/biodevices.cpp" line="457"/>
<source>FingerPrint</source> <source>FingerPrint</source>
<translation>Parmak İzi</translation> <translation>Parmak İzi</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="353"/> <location filename="../src/biodevices.cpp" line="459"/>
<source>FingerVein</source> <source>FingerVein</source>
<translation>Damar İzi</translation> <translation>Damar İzi</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="355"/> <location filename="../src/biodevices.cpp" line="461"/>
<source>Iris</source> <source>Iris</source>
<translation>Göz</translation> <translation>Göz</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="357"/> <location filename="../src/biodevices.cpp" line="463"/>
<source>Face</source> <source>Face</source>
<translation>Yüz</translation> <translation>Yüz</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="359"/> <location filename="../src/biodevices.cpp" line="465"/>
<source>VoicePrint</source> <source>VoicePrint</source>
<translation>Ses İzi</translation> <translation>Ses İzi</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="361"/> <location filename="../src/biodevices.cpp" line="467"/>
<source>QRCode</source> <source>QRCode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -123,7 +123,7 @@
<context> <context>
<name>LoginOptionsWidget</name> <name>LoginOptionsWidget</name>
<message> <message>
<location filename="../src/loginoptionswidget.cpp" line="57"/> <location filename="../src/loginoptionswidget.cpp" line="59"/>
<source>Login Options</source> <source>Login Options</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -54,52 +54,52 @@
<context> <context>
<name>BioDevices</name> <name>BioDevices</name>
<message> <message>
<location filename="../src/biodevices.cpp" line="63"/> <location filename="../src/biodevices.cpp" line="64"/>
<source>Unplugging of %1 device detected</source> <source>Unplugging of %1 device detected</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="73"/> <location filename="../src/biodevices.cpp" line="74"/>
<source>%1 device insertion detected</source> <source>%1 device insertion detected</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="82"/> <location filename="../src/biodevices.cpp" line="83"/>
<source>ukui-biometric-manager</source> <source>ukui-biometric-manager</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="85"/> <location filename="../src/biodevices.cpp" line="86"/>
<source>biometric</source> <source>biometric</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="351"/> <location filename="../src/biodevices.cpp" line="457"/>
<source>FingerPrint</source> <source>FingerPrint</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="353"/> <location filename="../src/biodevices.cpp" line="459"/>
<source>FingerVein</source> <source>FingerVein</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="355"/> <location filename="../src/biodevices.cpp" line="461"/>
<source>Iris</source> <source>Iris</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="357"/> <location filename="../src/biodevices.cpp" line="463"/>
<source>Face</source> <source>Face</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="359"/> <location filename="../src/biodevices.cpp" line="465"/>
<source>VoicePrint</source> <source>VoicePrint</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/biodevices.cpp" line="361"/> <location filename="../src/biodevices.cpp" line="467"/>
<source>QRCode</source> <source>QRCode</source>
<translation></translation> <translation></translation>
</message> </message>
@ -135,7 +135,7 @@
<context> <context>
<name>LoginOptionsWidget</name> <name>LoginOptionsWidget</name>
<message> <message>
<location filename="../src/loginoptionswidget.cpp" line="57"/> <location filename="../src/loginoptionswidget.cpp" line="59"/>
<source>Login Options</source> <source>Login Options</source>
<translation></translation> <translation></translation>
</message> </message>
@ -144,9 +144,8 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../src/loginoptionswidget.cpp" line="57"/>
<source>Biometric</source> <source>Biometric</source>
<translation></translation> <translation type="vanished"></translation>
</message> </message>
</context> </context>
<context> <context>

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
ukui-biometric-auth (3.22.0.0-ok2~1101) yangtze; urgency=medium ukui-biometric-auth (3.22.0.0-ok3~1101) yangtze; urgency=medium
* 其他修改说明:修复编包问题,重新编包 * 其他修改说明:修复编包问题,重新编包

View File

@ -65,7 +65,7 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/mainwindow.cpp" line="63"/> <location filename="../src/mainwindow.cpp" line="65"/>
<source>Authentication</source> <source>Authentication</source>
<translation></translation> <translation></translation>
</message> </message>
@ -91,14 +91,14 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="299"/> <location filename="../src/mainwindow.ui" line="302"/>
<location filename="../src/mainwindow.cpp" line="836"/> <location filename="../src/mainwindow.cpp" line="882"/>
<location filename="../src/mainwindow.cpp" line="893"/> <location filename="../src/mainwindow.cpp" line="948"/>
<source>Biometric</source> <source>Biometric</source>
<translation>使</translation> <translation>使</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="360"/> <location filename="../src/mainwindow.ui" line="373"/>
<source>use password</source> <source>use password</source>
<translation>使</translation> <translation>使</translation>
</message> </message>
@ -147,20 +147,20 @@
<translation type="vanished">Polkit.caller-pid</translation> <translation type="vanished">Polkit.caller-pid</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="331"/> <location filename="../src/mainwindow.ui" line="334"/>
<location filename="../src/mainwindow.cpp" line="838"/> <location filename="../src/mainwindow.cpp" line="884"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.ui" line="350"/> <location filename="../src/mainwindow.ui" line="353"/>
<location filename="../src/mainwindow.cpp" line="834"/> <location filename="../src/mainwindow.cpp" line="880"/>
<source>Authenticate</source> <source>Authenticate</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="840"/> <location filename="../src/mainwindow.cpp" line="886"/>
<location filename="../src/mainwindow.cpp" line="927"/> <location filename="../src/mainwindow.cpp" line="991"/>
<source>Use password</source> <source>Use password</source>
<translation>使</translation> <translation>使</translation>
</message> </message>
@ -185,30 +185,30 @@
<translation type="vanished">...</translation> <translation type="vanished">...</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="962"/> <location filename="../src/mainwindow.cpp" line="1026"/>
<location filename="../src/mainwindow.cpp" line="1029"/> <location filename="../src/mainwindow.cpp" line="1093"/>
<location filename="../src/mainwindow.cpp" line="1030"/> <location filename="../src/mainwindow.cpp" line="1094"/>
<source>Please try again in %1 minutes.</source> <source>Please try again in %1 minutes.</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="972"/> <location filename="../src/mainwindow.cpp" line="1036"/>
<location filename="../src/mainwindow.cpp" line="1039"/> <location filename="../src/mainwindow.cpp" line="1103"/>
<location filename="../src/mainwindow.cpp" line="1040"/> <location filename="../src/mainwindow.cpp" line="1104"/>
<source>Please try again in %1 seconds.</source> <source>Please try again in %1 seconds.</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="981"/> <location filename="../src/mainwindow.cpp" line="1045"/>
<location filename="../src/mainwindow.cpp" line="982"/> <location filename="../src/mainwindow.cpp" line="1046"/>
<location filename="../src/mainwindow.cpp" line="1048"/> <location filename="../src/mainwindow.cpp" line="1112"/>
<location filename="../src/mainwindow.cpp" line="1049"/> <location filename="../src/mainwindow.cpp" line="1113"/>
<source>Account locked permanently.</source> <source>Account locked permanently.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="633"/> <location filename="../src/mainwindow.cpp" line="675"/>
<location filename="../src/mainwindow.cpp" line="634"/> <location filename="../src/mainwindow.cpp" line="676"/>
<source>Password cannot be empty</source> <source>Password cannot be empty</source>
<translation></translation> <translation></translation>
</message> </message>
@ -221,7 +221,7 @@
<translation type="vanished">%1.</translation> <translation type="vanished">%1.</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="171"/> <location filename="../src/mainwindow.cpp" line="175"/>
<source>Failed to verify %1, you still have %2 verification opportunities</source> <source>Failed to verify %1, you still have %2 verification opportunities</source>
<translation>%1%2</translation> <translation>%1%2</translation>
</message> </message>
@ -230,12 +230,12 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="536"/> <location filename="../src/mainwindow.cpp" line="578"/>
<source>Password: </source> <source>Password: </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="247"/> <location filename="../src/mainwindow.cpp" line="261"/>
<source>Please enter your password or enroll your fingerprint </source> <source>Please enter your password or enroll your fingerprint </source>
<translation></translation> <translation></translation>
</message> </message>
@ -255,17 +255,17 @@
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="540"/> <location filename="../src/mainwindow.cpp" line="582"/>
<source>_Password:</source> <source>_Password:</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="649"/> <location filename="../src/mainwindow.cpp" line="691"/>
<source>Authentication failed, please try again.</source> <source>Authentication failed, please try again.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="581"/> <location filename="../src/mainwindow.cpp" line="623"/>
<source>days left</source> <source>days left</source>
<translation></translation> <translation></translation>
</message> </message>
@ -278,74 +278,73 @@
<translation type="vanished">/%1</translation> <translation type="vanished">/%1</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="161"/> <location filename="../src/mainwindow.cpp" line="164"/>
<location filename="../src/mainwindow.cpp" line="1111"/> <location filename="../src/mainwindow.cpp" line="1176"/>
<source>Failed to verify %1, please enter password to unlock</source> <source>Failed to verify %1, please enter password to unlock</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="165"/> <location filename="../src/mainwindow.cpp" line="168"/>
<location filename="../src/mainwindow.cpp" line="1113"/> <location filename="../src/mainwindow.cpp" line="1178"/>
<source>Unable to verify %1, please enter password to unlock</source> <source>Unable to verify %1, please enter password to unlock</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="183"/>
<source>NET Exception</source> <source>NET Exception</source>
<translation></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="475"/> <location filename="../src/mainwindow.cpp" line="517"/>
<source>A program is attempting to perform an action that requires privileges.It requires authorization to perform the action.</source> <source>A program is attempting to perform an action that requires privileges.It requires authorization to perform the action.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="534"/> <location filename="../src/mainwindow.cpp" line="576"/>
<source>Input Password</source> <source>Input Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="585"/> <location filename="../src/mainwindow.cpp" line="627"/>
<source>hours left</source> <source>hours left</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="589"/> <location filename="../src/mainwindow.cpp" line="631"/>
<source>minutes left</source> <source>minutes left</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="593"/> <location filename="../src/mainwindow.cpp" line="635"/>
<source>seconds left</source> <source>seconds left</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1127"/> <location filename="../src/mainwindow.cpp" line="1193"/>
<source>Verify face recognition or enter password to unlock</source> <source>Verify face recognition or enter password to unlock</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1132"/> <location filename="../src/mainwindow.cpp" line="1198"/>
<source>Press fingerprint or enter password to unlock</source> <source>Press fingerprint or enter password to unlock</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1137"/> <location filename="../src/mainwindow.cpp" line="1203"/>
<source>Verify voiceprint or enter password to unlock</source> <source>Verify voiceprint or enter password to unlock</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1142"/> <location filename="../src/mainwindow.cpp" line="1208"/>
<source>Verify finger vein or enter password to unlock</source> <source>Verify finger vein or enter password to unlock</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1147"/> <location filename="../src/mainwindow.cpp" line="1213"/>
<source>Verify iris or enter password to unlock</source> <source>Verify iris or enter password to unlock</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="1152"/> <location filename="../src/mainwindow.cpp" line="1218"/>
<source>Use the bound wechat scanning code or enter the password to unlock</source> <source>Use the bound wechat scanning code or enter the password to unlock</source>
<translation>使</translation> <translation>使</translation>
</message> </message>
@ -354,10 +353,10 @@
<translation type="vanished">使</translation> <translation type="vanished">使</translation>
</message> </message>
<message> <message>
<location filename="../src/mainwindow.cpp" line="581"/> <location filename="../src/mainwindow.cpp" line="623"/>
<location filename="../src/mainwindow.cpp" line="585"/> <location filename="../src/mainwindow.cpp" line="627"/>
<location filename="../src/mainwindow.cpp" line="589"/> <location filename="../src/mainwindow.cpp" line="631"/>
<location filename="../src/mainwindow.cpp" line="593"/> <location filename="../src/mainwindow.cpp" line="635"/>
<source>Account locked,</source> <source>Account locked,</source>
<translation></translation> <translation></translation>
</message> </message>
@ -369,17 +368,17 @@
<context> <context>
<name>PolkitListener</name> <name>PolkitListener</name>
<message> <message>
<location filename="../src/PolkitListener.cpp" line="59"/> <location filename="../src/PolkitListener.cpp" line="88"/>
<source>Another client is already authenticating, please try again later.</source> <source>Another client is already authenticating, please try again later.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/PolkitListener.cpp" line="226"/> <location filename="../src/PolkitListener.cpp" line="257"/>
<source>Authentication failure, please try again.</source> <source>Authentication failure, please try again.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/PolkitListener.cpp" line="233"/> <location filename="../src/PolkitListener.cpp" line="264"/>
<source>Password input error!</source> <source>Password input error!</source>
<translation></translation> <translation></translation>
</message> </message>

7
readme.txt Normal file
View File

@ -0,0 +1,7 @@
bioctl status 获取生物特征总开关状态
bioctl status greeter|screensaver|polkit|sudo|su|login 获取应用开关状态
bioctl enable|disable 打开|关闭 生物特征总开关
bioctl enable|disable greeter|screensaver|polkit|sudo|su|login 打开|关闭 应用生物特征开关