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"

This reverts commit 37323371.

Symlink to office-chart-pie

In theory this works with a proper setup, but if something is slightly off
we can end up finding xmllint for the target, which will not be able to run
and thus breaks the build. So make this more robust and don't even try.

BUG: 435150
FIXED-IN 5.81

No need for them to be different

Most lock icons were filled when locked and hollow when unlocked, but a
few were not, in particular:
- emblem-unlocked
- folder-locked
- system-lock-screen

This is corrected, and now all locked icons follow the pattern.

BUG: 244542
FIXED-IN: 5.81

GIT_SILENT

GIT_SILENT

NO_CHANGELOG

NO_CHANGELOG

This should prevent clang-format from squashing the enum on one line.

GIT_SILENT

The previous symlink pointed system-upgrade to go-up, which is an
incredibly generic icon which, in places where one might come across the
icon, seems quite entirely out of place. This patch swaps that for a
link to the update-none icon (so as not to colour the type of upgrade
available). It also removes the 16x16 variant, as there is no equivalent
update-none to link to.

On behalf of Manuel Jesús de la Fuente <manueljlin@pm.me>

This is to avoid conflicts with symbolic icons resulting in Plasma
using colorful icons where symbolic ones should be shown.

On behalf of Manuel Jesús de la Fuente <manueljlin@pm.me>

This is to avoid conflicts with symbolic icons resulting in Plasma
using colorful icons where symbolic ones should be shown.

On behalf of Manuel Jesús de la Fuente <manueljlin@pm.me>