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

@@ -99,7 +99,7 @@ Comment[fi]=Suorittaa komentorivikomentoja
 Comment[fr]=Exécute des commandes shell
 Comment[fy]=Flueskommando's útfiere
 Comment[ga]=Rith orduithe blaoisce
-Comment[gl]=Executa ordes da shell
+Comment[gl]=Executa ordes do intérprete de ordes
 Comment[gu]=શૅલ આદેશ ચલાવો
 Comment[he]=הרץ פקודת Shell
 Comment[hi]=शेल कमांड्स चलाता है

shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop

@@ -13,7 +13,7 @@ Name[et]=Plasma shell
 Name[eu]=Plasma-ingurunea
 Name[fi]=Plasma-kuori
 Name[fr]=Environnement Plasma
-Name[gl]=Shell de Plasma
+Name[gl]=Intérprete de ordes de Plasma
 Name[hu]=Plasma felület
 Name[id]=Shell Plasma
 Name[is]=Plasma skel