From 2fb1aab655dd023a56de7b17535d461014dc10b8 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:48:45 +0200 Subject: [PATCH 1/3] i18n: Fix for "end-to-end" Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- src/gui/accountmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index bb678ab607f7d..6a997fc3f43e0 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -403,7 +403,7 @@ void AccountManager::displayMnemonic(const QString& mnemonic) auto *widget = new QDialog; Ui_Dialog ui; ui.setupUi(widget); - widget->setWindowTitle(tr("End to end encryption mnemonic")); + 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).")); From 5ad0dc004a1f7e43282c921f57cb0aeb73dbc2c1 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:50:20 +0200 Subject: [PATCH 2/3] i18n: Fix for "end-to-end" Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- src/libsync/clientsideencryption.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp index 19659caa2f4b8..7a923e490e464 100644 --- a/src/libsync/clientsideencryption.cpp +++ b/src/libsync/clientsideencryption.cpp @@ -1238,7 +1238,7 @@ bool ClientSideEncryption::newMnemonicGenerated() const } void ClientSideEncryption::decryptPrivateKey(const AccountPtr &account, const QByteArray &key) { - QString msg = tr("Please enter your end to end encryption passphrase:
" + QString msg = tr("Please enter your end-to-end encryption passphrase:
" "
" "Username: %2
" "Account: %3
") From b214b87491da47de6cd64e9f5edd7995aca34759 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 27 Jun 2022 11:03:30 +0200 Subject: [PATCH 3/3] i18n: Add dot Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- src/gui/creds/oauth.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/creds/oauth.cpp b/src/gui/creds/oauth.cpp index 361e91507cbe1..39534fa48bc18 100644 --- a/src/gui/creds/oauth.cpp +++ b/src/gui/creds/oauth.cpp @@ -140,7 +140,7 @@ void OAuth::start() QString message = tr("

Wrong account

" "

You logged in with the account %1, but must log in with the account %2.
" "Please log out of %3 in another tab, then click here " - "and log in with %2

") + "and log in with %2.

") .arg(user, _expectedUser, Theme::instance()->appNameGUI(), authorisationLink().toString(QUrl::FullyEncoded)); httpReplyAndClose(socket, "200 OK", message.toUtf8().constData());