summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-10-31 22:28:40 +0100
committerGitHub <noreply@github.com>2020-10-31 22:28:40 +0100
commit5fb3d4ede8ec4442d5fdc841f657753f691d2d2a (patch)
tree43deefbcb9f1cd2607c4a0dc039d27e8b4d41444 /src
parentMerge pull request #312 from trilene/webrtc-video (diff)
parentWording: replace "encrypted room" with "encrypted private chat" (diff)
downloadnheko-5fb3d4ede8ec4442d5fdc841f657753f691d2d2a.tar.xz
Merge pull request #310 from MayeulC/fix-typo
Improve wording in multiple strings.
Diffstat (limited to 'src')
-rw-r--r--src/UserSettingsPage.cpp6
-rw-r--r--src/timeline/TimelineViewManager.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp

index a5a40111..df75ee7f 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp
@@ -697,9 +697,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> 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_, @@ -737,7 +737,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> 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}); diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index f9d7d00c..b2aea4bf 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp
@@ -419,8 +419,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