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"

Kukuh Syafaat authored Jul 14, 2021 and Nicolas Fella committed Jul 14, 2021

(cherry picked from commit 59ca52a6)

(cherry picked from commit e5cfcbdb)

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"

(cherry picked from commit b13266a4)

* Update date and version numbers
* Suitable tags and some punctuation

* Capitalize a menu item

(cherry picked from commit 31812ac0)

(cherry picked from commit 8ab78fac)

KDECompilerSettings already set CMAKE_CXX_STANDARD to C++11. It is
only necessary to set it explicitely if a higher C++ standard is
required.