Commit graph

7 commits

Author SHA1 Message Date
l10n daemon script
68b94f31b3 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-21 02:44:34 +00:00
l10n daemon script
753aaa00fc 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-20 02:35:16 +00:00
l10n daemon script
6fe1c74947 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-17 02:54:12 +00:00
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
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
Devin Lin
1e2847ef96 kcms: Import mobile network kcms
plasma-nm currently has the mobile network KCMs, but requires having a build flag in order to have them installed. This then requires distros to have multiple versions of the plasma-nm package. I think it makes sense to move them here so that packaging and development is easier.
2023-03-14 14:31:27 +00:00