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"

indicators/org.kde.latte.plasma/metadata.desktop

@@ -37,7 +37,7 @@ Comment[gl]=Indicador de estilo Plasma de Latte
 Comment[id]=Indikator latte gaya Plasma
 Comment[it]=Indicatore stile di Plasma di Latte
 Comment[ko]=Latte 플라즈마 스타일 표시도구
-Comment[nl]=Plasma stijlindicator van Latte
+Comment[nl]=Plasma stijlindicator voor Latte
 Comment[nn]=Latte-markør i Plasma-stil
 Comment[pl]=Wskaźnik Latte dla Plazmy
 Comment[pt]=Indicador de estilo do Plasma no Latte