diff --git a/src/gui/activityitemdelegate.cpp b/src/gui/activityitemdelegate.cpp index 2c50da31c..2d86ba961 100644 --- a/src/gui/activityitemdelegate.cpp +++ b/src/gui/activityitemdelegate.cpp @@ -130,12 +130,13 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & accountRole.remove(0, atPos+1); } - QString timeStr = tr("%1 on %2").arg(timeText).arg(accountRole); - if( !accountOnline ) { + QString timeStr; + if ( accountOnline ) { + timeStr = tr("%1 on %2").arg(timeText).arg(accountRole); + } else { + timeStr = tr("%1 on %2 (disconnected)").arg(timeText).arg(accountRole); QPalette p = option.palette; painter->setPen(p.color(QPalette::Disabled, QPalette::Text)); - timeStr.append(" "); - timeStr.append(tr("(disconnected)")); } const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, timeBox.width()); diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index 022cba440..20994e181 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -442,24 +442,24 @@ void ActivitySettings::slotCopyToClipboard() QTextStream ts(&text); int idx = _tab->currentIndex(); - QString theSubject; + QString message; if( idx == 0 ) { // the activity widget _activityWidget->storeActivityList(ts); - theSubject = tr("server activity list"); + message = tr("The server activity list has been copied to the clipboard."); } else if(idx == 1 ) { // the protocol widget _protocolWidget->storeSyncActivity(ts); - theSubject = tr("sync activity list"); + message = tr("The sync activity list has been copied to the clipboard."); } else if(idx == 2 ) { // issues Widget - theSubject = tr("not syned items list"); + message = tr("The list of unsynched items has been copied to the clipboard."); _protocolWidget->storeSyncIssues(ts); } QApplication::clipboard()->setText(text); - emit guiLog(tr("Copied to clipboard"), tr("The %1 has been copied to the clipboard.").arg(theSubject)); + emit guiLog(tr("Copied to clipboard"), message); } void ActivitySettings::slotRemoveAccount( AccountState *ptr ) diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index c71ad4a85..38aff9fc9 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -650,7 +650,8 @@ void SyncEngine::startSync() qDebug() << "There are" << freeBytes << "bytes available at" << _localPath << "and at least" << minFree << "are required"; if (freeBytes < minFree) { - emit csyncError(tr("Only %1 are available, need at least %2 to start").arg( + emit csyncError(tr("Only %1 are available, need at least %2 to start", + "Placeholders are postfixed with file sizes using Utility::octetsToString()").arg( Utility::octetsToString(freeBytes), Utility::octetsToString(minFree))); finalize(false);