From a457bd4310f8f43e37cf3d95c5244985cd4be7e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 4 Sep 2020 06:04: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"
---
 kcmkwin/kwintabbox/kwinswitcher.knsrc | 2 +-
 kwin.notifyrc                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index dbd6cdd941..f9d6dfe8c4 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -26,7 +26,7 @@ Name[nn]=Veksleoppsett for vindaugshandsamar
 Name[pa]=ਵਿੰਡੋ ਮੈਨੇਜਰ ਸਵਿੱਚਰ ਲੇਆਉਟ
 Name[pl]=Układ przełączania zarządzana oknami
 Name[pt]=Disposições da Mudança de Janelas do KWin
-Name[pt_BR]=Layouts de mudança do gerenciador de Janelas
+Name[pt_BR]=Layouts de mudança do gerenciador de janelas
 Name[ru]=Оформления переключателя окон для KWin
 Name[sk]=Prepínanie rozložení správcu okien
 Name[sl]=Razporedi preklapljanja upravljalnika oken
diff --git a/kwin.notifyrc b/kwin.notifyrc
index e28b0f0d03..405df307bf 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -294,6 +294,7 @@ Name[az]=Xwayland Qəzası
 Name[ca]=Fallada de l'Xwayland
 Name[es]=Fallo de Xwayland
 Name[nl]=Xwayland-crash
+Name[pt]=Estoiro do Xwayland
 Name[sv]=Krasch av Xwayland
 Name[uk]=Аварія Xwayland
 Name[x-test]=xxXwayland Crashxx
@@ -302,6 +303,7 @@ Comment[az]=Xwayland qəzaya uğradı
 Comment[ca]=L'Xwayland ha fallat
 Comment[es]=Xwayland ha fallado
 Comment[nl]=Xwayland is gecrasht
+Comment[pt]=O Xwayland estoirou
 Comment[sv]=Xwayland har kraschat
 Comment[uk]=Xwayland завершив роботу в аварійному режимі
 Comment[x-test]=xxXwayland has crashedxx