diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-10-27 22:49:46 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-10-27 22:49:46 +0300 |
| commit | 5723abe6ebf987c732ac2c625dfe1071215fe96f (patch) | |
| tree | 43dbc3725e8625335ce6d2f1ef2ed37a98096a06 /src/mirall | |
| parent | 95a9b0427c41c5edbecfff63f5b03feab51aa5d5 (diff) | |
| parent | 0692fea9d8304d1c54c2f35bda2133276d38b866 (diff) | |
Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7
Diffstat (limited to 'src/mirall')
| -rw-r--r-- | src/mirall/syncengine.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index db632d217..e93e6eb1f 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -179,7 +179,9 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err) case CSYNC_STATUS_ABORTED: errStr = tr("Aborted by the user"); break; - + case CSYNC_STATUS_SERVICE_UNAVAILABLE: + errStr = tr("The mounted directory is temporary not available on the server"); + break; default: errStr = tr("An internal error number %1 happened.").arg( (int) err ); } @@ -370,7 +372,9 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote ) case CYSNC_STATUS_FILE_LOCKED_OR_OPEN: item._errorString = QLatin1String("File locked"); // don't translate, internal use! break; - + case CSYNC_STATUS_SERVICE_UNAVAILABLE: + item._errorString = QLatin1String("Directory temporarily not available on server."); + break; default: Q_ASSERT("Non handled error-status"); /* No error string */ |