latte-dock/indicators
l10n daemon script d9217065fe 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"
..
default SVN_SILENT made messages (.desktop file) - always resolve ours
org.kde.latte.plasma SVN_SILENT made messages (.desktop file) - always resolve ours
CMakeLists.txt move Unity indicator out of codepage
Messages.sh simplify indicators names