Commit graph

10 commits

Author SHA1 Message Date
l10n daemon script
7ba564fdeb 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-08-16 01:49:16 +00:00
l10n daemon script
b9fbb2da57 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-08-11 01:44:52 +00:00
l10n daemon script
6364578281 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-08-04 01:46:56 +00:00
l10n daemon script
aeddd5ab75 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-08-01 01:44:56 +00:00
l10n daemon script
93ee6189b0 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-31 01:50:10 +00:00
l10n daemon script
4ae02a3b9c 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-30 01:45:47 +00:00
l10n daemon script
f7de0bdd84 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-24 01:45:42 +00:00
l10n daemon script
9655dcdc6d 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-23 01:48:30 +00:00
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