From 0c404e09a159030399389cdf7e9a1e4f2bc67015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CRobert?= Date: Thu, 18 May 2023 13:35:14 +0000 Subject: [PATCH 1/2] updated workflow - generates_locales.yml --- .github/workflows/generates_locales.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/generates_locales.yml b/.github/workflows/generates_locales.yml index 2c31b2ef5a312..f2ec543ccbcd8 100644 --- a/.github/workflows/generates_locales.yml +++ b/.github/workflows/generates_locales.yml @@ -17,9 +17,9 @@ jobs: pre-build-command: pip install -r requirements.txt build-command: make gettext - uses: actions/checkout@v2 - - name: Commit report - run: | - git config --global user.name 'Nextcloud Bot' - git config --global user.email 'bot@nextcloud.com' - git commit -am "Updates catalog templates (POT files fetched automatically by transifex)" - git push \ No newline at end of file + - name: Commit report + run: | + git config --global user.name 'Nextcloud Bot' + git config --global user.email 'bot@nextcloud.com' + git commit -am "Updates catalog templates (POT files fetched automatically by transifex)" + git push \ No newline at end of file From 5da68c933607eb9a506b2b6363362c8f36f21684 Mon Sep 17 00:00:00 2001 From: Sharma Date: Mon, 19 Jun 2023 14:44:45 +0530 Subject: [PATCH 2/2] Changes related to Passphrase Mnemonic UI --- src/gui/accountsettings.cpp | 13 +++++++------ src/gui/mnemonicdialog.ui | 11 +++++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 21df46b085976..dff6a5c6f5817 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -1011,11 +1011,12 @@ void AccountSettings::displayMnemonic(const QString &mnemonic) QDialog widget; Ui_Dialog ui{}; ui.setupUi(&widget); - widget.setWindowTitle(tr("End-to-end encryption mnemonic")); - ui.label->setText( - tr("To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. " - "Please note these down and keep them safe. " - "They will be needed to add other devices to your account (like your mobile phone or laptop).")); + widget.setWindowTitle(tr("End-to-End encryption mnemonic")); + widget.setWindowFlags(widget.windowFlags() & ~Qt::WindowContextHelpButtonHint); + ui.label->setText(tr("For the encryption, a randomly generated word sequence" + "(passphrase) of 12 words is created. We recommend that you write down the passphrase and keep it safe.\n" + "\n" + "The passphrase is your personal password with which you can access encrypted data in your MagentaCLOUD or enable access to these files on other devices such as your smartphones.")); QFont monoFont(QStringLiteral("Monospace")); monoFont.setStyleHint(QFont::TypeWriter); ui.lineEdit->setFont(monoFont); @@ -1026,7 +1027,7 @@ void AccountSettings::displayMnemonic(const QString &mnemonic) ui.lineEdit->focusWidget(); ui.lineEdit->selectAll(); - ui.lineEdit->setAlignment(Qt::AlignCenter); + ui.lineEdit->setAlignment(Qt::AlignTop); const QFont font(QStringLiteral(""), 0); QFontMetrics fm(font); diff --git a/src/gui/mnemonicdialog.ui b/src/gui/mnemonicdialog.ui index 7a18b6ce24e63..77b089e8c959b 100644 --- a/src/gui/mnemonicdialog.ui +++ b/src/gui/mnemonicdialog.ui @@ -10,7 +10,7 @@ 0 0 588 - 131 + 300 @@ -82,7 +82,14 @@ - + + + + 0 + 60 + + +