latte-dock/containment
l10n daemon script c4abc2eaf5 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"
..
package SVN_SILENT made messages (.desktop file) - always resolve ours
plugin refactor LayoutManager::save() to remove code repetition
CMakeLists.txt Remove configure_file method calls for KPackage metadata.desktop files
Messages.sh use kde translations infrastructure