GitLab

Fixes #339

Merge branch 'rgb_parade' into 'master'

See merge request kde/kdenlive!57

Fix rgbparade showing line value on mouse hover (#304)

See merge request kde/kdenlive!55

(cherry picked from commit 9ff52aa3)

010045ac Fix rgbparade showing line value on mouse hover
9a7e84d3 Remove iostream used for debug messages

Fixes #336

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"

BUG: 411000

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"

Use the parameter readable and translatable name instead of its formal name for the color edit widget

Fixes #331

Bug: 409577

Fixes #327

org.kde.kdenlive.appdata.xml: add content_rating

See merge request kde/kdenlive!50

(cherry picked from commit dc273882)

7b2af9f0 org.kde.kdenlive.appdata.xml: add content_rating

Fixes #316

Fixes #238

Fixes #303

Fixes #310

Fixes #305

Fixes #302