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"

src/data/kmail_config_plugins.desktop

@@ -101,6 +101,7 @@ Comment[ko]=설정 플러그인
 Comment[nl]=Plug-ins voor instellingen
 Comment[pl]=Wtyczki ustawień
 Comment[pt]='Plugins' de Configuração
+Comment[pt_BR]=Plugin de configuração
 Comment[ru]=Настройка модулей
 Comment[sk]=Pluginy nastavení
 Comment[sl]=Nastavi vstavke
@@ -132,6 +133,7 @@ X-KDE-Keywords[ko]=kmail,plugins,플러그인
 X-KDE-Keywords[nl]=kmail,plug-ins
 X-KDE-Keywords[pl]=kmail,wtyczki
 X-KDE-Keywords[pt]=kmail,plugins
+X-KDE-Keywords[pt_BR]=kmail,plugins
 X-KDE-Keywords[ru]=kmail,plugins,модули,расширения
 X-KDE-Keywords[sk]=kmail,pluginy
 X-KDE-Keywords[sl]=kmail,vstavki

src/data/org.kde.kmail2.desktop

@@ -213,6 +213,7 @@ Name[nl]=Nieuw bericht...
 Name[nn]=Ny melding …
 Name[pl]=Nowa wiadomość...
 Name[pt]=Nova Mensagem...
+Name[pt_BR]=Nova mensagem...
 Name[sl]=Novo sporočilo ...
 Name[sv]=Nytt brev...
 Name[uk]=Нове повідомлення…
@@ -242,6 +243,7 @@ Name[nl]=E-mail controleren
 Name[nn]=Sjekk e-post
 Name[pl]=Sprawdź pocztę
 Name[pt]=Verificar o Correio
+Name[pt_BR]=Verificar e-mails
 Name[ru]=Проверить почту
 Name[sk]=S&kontrolovať poštu
 Name[sl]=Preveri pošto