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"

containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop

@@ -31,7 +31,7 @@ Comment[en_GB]=The latte menu that normally shows on right-click
 Comment[es]=Este es el menú de Latte que normalmente se muestra tras un clic derecho
 Comment[eu]=Eskuineko botoiaz klik eginda agertu ohi den latte menua
 Comment[fi]=Latte-valikko, joka tavallisesti näytetään hiiren oikealla painikkeella
-Comment[gl]=O menú de Latte que adoita mostrarse ao premer co botón secundario.
+Comment[gl]=O menú de Latte que adoita mostrarse ao facer clic dereito
 Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro
 Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken
 Comment[nn]=Latte-menyen som som standard vert vist ved høgreklikk