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"

effects/fullscreen/package/metadata.desktop

@@ -22,6 +22,7 @@ Comment[uk]=Анімація для вікон під час входу до п
 Comment[x-test]=xxAnimation for a window going to and leaving full screen modexx
 Icon=preferences-system-windows-effect-fullscreen
 Name=Full Screen
+Name[ast]=Pantalla completa
 Name[ca]=Pantalla completa
 Name[cs]=Celá obrazovka
 Name[de]=Vollbild

runners/kwin-runner-windows.desktop

@@ -2,6 +2,7 @@
 # ctxt: plasma runner
 Name=Windows
 Name[ca]=Finestres
+Name[en_GB]=Windows
 Name[es]=Ventanas
 Name[fr]=Fenêtres
 Name[it]=Finestre
@@ -16,6 +17,7 @@ Name[uk]=Вікна
 Name[x-test]=xxWindowsxx
 Comment=List windows and desktops and switch them
 Comment[ca]=Llista finestres i escriptoris, i canvia entre ells
+Comment[en_GB]=List windows and desktops and switch them
 Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
 Comment[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l'autre.
 Comment[it]=Elenca e scambia le finestre ed i desktop