GitLab

(cherry picked from commit 2ac23e81)

(cherry picked from commit f645e3b1)

(cherry picked from commit c6359ee9)

(cherry picked from commit 7a4292a5)

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 d8e3ef97)

(cherry picked from commit dc08987c)

It looks and works much better than the default style

The current URLs don't work, replace them with working ones

Nicolas Fella authored Jan 02, 2022 and Albert Astals Cid committed Jan 02, 2022

People don't necessarily know what "Parley in kde-edu" means. Add a link to the apps page that explains what Parley is and how to get it

This is supposed to be a human-readable name, so use one instead of the technical name

(cherry picked from commit 895a12d3)

(cherry picked from commit 308a1290)

(cherry picked from commit defe499c)

(cherry picked from commit 33251b6b)