Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 08:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add \n in merge request message. (#1310)

Browse Source
This commit is contained in:
louib 2017-12-20 18:08:18 -05:00 committed by GitHub
parent 0c5ccba9be
commit 8037a79673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/DatabaseWidget.cpp
View File

@ -1247,7 +1247,7 @@ void DatabaseWidget::reloadDatabaseFile()
if (m_databaseModified) { if (m_databaseModified) {
// Ask if we want to merge changes into new database // Ask if we want to merge changes into new database
QMessageBox::StandardButton mb = MessageBox::question(this, tr("Merge Request"), QMessageBox::StandardButton mb = MessageBox::question(this, tr("Merge Request"),
tr("The database file has changed and you have unsaved changes." tr("The database file has changed and you have unsaved changes.\n"
"Do you want to merge your changes?"), "Do you want to merge your changes?"),
QMessageBox::Yes | QMessageBox::No); QMessageBox::Yes | QMessageBox::No);