From a9a0635c02a9b0d454b7ceaa2552cb982fc6e356 Mon Sep 17 00:00:00 2001 From: Mayeul Cantan Date: Wed, 28 Oct 2020 00:53:38 +0100 Subject: [PATCH 1/4] Wording: Verification request isn't a request anymore once accepted Replace it with "verification process". --- resources/qml/device-verification/Waiting.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml index 0c4ae405..c64c90de 100644 --- a/resources/qml/device-verification/Waiting.qml +++ b/resources/qml/device-verification/Waiting.qml @@ -21,9 +21,9 @@ Pane { case "WaitingForOtherToAccept": return qsTr("Waiting for other side to accept the verification request."); case "WaitingForKeys": - return qsTr("Waiting for other side to continue the verification request."); + return qsTr("Waiting for other side to continue the verification process."); case "WaitingForMac": - return qsTr("Waiting for other side to complete the verification request."); + return qsTr("Waiting for other side to complete the verification process."); } } color: colors.text From 7564de4f70f5f74403693bba4f440e494245449d Mon Sep 17 00:00:00 2001 From: Mayeul Cantan Date: Wed, 28 Oct 2020 00:55:18 +0100 Subject: [PATCH 2/4] Wording: change "trusted users" for "verified users" This is less ambiguous, as it aligns with the other uses. Trusted might refer to something else, like the reputation project. You can trust a user you haven't verified. Also mention devices as this shares keys with verified devices, for when device verification was performed without cross-signing. --- src/UserSettingsPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index d4d5dcb9..8cb2ab7b 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -687,7 +687,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge boxWrap(tr("Device ID"), deviceIdValue_); boxWrap(tr("Device Fingerprint"), deviceFingerprintValue_); boxWrap( - tr("Share keys with trusted users"), + tr("Share keys with verified users and devices"), shareKeysWithTrustedUsers_, tr("Automatically replies to key requests from other users, if they are verified.")); formLayout_->addRow(new HorizontalLine{this}); From bb1f2da4dcc39843b48fc35ac9956a6f91c65f28 Mon Sep 17 00:00:00 2001 From: Mayeul Cantan Date: Wed, 28 Oct 2020 00:58:20 +0100 Subject: [PATCH 3/4] Wording: change "Mobile mode" for "Touchscreen mode" This is less ambiguous. Moreover, this mode might be useful on a computer touchscreen. --- src/UserSettingsPage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 8cb2ab7b..d00077f4 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -655,9 +655,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge formLayout_->addRow(uiLabel_); formLayout_->addRow(new HorizontalLine{this}); - boxWrap(tr("Mobile mode"), + boxWrap(tr("Touchscreen mode"), mobileMode_, - tr("Will prevent text selection in the timeline to make scrolling easier.")); + tr("Will prevent text selection in the timeline to make touch scrolling easier.")); #if !defined(Q_OS_MAC) boxWrap(tr("Scale factor"), scaleFactorCombo_, From eea7aecc04e225d2ec69926e7c992f7c095d3ae5 Mon Sep 17 00:00:00 2001 From: Mayeul Cantan Date: Wed, 28 Oct 2020 01:04:10 +0100 Subject: [PATCH 4/4] Wording: replace "encrypted room" with "encrypted private chat" This is for consistency with "Start a private chat", and is more specific. --- src/timeline/TimelineViewManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 1e8ed243..fd1aa2e6 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -407,8 +407,8 @@ TimelineViewManager::verifyUser(QString userid) } emit ChatPage::instance()->showNotification( - tr("No share room with this user found. Create an " - "encrypted room with this user and try again.")); + tr("No encrypted private chat found with this user. Create an " + "encrypted private chat with this user and try again.")); } void