Commit graph

20 commits

Author SHA1 Message Date
l10n daemon script
42bf272681 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-04-19 02:38:31 +00:00
l10n daemon script
b1000c31d8 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-04-17 03:43:30 +00:00
l10n daemon script
f00a1baae9 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-04-13 02:33:38 +00:00
l10n daemon script
38e235b1b0 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-04-11 03:11:36 +00:00
l10n daemon script
bea89f08c1 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-04-04 02:38:04 +00:00
l10n daemon script
4b911fa0bc 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-04-03 02:25:31 +00:00
l10n daemon script
26c7836549 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-29 02:28:37 +00:00
l10n daemon script
b9aad6286f 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-24 02:23:55 +00:00
l10n daemon script
c2b3e3cfc8 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-23 02:52:45 +00:00
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
Yari Polla
be7c36d0c2 kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +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
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