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

@@ -4,6 +4,7 @@ Name[ca]=BBC Weather
 Name[gl]=BBC Weather
 Name[nl]=BBC Weather
 Name[pt]=Meteorologia da BBC
+Name[pt_BR]=BBC Weather
 Name[sv]=BBC Weather
 Name[uk]=Погода BBC
 Name[x-test]=xxBBC Weatherxx
@@ -12,6 +13,7 @@ Comment[ca]=Dades XML de la British Broadcasting Corporation
 Comment[gl]=Datos XML da British Broadcasting Corporation
 Comment[nl]=XML-gegevens van de British Broadcasting Corporation
 Comment[pt]=Dados em XML da BBC (British Broadcasting Corporation)
+Comment[pt_BR]=Dados em XML da BBC (British Broadcasting Corporation)
 Comment[sv]=XML-data från British Broadcasting Corporation
 Comment[uk]=Дані XML від BBC
 Comment[x-test]=xxXML Data from the British Broadcasting Corporationxx