From 536949840e3a0d6c0ff0b240c191a06a0a2c9132 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 Apr 2019 05:37:49 +0200
Subject: [PATCH] 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/latte-indicators.knsrc        | 1 +
 app/lattedock.notifyrc            | 7 +++++++
 plasmoid/metadata.desktop.cmake   | 2 ++
 plasmoid/package/metadata.desktop | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc
index 6f20ef4f6..147784013 100644
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@@ -9,6 +9,7 @@ Name[it]=Indicatori Latte
 Name[ko]=Latte 표시기
 Name[nl]=Indicatoren van Latte
 Name[pt]=Indicadores do Latte
+Name[pt_BR]=Indicadores do Latte
 Name[sv]=Latte indikatorer
 Name[uk]=Індикатори Латте
 Name[x-test]=xxLatte Indicatorsxx
diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 29ce009f1..4c1490bcb 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -44,6 +44,7 @@ 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]=Панель Латте
@@ -64,6 +65,7 @@ Name[it]=Importata con successo
 Name[ko]=성공적으로 가져왔습니다
 Name[nl]=Met succes geïmporteerd
 Name[pt]=Importado com sucesso
+Name[pt_BR]=Importado com sucesso
 Name[sv]=Import lyckades
 Name[uk]=Успішно імпортовано
 Name[x-test]=xxImported successfullyxx
@@ -82,6 +84,7 @@ Name[it]=Impossibile importare
 Name[ko]=가져오지 못했습니다
 Name[nl]=Importeren is mislukt
 Name[pt]=Não foi possível importar
+Name[pt_BR]=Ocorreu um erro ao importar
 Name[sv]=Misslyckades importera
 Name[uk]=Не вдалося імпортувати
 Name[x-test]=xxFailed to importxx
@@ -100,6 +103,7 @@ Name[it]=Esportata correttamente
 Name[ko]=성공적으로 내보냈습니다
 Name[nl]=Met succes geëxporteerd
 Name[pt]=Exportada com sucesso
+Name[pt_BR]=Exportado com sucesso
 Name[sv]=Export lyckades
 Name[uk]=Успішно експортовано
 Name[x-test]=xxExported successfullyxx
@@ -118,6 +122,7 @@ Name[it]=Impossibile esportare
 Name[ko]=내보내지 못했습니다
 Name[nl]=Exporteren is mislukt
 Name[pt]=Não foi possível exportar
+Name[pt_BR]=Ocorreu um erro ao exportar
 Name[sv]=Misslyckades exportera
 Name[uk]=Не вдалося експортувати
 Name[x-test]=xxFailed to exportxx
@@ -136,6 +141,7 @@ Name[it]=Rimossa con successo
 Name[ko]=성공적으로 삭제했습니다
 Name[nl]=Met succes verwijderd
 Name[pt]=Removido com sucesso
+Name[pt_BR]=Removido com sucesso
 Name[sv]=Borttagning lyckades
 Name[uk]=Успішно вилучено
 Name[x-test]=xxRemoved successfullyxx
@@ -154,6 +160,7 @@ Name[it]=Impossibile rimuovere
 Name[ko]=삭제할 수 없음
 Name[nl]=Verwijderen is mislukt
 Name[pt]=Não foi possível remover
+Name[pt_BR]=Ocorreu um erro ao remover
 Name[sv]=Misslyckades ta bort
 Name[uk]=Не вдалося вилучити
 Name[x-test]=xxFailed to removexx
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index 4af53e6ec..c366c35ee 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -5,6 +5,7 @@ Name[en_GB]=Latte Tasks
 Name[gl]=Tarefas de Latte
 Name[nl]=Latte-taken
 Name[pt]=Tarefas do Latte
+Name[pt_BR]=Tarefas do Latte
 Name[sv]=Latte aktiviteter
 Name[uk]=Завдання Латте
 Name[x-test]=xxLatte Tasksxx
@@ -15,6 +16,7 @@ Comment[en_GB]=Tasks plasmoid from Latte Dock
 Comment[gl]=Plasmoides de tarefas da doca Latte
 Comment[nl]=Plasmoid voor taken uit Latte Dock
 Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
+Comment[pt_BR]=Plasmoide de tarefas do Latte Dock
 Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд завдань з панелі Латте
 Comment[x-test]=xxTasks plasmoid from Latte Dockxx
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 7e3ae9a4a..b45bb26a8 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -5,6 +5,7 @@ Name[en_GB]=Latte Tasks
 Name[gl]=Tarefas de Latte
 Name[nl]=Latte-taken
 Name[pt]=Tarefas do Latte
+Name[pt_BR]=Tarefas do Latte
 Name[sv]=Latte aktiviteter
 Name[uk]=Завдання Латте
 Name[x-test]=xxLatte Tasksxx
@@ -15,6 +16,7 @@ Comment[en_GB]=Tasks plasmoid from Latte Dock
 Comment[gl]=Plasmoides de tarefas da doca Latte
 Comment[nl]=Plasmoid voor taken uit Latte Dock
 Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
+Comment[pt_BR]=Plasmoide de tarefas do Latte Dock
 Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд завдань з панелі Латте
 Comment[x-test]=xxTasks plasmoid from Latte Dockxx