From ba0b3bfeabeb0eb55147b2ffcd39e4ce1cf4e617 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Jun 2020 05:25:18 +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"
---
 desktop/konsole.notifyrc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc
index 188fa895..f4a15b37 100644
--- a/desktop/konsole.notifyrc
+++ b/desktop/konsole.notifyrc
@@ -729,22 +729,30 @@ Action=Popup
 
 [Event/ProcessFinishedHidden]
 Name=Process finished in Non-Focused Monitored Session
+Name[ca]=El procés ha finalitzat a una sessió controlada sense focus
 Name[nl]=Proces beëindigd in gevolgde sessie zonder focus
+Name[pt]=Processo Terminado numa Sessão Vigiada em Segundo Plano
 Name[uk]=У нефокусованому сеансі спостереження завершено процес
 Name[x-test]=xxProcess finished in Non-Focused Monitored Sessionxx
 Comment=Process finished in a non-focused monitored session
+Comment[ca]=El procés ha finalitzat a una sessió controlada sense focus
 Comment[nl]=Proces beëindigd in een gevolgde sessie zonder focus
+Comment[pt]=Processo terminado numa sessão vigiada em segundo plano
 Comment[uk]=У нефокусованому сеансі спостереження завершено роботу процесу
 Comment[x-test]=xxProcess finished in a non-focused monitored sessionxx
 Action=Popup
 
 [Event/ProcessFinished]
 Name=Process finished in Monitored Session
+Name[ca]=El procés ha finalitzat a una sessió controlada
 Name[nl]=Proces beëindigd in gevolgde sessie
+Name[pt]=Processo Terminado numa Sessão Vigiada
 Name[uk]=У сеансі спостереження завершено процес
 Name[x-test]=xxProcess finished in Monitored Sessionxx
 Comment=Process finished in a monitored session
+Comment[ca]=El procés ha finalitzat a una sessió controlada
 Comment[nl]=Proces beëindigd in een gevolgde sessie
+Comment[pt]=Processo terminado numa sessão vigiada
 Comment[uk]=У сеансі спостереження завершено роботу процесу
 Comment[x-test]=xxProcess finished in a monitored sessionxx
 Action=Popup