Skip to content

Commit

Permalink
Address Nimisha's comments
Browse files Browse the repository at this point in the history
Signed-off-by: Claudio Cambra <[email protected]>
  • Loading branch information
claucambra committed Jun 24, 2022
1 parent 8466999 commit 165b658
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/gui/folderman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
2 changes: 1 addition & 1 deletion src/gui/userstatusselectormodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/libsync/syncresult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 165b658

Please sign in to comment.