Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
32ca26c5fa SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2022-07-22 01:43:12 +00:00
Alexander Lohnau
8587c10f5f Port KCM to new namespace, new metadata approach and new namespace
- Convert the metadata.desktop file to a json file (https://phabricator.kde.org/T14983)
- Use kcmutils_generate_desktop_file to install the kcm as a NoDisplay-application (https://phabricator.kde.org/T15609)
- Use the new install namespaces that were created for https://phabricator.kde.org/T14517
2022-07-21 19:30:11 +00:00