rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #310 from MayeulC/fix-typo 

Improve wording in multiple strings.
This commit is contained in:
DeepBlueV7.X 2020-10-31 22:28:40 +01:00 committed by GitHub
parent aafc214997 eea7aecc04
commit 5fb3d4ede8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/device-verification/Waiting.qml
View File

@ -21,9 +21,9 @@ Pane {
case "WaitingForOtherToAccept": case "WaitingForOtherToAccept":
return qsTr("Waiting for other side to accept the verification request."); return qsTr("Waiting for other side to accept the verification request.");
case "WaitingForKeys": 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": 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 color: colors.text

6
src/UserSettingsPage.cpp
View File

@ -697,9 +697,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
formLayout_->addRow(uiLabel_); formLayout_->addRow(uiLabel_);
formLayout_->addRow(new HorizontalLine{this}); formLayout_->addRow(new HorizontalLine{this});
boxWrap(tr("Mobile mode"), boxWrap(tr("Touchscreen mode"),
mobileMode_, 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) #if !defined(Q_OS_MAC)
boxWrap(tr("Scale factor"), boxWrap(tr("Scale factor"),
scaleFactorCombo_, scaleFactorCombo_,
@ -737,7 +737,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
boxWrap(tr("Device ID"), deviceIdValue_); boxWrap(tr("Device ID"), deviceIdValue_);
boxWrap(tr("Device Fingerprint"), deviceFingerprintValue_); boxWrap(tr("Device Fingerprint"), deviceFingerprintValue_);
boxWrap( boxWrap(
tr("Share keys with trusted users"), tr("Share keys with verified users and devices"),
shareKeysWithTrustedUsers_, shareKeysWithTrustedUsers_,
tr("Automatically replies to key requests from other users, if they are verified.")); tr("Automatically replies to key requests from other users, if they are verified."));
formLayout_->addRow(new HorizontalLine{this}); formLayout_->addRow(new HorizontalLine{this});

4
src/timeline/TimelineViewManager.cpp
View File

@ -419,8 +419,8 @@ TimelineViewManager::verifyUser(QString userid)
} }
emit ChatPage::instance()->showNotification( emit ChatPage::instance()->showNotification(
tr("No share room with this user found. Create an " tr("No encrypted private chat found with this user. Create an "
"encrypted room with this user and try again.")); "encrypted private chat with this user and try again."));
} }
void void