From 2962d212efb8964941d419f92e0fd1425508a141 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 22 Feb 2018 07:22:07 +0100
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/lattedock.notifyrc                     | 2 ++
 applets/separator/metadata.desktop.cmake   | 2 ++
 applets/separator/package/metadata.desktop | 2 ++
 plasmoid/metadata.desktop.cmake            | 1 +
 plasmoid/package/metadata.desktop          | 1 +
 shell/metadata.desktop.cmake               | 3 +++
 shell/package/metadata.desktop             | 3 +++
 7 files changed, 14 insertions(+)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 033e8226a..62cd66739 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -12,6 +12,7 @@ Name[it]=Latte Dock
 Name[nl]=Latte Dock
 Name[pl]=Dok Latte
 Name[pt]=Área Acoplável do Latte
+Name[pt_BR]=Latte Dock
 Name[sv]=Latte dockningsfönster
 Name[uk]=Панель Латте
 Name[x-test]=xxLatte Dockxx
@@ -29,6 +30,7 @@ Comment[it]=Latte Dock
 Comment[nl]=Latte Dock
 Comment[pl]=Dok Latte
 Comment[pt]=Área Acoplável do Latte
+Comment[pt_BR]=Latte Dock
 Comment[sv]=Latte dockningsfönster
 Comment[uk]=Панель Латте
 Comment[x-test]=xxLatte Dockxx
diff --git a/applets/separator/metadata.desktop.cmake b/applets/separator/metadata.desktop.cmake
index a93965fb2..85fe57474 100644
--- a/applets/separator/metadata.desktop.cmake
+++ b/applets/separator/metadata.desktop.cmake
@@ -14,6 +14,7 @@ Name[it]=Separatore
 Name[nl]=Scheidingshulpmiddel
 Name[pl]=Oddzielacz
 Name[pt]=Separador
+Name[pt_BR]=Separador
 Name[sk]=Oddeľovač
 Name[sv]=Avskiljare
 Name[uk]=Роздільник
@@ -54,6 +55,7 @@ Keywords[it]=separatore
 Keywords[nl]=scheiding
 Keywords[pl]=oddzielacz
 Keywords[pt]=separador
+Keywords[pt_BR]=separador
 Keywords[sk]=oddeľovač
 Keywords[sv]=avskiljare
 Keywords[uk]=Роздільник
diff --git a/applets/separator/package/metadata.desktop b/applets/separator/package/metadata.desktop
index a93965fb2..85fe57474 100644
--- a/applets/separator/package/metadata.desktop
+++ b/applets/separator/package/metadata.desktop
@@ -14,6 +14,7 @@ Name[it]=Separatore
 Name[nl]=Scheidingshulpmiddel
 Name[pl]=Oddzielacz
 Name[pt]=Separador
+Name[pt_BR]=Separador
 Name[sk]=Oddeľovač
 Name[sv]=Avskiljare
 Name[uk]=Роздільник
@@ -54,6 +55,7 @@ Keywords[it]=separatore
 Keywords[nl]=scheiding
 Keywords[pl]=oddzielacz
 Keywords[pt]=separador
+Keywords[pt_BR]=separador
 Keywords[sk]=oddeľovač
 Keywords[sv]=avskiljare
 Keywords[uk]=Роздільник
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index 9d8e126b9..0f7b82367 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -29,6 +29,7 @@ Comment[it]=Plasmoide da Latte Dock
 Comment[nl]=Plasmoid uit de Latte Dock
 Comment[pl]=Plazmoid dla doku Latte
 Comment[pt]=Plasmóide da Área Acoplável do Latte
+Comment[pt_BR]=Plasmoide do Latte Dock
 Comment[sv]=Plasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд для панелі Латте
 Comment[x-test]=xxPlasmoid from the Latte Dockxx
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 381330403..6f4ab6f5b 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -29,6 +29,7 @@ Comment[it]=Plasmoide da Latte Dock
 Comment[nl]=Plasmoid uit de Latte Dock
 Comment[pl]=Plazmoid dla doku Latte
 Comment[pt]=Plasmóide da Área Acoplável do Latte
+Comment[pt_BR]=Plasmoide do Latte Dock
 Comment[sv]=Plasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд для панелі Латте
 Comment[x-test]=xxPlasmoid from the Latte Dockxx
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index be90a27b1..bf310cc20 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -12,6 +12,7 @@ Name[it]=shell Latte
 Name[nl]=Latte-shell
 Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
+Name[pt_BR]=Latte Shell
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
 Name[x-test]=xxLatte Shellxx
@@ -29,6 +30,7 @@ Comment[it]=Shell fornita per Latte Dock
 Comment[nl]=Shell geleverd voor de Latte Dock
 Comment[pl]=Powłoka dla doku Latte
 Comment[pt]=Consola oferecida para a área acoplável do Latte
+Comment[pt_BR]=Shell fornecido para o Latte Dock
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
 Comment[x-test]=xxShell provided for the Latte Dockxx
@@ -46,6 +48,7 @@ Keywords[it]=shell
 Keywords[nl]=shell
 Keywords[pl]=powłoka
 Keywords[pt]=consola
+Keywords[pt_BR]=shell
 Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 7e8460321..416776c8e 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -12,6 +12,7 @@ Name[it]=shell Latte
 Name[nl]=Latte-shell
 Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
+Name[pt_BR]=Latte Shell
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
 Name[x-test]=xxLatte Shellxx
@@ -29,6 +30,7 @@ Comment[it]=Shell fornita per Latte Dock
 Comment[nl]=Shell geleverd voor de Latte Dock
 Comment[pl]=Powłoka dla doku Latte
 Comment[pt]=Consola oferecida para a área acoplável do Latte
+Comment[pt_BR]=Shell fornecido para o Latte Dock
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
 Comment[x-test]=xxShell provided for the Latte Dockxx
@@ -46,6 +48,7 @@ Keywords[it]=shell
 Keywords[nl]=shell
 Keywords[pl]=powłoka
 Keywords[pt]=consola
+Keywords[pt_BR]=shell
 Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка