From d51ee844fd5bc68b46de719c1f63015dd3cec7c3 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/4] 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 1b9c4be080e3e85b24e550b00b628c9e84934ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CRobert?= Date: Fri, 30 Jun 2023 08:23:59 +0000 Subject: [PATCH 2/4] Revert "updated workflow" This reverts commit 25eaf93bf16d26e69fd0a362854ef4ea890536a1. --- .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 f2ec543ccbcd8..2c31b2ef5a312 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 99c0fb2d1f56579ee870bbe3de715de97ee5ca25 Mon Sep 17 00:00:00 2001 From: Sharma Date: Mon, 19 Jun 2023 16:23:30 +0530 Subject: [PATCH 3/4] Enabling E2e button changes --- src/gui/accountsettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 21df46b085976..2a4359a56519d 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -247,7 +247,7 @@ void AccountSettings::slotE2eEncryptionMnemonicReady() disableEncryptionForAccount(_accountState->account()); }); - const auto actionDisplayMnemonic = addActionToEncryptionMessage(tr("Display mnemonic"), e2EeUiActionDisplayMnemonicId); + const auto actionDisplayMnemonic = addActionToEncryptionMessage(tr("Displays 12 word key (passhprase)"), e2EeUiActionDisplayMnemonicId); connect(actionDisplayMnemonic, &QAction::triggered, this, [this]() { displayMnemonic(_accountState->account()->e2e()->_mnemonic); }); @@ -1624,11 +1624,11 @@ QAction *AccountSettings::addActionToEncryptionMessage(const QString &actionTitl void AccountSettings::initializeE2eEncryptionSettingsMessage() { _ui->encryptionMessage->setMessageType(KMessageWidget::Information); - _ui->encryptionMessage->setText(tr("This account supports end-to-end encryption")); + _ui->encryptionMessage->setText(tr("This account supports End-to-end encryption")); _ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/black/state-info.svg"))); _ui->encryptionMessage->hide(); - auto *const actionEnableE2e = addActionToEncryptionMessage(tr("Set up encryption"), e2EeUiActionEnableEncryptionId); + auto *const actionEnableE2e = addActionToEncryptionMessage(tr("Enable encryption"), e2EeUiActionEnableEncryptionId); connect(actionEnableE2e, &QAction::triggered, this, &AccountSettings::slotE2eEncryptionGenerateKeys); } From 6408558309caa2a5d3b09cd4a1ecd9e1d864398a Mon Sep 17 00:00:00 2001 From: Sharma Date: Thu, 13 Jul 2023 10:39:56 +0530 Subject: [PATCH 4/4] fixed Ticket-NMC-2408- UI issue on text readable on encryption settings page --- src/gui/accountsettings.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui index 77224160c7dc3..222053b24e9e3 100644 --- a/src/gui/accountsettings.ui +++ b/src/gui/accountsettings.ui @@ -6,7 +6,7 @@ 0 0 - 588 + 614 557