Commit graph

3 commits

Author SHA1 Message Date
l10n daemon script
7efcc8bbda 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-07-25 01:37:00 +00:00
l10n daemon script
9bb076584b 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-07-24 08:31:14 +00:00
Alexander Lohnau
f1c2202591 Port plasmoid metadata to JSON format
This is needed for Plasma6 and avoids deprecation warnings/performance penalties in Plasma5
2023-07-22 20:51:19 +00:00