latte-dock/containmentactions
l10n daemon script 6c2b5f4971 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"
..
contextmenu SVN_SILENT made messages (.desktop file) - always resolve ours
CMakeLists.txt add containmentactions