l10n daemon script ac251b9878 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"		2026-10-05 01:51:33 +00:00
..
qml	drop qmllint disable unqualified	2026-09-04 08:21:45 +00:00
CMakeLists.txt	applets/showActivityManager: Port to plasma_add_applet	2025-12-07 17:21:41 +00:00
main.xml	applets/showActivityManager: Port to plasma_add_applet	2025-12-07 17:21:41 +00:00
Messages.sh	Fix message extraction a bit	2020-07-03 09:42:10 +03:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-10-05 01:51:33 +00:00