diff options
| author | Hefee <hefee@netzguerilla.net> | 2016-02-20 12:34:34 +0300 |
|---|---|---|
| committer | Hefee <hefee@netzguerilla.net> | 2016-02-20 12:34:34 +0300 |
| commit | 28b694b17028665564b6d4640d0322fe225b0db0 (patch) | |
| tree | e8776db7c83af5ab0c802baf9a4c8c3f5bad0b91 /src/gui/selectivesyncdialog.cpp | |
| parent | 64ca8a668ae7322dd38fb2eb8ab856085ebf41d1 (diff) | |
| parent | 74f74e03632f6a30035752d7790cbfeef073449e (diff) | |
Merge branch '2.1'
Diffstat (limited to 'src/gui/selectivesyncdialog.cpp')
| -rw-r--r-- | src/gui/selectivesyncdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index ef3fb6c55..9a6682ff5 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -249,7 +249,7 @@ void SelectiveSyncTreeView::slotLscolFinishedWithError(QNetworkReply *r) if (r->error() == QNetworkReply::ContentNotFoundError) { _loading->setText(tr("No subfolders currently on the server.")); } else { - _loading->setText(tr("An error occured while loading the list of sub folders.")); + _loading->setText(tr("An error occurred while loading the list of sub folders.")); } _loading->resize(_loading->sizeHint()); // because it's not in a layout } |