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"

app/lattedock.notifyrc

@@ -42,7 +42,6 @@ Comment[nl]=Latte Dock
 Comment[nn]=Latte-dokk
 Comment[pl]=Dok Latte
 Comment[pt]=Área Acoplável do Latte
-Comment[pt_BR]=Latte Dock
 Comment[ru]=Latte Dock
 Comment[sv]=Latte dockningsfönster
 Comment[uk]=Панель Латте

app/packageplugins/indicator/latte-indicator.desktop

@@ -11,6 +11,7 @@ Comment[gl]=Indicador de Latte
 Comment[it]=Indicatore Latte
 Comment[nl]=Indicator van Latte
 Comment[pt]=Indicador do Latte
+Comment[pt_BR]=Indicador do Latte
 Comment[sv]=Latte indikator
 Comment[uk]=Індикатор Латте
 Comment[x-test]=xxLatte indicatorxx

app/packageplugins/indicator/latte-packagestructure-indicator.desktop

@@ -8,6 +8,7 @@ Name[gl]=Indicador
 Name[it]=Indicatore
 Name[nl]=Indicator
 Name[pt]=Indicador
+Name[pt_BR]=Indicador
 Name[sv]=Indikator
 Name[uk]=Індикатор
 Name[x-test]=xxIndicatorxx

indicators/default/metadata.desktop

@@ -32,6 +32,7 @@ Comment[gl]=Indicador predeterminado de Latte
 Comment[it]=Indicatore predefinito di Latte
 Comment[nl]=Standaard indicator van Latte
 Comment[pt]=Indicador predefinido do Latte
+Comment[pt_BR]=Indicador padrão do Latte
 Comment[sv]=Latte standardindikator
 Comment[uk]=Типовий індикатор Латте
 Comment[x-test]=xxLatte default indicatorxx

indicators/org.kde.latte.plasma/metadata.desktop

@@ -11,6 +11,7 @@ Name[it]=Plasma
 Name[nl]=Plasma
 Name[nn]=Plasma
 Name[pt]=Plasma
+Name[pt_BR]=Plasma
 Name[sv]=Plasma
 Name[uk]=Плазма
 Name[x-test]=xxPlasmaxx
@@ -23,6 +24,7 @@ Comment[gl]=Indicador de estilo Plasma de Latte
 Comment[it]=Indicatore stile di Plasma di Latte
 Comment[nl]=Plasma stijlindicator van Latte
 Comment[pt]=Indicador de estilo do Plasma no Latte
+Comment[pt_BR]=Indicador de estilo do Plasma no Latte
 Comment[sv]=Latte Plasmastilindikator
 Comment[uk]=Індикатор стилю Плазми Латте
 Comment[x-test]=xxLatte Plasma style indicatorxx