Address Nimisha's comments

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>

Author: claucambra

src/gui/creds/oauth.cpp

@@ -138,9 +138,9 @@ void OAuth::start()
                     if (!_expectedUser.isNull() && user != _expectedUser) {
                         // Connected with the wrong user
                         QString message = tr("<h1>Wrong account</h1>"
-                                             "<p>You logged-in with account <em>%1</em>, but must login with account <em>%2</em>.<br>"
+                                             "<p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>"
                                              "Please log out of %3 in another tab, then <a href='%4'>click here</a> "
-                                             "and log in with account %2</p>")
+                                             "and log in with %2</p>")
                                               .arg(user, _expectedUser, Theme::instance()->appNameGUI(),
                                                   authorisationLink().toString(QUrl::FullyEncoded));
                         httpReplyAndClose(socket, "200 OK", message.toUtf8().constData());

src/gui/folderman.cpp

@@ -1522,7 +1522,7 @@ QString FolderMan::trayTooltipStatusString(
         folderMessage = tr("Setup error.");
         break;
     case SyncResult::SyncAbortRequested:
-        folderMessage = tr("Sync request was aborted.");
+        folderMessage = tr("Sync request was cancelled.");
         break;
     case SyncResult::Paused:
         folderMessage = tr("Sync is paused.");

src/gui/userstatusselectormodel.cpp

@@ -149,7 +149,7 @@ void UserStatusSelectorModel::onError(UserStatusConnector::Error error)
         return;
 
     case UserStatusConnector::Error::EmojisNotSupported:
-        setError(tr("Emojis feature is not supported. Some status functionality may not work."));
+        setError(tr("Emojis are not supported. Some status functionality may not work."));
         return;
 
     case UserStatusConnector::Error::CouldNotSetUserStatus:

src/libsync/syncresult.cpp

@@ -54,13 +54,13 @@ QString SyncResult::statusString() const
         re = QLatin1String("Setup error");
         break;
     case SyncPrepare:
-        re = QLatin1String("Sync prepare");
+        re = QLatin1String("Preparing to sync");
         break;
     case Problem:
         re = QLatin1String("Success, some files were ignored.");
         break;
     case SyncAbortRequested:
-        re = QLatin1String("Sync request aborted");
+        re = QLatin1String("Sync request cancelled");
         break;
     case Paused:
         re = QLatin1String("Sync paused");