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"

(cherry picked from commit 610781a7)

(cherry picked from commit 4c503a67)

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 84d3b8de)

misinterpreting file names in cmdline parameters as http:// URLs

(cherry picked from commit e86f8997)

(cherry picked from commit 3c703ee9)

(cherry picked from commit bd8a891e)

(cherry picked from commit e81c4feb)

(cherry picked from commit f750470c)

(cherry picked from commit e70d82a3)

They were broken by commit b8667b04, which changed the project name from kwave to Kwave

BUG:431281

(cherry picked from commit 0173f492)

(cherry picked from commit fc76a32a)

It will be deprecated soon

adapted make targets (scripts) for "update-translations" and "msgstats" to new directory structure of translations

They are the same on Linux (but DataLocation is deprecated). On Windows this enables the use of the roaming path.

NO_CHANGELOG

Rohan Asokan authored Oct 30, 2020 and Nicolas Fella committed Oct 30, 2020

This would help give the app stream metadata. As these applications like Discover use this version as metadata for a listing of the application.

This is a fix proposed for the following bug pointed to on Bugzilla: https://bugs.kde.org/show_bug.cgi?id=425034

A similar change was also proposed to Kdenline for similar reasons, which can be seen here: https://github.com/KDE/kdenlive/commit/50085b9fca6690e22145a0afbf3882746877bf68