Merge pull request #310 from MayeulC/fix-typo

Improve wording in multiple strings.

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

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});

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