diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:09:24 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:09:24 +0200 |
| commit | b5f042a6c132c1b97cf03c4615bab966c23f57d2 (patch) | |
| tree | 1cb057a0ffd51264bb3c9807e2133505ce312eb1 /synchronization.cpp | |
| parent | 3.11 (diff) | |
| download | FreeFileSync-b5f042a6c132c1b97cf03c4615bab966c23f57d2.tar.gz FreeFileSync-b5f042a6c132c1b97cf03c4615bab966c23f57d2.tar.bz2 FreeFileSync-b5f042a6c132c1b97cf03c4615bab966c23f57d2.zip | |
3.12
Diffstat (limited to 'synchronization.cpp')
| -rw-r--r-- | synchronization.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/synchronization.cpp b/synchronization.cpp index a64952b3..493bf077 100644 --- a/synchronization.cpp +++ b/synchronization.cpp @@ -1421,15 +1421,13 @@ void SyncProcess::startSynchronizationProcess(const std::vector<FolderPairSyncCf for (SyncStatistics::ConflictTexts::const_iterator i = firstConflicts.begin(); i != firstConflicts.end(); ++i) { wxString conflictDescription = i->second; - conflictDescription.Replace(wxT("\n"), wxT(" ")); //remove line-breaks + //conflictDescription.Replace(wxT("\n"), wxT(" ")); //remove line-breaks - warningMessage += wxString(wxT("\"")) + zToWx(i->first) + wxT("\": ") + conflictDescription + wxT("\n"); + warningMessage += wxString(wxT("\"")) + zToWx(i->first) + wxT("\": ") + conflictDescription + wxT("\n\n"); } if (statisticsTotal.getConflict() > static_cast<int>(firstConflicts.size())) - warningMessage += wxT("[...]\n"); - else - warningMessage += wxT("\n"); + warningMessage += wxT("[...]\n\n"); warningMessage += _("You can ignore conflicts and continue synchronization."); @@ -1475,6 +1473,7 @@ void SyncProcess::startSynchronizationProcess(const std::vector<FolderPairSyncCf wxString left = wxString(_("Left")) + wxT(": "); wxString right = wxString(_("Right")) + wxT(": "); makeSameLength(left, right); + const wxString statusTxt = wxString(_("Processing folder pair:")) + wxT(" \n") + wxT("\t") + left + wxT("\"") + zToWx(j->getBaseDir<LEFT_SIDE>()) + wxT("\"")+ wxT(" \n") + wxT("\t") + right + wxT("\"") + zToWx(j->getBaseDir<RIGHT_SIDE>()) + wxT("\""); |