Skip to content

sync: from linuxdeepin/dde-session-shell #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepin-ci-robot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sync: from linuxdeepin/dde-session-shell #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ build*/
*.core
*.autosave
*.user*
obj-x86_64-linux-gnu/*

# qm file is auto generate from .ts file
*.qm
Expand Down
18 changes: 9 additions & 9 deletions plugins/login-gesture/translations/login-gesture_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</message>
<message>
<source>Device is locked, unlocked after %1 minutes</source>
<translation type="unfinished"/>
<translation>El dispositivo está bloqueado, se desbloqueará después de %1 minutos.</translation>
</message>
<message>
<source>Modify gesture password</source>
Expand All @@ -63,35 +63,35 @@
</message>
<message>
<source>Drawing error, Contact the administrator to reset</source>
<translation type="unfinished"/>
<translation>Patrón incorrecto. Contacte con el administrador para restablecerlo.</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"/>
<translation>Cancelar</translation>
</message>
<message>
<source>Ok</source>
<translation type="unfinished"/>
<translation>Aceptar</translation>
</message>
<message>
<source>Drawing error, %1 chances left. Contact the administrator to reset</source>
<translation type="unfinished"/>
<translation>Patrón incorrecto, quedan 1 oportunidad. Contacta con el administrador para reiniciar.</translation>
</message>
<message>
<source>Setup completed Start unlock</source>
<translation type="unfinished"/>
<translation>Configuración completada. Iniciar desbloqueo.</translation>
</message>
<message>
<source>Unlock with gesture password</source>
<translation type="unfinished"/>
<translation>Desbloquea con contraseña gestual</translation>
</message>
<message>
<source>Minimum 4 points, please redraw</source>
<translation type="unfinished"/>
<translation>Mínimo 4 puntos, por favor vuelva a dibujar.</translation>
</message>
<message>
<source>Contact the administrator to reset</source>
<translation type="unfinished"/>
<translation>Póngase en contacto con la administrador para restablecer</translation>
</message>
</context>
</TS>
18 changes: 9 additions & 9 deletions plugins/login-gesture/translations/login-gesture_uk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</message>
<message>
<source>Device is locked, unlocked after %1 minutes</source>
<translation type="unfinished"/>
<translation>Пристрій заблоковано. Його розблокування відбудеться за %1 хвилин</translation>
</message>
<message>
<source>Modify gesture password</source>
Expand All @@ -63,35 +63,35 @@
</message>
<message>
<source>Drawing error, Contact the administrator to reset</source>
<translation type="unfinished"/>
<translation>Помилка малювання. Для скидання зверніться до адміністратора</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"/>
<translation>Скасувати</translation>
</message>
<message>
<source>Ok</source>
<translation type="unfinished"/>
<translation>Гаразд</translation>
</message>
<message>
<source>Drawing error, %1 chances left. Contact the administrator to reset</source>
<translation type="unfinished"/>
<translation>Помилка малювання. Лишилося %1 спроб. Для скидання зверніться до адміністратора</translation>
</message>
<message>
<source>Setup completed Start unlock</source>
<translation type="unfinished"/>
<translation>Налаштування завершено. Можна починати</translation>
</message>
<message>
<source>Unlock with gesture password</source>
<translation type="unfinished"/>
<translation>Розблокувати за допомогою жесту</translation>
</message>
<message>
<source>Minimum 4 points, please redraw</source>
<translation type="unfinished"/>
<translation>Мінімум 4 точки, будь ласка, повторіть малювання</translation>
</message>
<message>
<source>Contact the administrator to reset</source>
<translation type="unfinished"/>
<translation>Для скидання зверніться до адміністратора</translation>
</message>
</context>
</TS>
5 changes: 3 additions & 2 deletions src/session-widgets/auth_face.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -32,7 +32,8 @@ void AuthFace::initUI()
/* 文案提示 */
m_textLabel->setText(tr("Face ID"));
m_textLabel->setWordWrap(true);
mainLayout->addWidget(m_textLabel, 1, Qt::AlignHCenter);
m_textLabel->setAlignment(Qt::AlignmentFlag::AlignCenter);
mainLayout->addWidget(m_textLabel, 1);
/* 认证状态 */
m_authStateLabel = new DLabel(this);
m_authStateLabel->installEventFilter(this);
Expand Down
2 changes: 1 addition & 1 deletion translations/dde-session-shell_pt_BR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<name>AuthWidget</name>
<message>
<source>Account</source>
<translation>Conta</translation>
<translation>Contas</translation>
</message>
<message numerus="yes">
<source>Your password will expire in %n days, please change it timely</source>
Expand Down
10 changes: 5 additions & 5 deletions translations/dde-session-shell_uk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<name>DeepinAuthFramework</name>
<message>
<source>Wrong Password</source>
<translation type="unfinished"/>
<translation>Помилковий пароль</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -383,19 +383,19 @@
<name>UsersWithTheSameName</name>
<message>
<source>Return</source>
<translation type="unfinished"/>
<translation>Повернутися</translation>
</message>
<message>
<source>Please select the account for login</source>
<translation type="unfinished"/>
<translation>Будь ласка, виберіть обліковий запис для входу</translation>
</message>
<message>
<source>Local Account</source>
<translation type="unfinished"/>
<translation>Локальний обліковий запис</translation>
</message>
<message>
<source>Domain Account</source>
<translation type="unfinished"/>
<translation>Доменний обліковий запис</translation>
</message>
</context>
<context>
Expand Down
Loading