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.

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

Add \n in merge request message. #1310

Merged
merged 1 commit into from
Dec 20, 2017

Conversation

louib
Copy link
Member

@louib louib commented Dec 20, 2017

Discovered this while testing #1231

How has this been tested?

Locally

Screenshots (if appropriate):

before:
screenshot from 2017-12-20 14-07-26

after:
screenshot from 2017-12-20 14-06-16

Types of changes

  • ✅ Bug fix (non-breaking change which fixes an issue)

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]

@louib louib requested a review from droidmonkey December 20, 2017 19:10
@louib louib merged commit 8037a79 into keepassxreboot:develop Dec 20, 2017
@louib louib deleted the merge_request_message branch December 20, 2017 23:08
@@ -1247,7 +1247,7 @@ void DatabaseWidget::reloadDatabaseFile()
if (m_databaseModified) {
// Ask if we want to merge changes into new database
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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use append(). Newlines don't need to be translated and including it in the translation source string breaks existing translations.

@phoerious
Copy link
Member

phoerious commented Dec 22, 2017

Wait, what... Didn't see this was merged already. Can we please get a follow-up for for this?

EDIT: actually, forget what I said. It's in the middle of the string. No way to add it without breaking translations.

@louib louib mentioned this pull request Dec 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants