Address Nimisha's comments

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

Author: claucambra

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