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"

dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop

@@ -2,6 +2,7 @@
 Name=BBC Weather
 Name[ca]=BBC Weather
 Name[ca@valencia]=BBC Weather
+Name[en_GB]=BBC Weather
 Name[es]=BBC Weather
 Name[fr]=Météo de la BBC
 Name[gl]=BBC Weather
@@ -21,6 +22,7 @@ Name[zh_TW]=BBC 天氣
 Comment=XML Data from the British Broadcasting Corporation
 Comment[ca]=Dades XML de la British Broadcasting Corporation
 Comment[ca@valencia]=Dades XML de la British Broadcasting Corporation
+Comment[en_GB]=XML Data from the British Broadcasting Corporation
 Comment[es]=Datos XML de la British Broadcasting Corporation
 Comment[fr]=Données XML de la British Broadcasting Corporation
 Comment[gl]=Datos XML da British Broadcasting Corporation

kcms/translations/kcm_translations.desktop

@@ -16,6 +16,7 @@ Name[ca]=Idioma
 Name[ca@valencia]=Idioma
 Name[cs]=Jazyk
 Name[de]=Sprache
+Name[en_GB]=Language
 Name[es]=Idioma
 Name[fi]=Kieli
 Name[fr]=Langue

kcms/translations/package/metadata.desktop

@@ -4,6 +4,7 @@ Name[ca]=Idioma
 Name[ca@valencia]=Idioma
 Name[cs]=Jazyk
 Name[de]=Sprache
+Name[en_GB]=Language
 Name[es]=Idioma
 Name[fi]=Kieli
 Name[fr]=Langue

lookandfeel/metadata.desktop

@@ -2,6 +2,7 @@
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[ca@valencia]=Brisa pel VDG del KDE
+Comment[en_GB]=Breeze by the KDE VDG
 Comment[es]=Brisa por KDE VDG
 Comment[fr]=Breeze, par KDE VDG
 Comment[gl]=Breeze de KDE VDG

sddm-theme/metadata.desktop

@@ -46,6 +46,7 @@ Name[zh_TW]=微風
 Description=Breeze
 Description[ca]=Brisa
 Description[ca@valencia]=Brisa
+Description[en_GB]=Breeze
 Description[es]=Brisa
 Description[fr]=Breeze
 Description[gl]=Breeze