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"

app/latte-layouts.knsrc

@@ -8,7 +8,7 @@ Name[de]=Latte-Profile
 Name[el]=Προφίλ Latte
 Name[en_GB]=Latte Layouts
 Name[es]=Distribuciones de Latte
-Name[eu]=Latte diseinuak
+Name[eu]=Latte antolamenduak
 Name[fi]=Latte-asettelut
 Name[gl]=Disposicións de Latte
 Name[id]=Tataletak Latte

app/lattedock.notifyrc

@@ -235,7 +235,7 @@ Name[de]=Wechsel zu Profil
 Name[el]=Εναλλαγή στο προφίλ
 Name[en_GB]=Switch to layout
 Name[es]=Cambiar a distribución
-Name[eu]=Aldatu diseinura
+Name[eu]=Aldatu antolamendura
 Name[fi]=Vaihda asetteluun
 Name[gl]=Cambiar á disposición
 Name[id]=Beralih ke tataletak