Merge pull request #246 from k1l1/master

scary wording on big changes #216 (translations missing)
This commit is contained in:
Julius Härtl 2018-05-19 15:44:04 +02:00 committed by GitHub
commit 9196ab1c98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1005,11 +1005,11 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel
"synchronized with your server, making such files unavailable unless restored.\n" "synchronized with your server, making such files unavailable unless restored.\n"
"Are you sure you want to sync those actions with the server?\n" "Are you sure you want to sync those actions with the server?\n"
"If this was an accident and you decide to keep your files, they will be re-synced from the server."); "If this was an accident and you decide to keep your files, they will be re-synced from the server.");
QMessageBox msgBox(QMessageBox::Warning, tr("Remove All Files?"), QMessageBox msgBox(QMessageBox::Warning, tr("Download new files?"),
msg.arg(shortGuiLocalPath())); msg.arg(shortGuiLocalPath()));
msgBox.setWindowFlags(msgBox.windowFlags() | Qt::WindowStaysOnTopHint); msgBox.setWindowFlags(msgBox.windowFlags() | Qt::WindowStaysOnTopHint);
msgBox.addButton(tr("Remove all files"), QMessageBox::DestructiveRole); msgBox.addButton(tr("Download new files"), QMessageBox::DestructiveRole);
QPushButton *keepBtn = msgBox.addButton(tr("Keep files"), QMessageBox::AcceptRole); QPushButton *keepBtn = msgBox.addButton(tr("Keep local files"), QMessageBox::AcceptRole);
if (msgBox.exec() == -1) { if (msgBox.exec() == -1) {
*cancel = true; *cancel = true;
return; return;