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"

applets/manage-inputmethod/metadata.desktop

@@ -13,6 +13,7 @@ Name[ko]=입력기
 Name[nl]=Invoermethode
 Name[pl]=Metoda wprowadzania
 Name[pt]=Método de Entrada
+Name[pt_BR]=Método de entrada
 Name[ro]=Metodă de introducere
 Name[ru]=Метод ввода
 Name[sk]=Metóda vstupu
@@ -36,6 +37,7 @@ Comment[ko]=입력기 관리
 Comment[nl]=Uw invoermethoden beheren
 Comment[pl]=Zarządzaj swoimi metodami wprowadzania
 Comment[pt]=Faça a Gestão dos seus Métodos de Entrada de Dados
+Comment[pt_BR]=Gerencia os seus métodos de entrada
 Comment[ro]=Gestionați metodele de introducere
 Comment[ru]=Настройка методов ввода
 Comment[sk]=Spravujte svoje metódy vstupu