Commit graph

7 commits

Author SHA1 Message Date
l10n daemon script
872d63c5c2 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"
2023-03-16 02:34:43 +00:00
Yari Polla
d1e91b1573 kcms/time: fix wrong reference 2023-03-15 14:23:19 +01:00
Devin Lin
56d530f855 kcms: Fix package format
Fix kcm package format so that they show up in the settings.
2023-03-14 20:56:30 -07:00
l10n daemon script
73159a1862 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"
2023-03-15 02:29:39 +00:00
l10n daemon script
4101e4ad17 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"
2023-03-14 02:32:23 +00:00
Devin Lin
40f4846ccf kcms: Ensure reuse headers exist
Also relicense some of my older code to be GPL2
2023-03-13 19:09:23 -07:00
Devin Lin
e147f98aea kcms: Move KCMs from plasma-settings
Having the KCMs that are mobile specific here makes more sense than in the settings application. Historically plasma-settings had a faster release cycle than Plasma, but the application is now moving to the Plasma release schedule and so it makes sense do this now.
2023-03-13 18:45:47 -07:00