GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Yuri Chornoivan authored Mar 28, 2020 and Laurent Montel committed Mar 28, 2020

Summary: Qt file dialog already asks if user want the file to be overwritten.

Test Plan:
1. Open a message with some link.
2. Right-click on the link and choose "Save link as..."
3. Save the file.
4. Repeat step 2, click "OK".
5. Confirm the file to be overwritten from Qt dialog.
6. Without this patch, a new KMail dialog should appear with another proposal to overwrite the file.

Reviewers: #kde_pim, mlaurent

Reviewed By: #kde_pim, mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28377

(cherry picked from commit 28ab73bc)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT: Prepare 5.14.0 beta1. Update ecm as 5.67.0 is broken see 417396. 5.68 will be release in 2 days. But dependancy freeze is tomorrow.

(Asked by Allen)

Summary:
* Capitalize "PDF"
* Add the action to the KMReaderMainWin too
* Set default filename to <subject>.pdf

Reviewers: mlaurent

Reviewed By: mlaurent

Subscribers: yurchor, kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D27793