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"

runners/shell/plasma-runner-shell.desktop

@@ -22,7 +22,7 @@ Name[fi]=Komentorivi
 Name[fr]=Ligne de commandes
 Name[fy]=Kommandorigel
 Name[ga]=Líne na nOrduithe
-Name[gl]=Execución de ordes
+Name[gl]=Liña de ordes
 Name[gu]=આદેશ જગ્યા
 Name[he]=שורת הפקודה
 Name[hi]=कमांड लाइन