Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.15] improvement of error message #7671

Merged
merged 2 commits into from
Dec 16, 2024
Merged

[stable-3.15] improvement of error message #7671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ba53e
improvement of error message
Rello Dec 16, 2024
e5f0f69
Update src/gui/folderman.cpp
Rello Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/gui/folderman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in src/gui/folderman.cpp

View workflow job for this annotation

GitHub Actions / build

Run clang-format on src/gui/folderman.cpp 

File src/gui/folderman.cpp does not conform to Custom style guidelines. (lines 2050)
* Copyright (C) by Klaas Freitag <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -2044,9 +2044,10 @@
Result<void, QString> FolderMan::unsupportedConfiguration(const QString &path) const
{
if (numberOfSyncJournals(path) > 1) {
return tr("Multiple accounts are sharing the folder %1.\n"
"This configuration is known to lead to data loss and is no longer supported.\n"
"Please consider removing this folder from the account and adding it again.")
return tr("The folder %1 is linked to multiple accounts.\n"
"This setup can cause data loss and it is no longer supported.\n"
"To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.\n\n"
"For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them.")
.arg(path);
}
return {};
Expand Down
Loading