From 8d005caaaeceacf3d07c50713643c210919ad876 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Nov 2018 05:41:21 +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"
---
 effects/dimscreen/package/metadata.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/effects/dimscreen/package/metadata.desktop b/effects/dimscreen/package/metadata.desktop
index 27152aadbc..137331133a 100644
--- a/effects/dimscreen/package/metadata.desktop
+++ b/effects/dimscreen/package/metadata.desktop
@@ -37,6 +37,7 @@ Comment[nds]=Maakt den helen Schirm düüsterer, wenn na Systeempleger-Verlöven
 Comment[nl]=Maakt het volledige scherm donker wanneer er om root-privileges wordt verzocht
 Comment[pa]=ਜਦੋਂ ਰੂਟ ਅਧਿਕਾਰਾਂ ਦੀ ਲੋੜ ਹੋਵੇ ਤਾਂ ਪੂਰੀ ਸਕਰੀਨ ਲਈ ਗੂੜ੍ਹਾ ਕਰੋ
 Comment[pl]=Przyciemnienie całego ekranu przy żądaniu praw administratora
+Comment[pt]=Escurece o ecrã inteiro ao pedir privilégios de administrador
 Comment[ro]=Întunecă întregul ecran la cererea privilegiilor de root
 Comment[ru]=Затемнение всего экрана при запросе привилегий суперпользователя
 Comment[si]=රූට් බලතල ඉල්ලා සිටින විට සම්පූර්ණ තිරය අඳුරු කරන්න
@@ -92,6 +93,8 @@ Name[nds]=In Systeemplegerbedrief Schirm bedüüstern
 Name[nl]=Scherm dimmen voor administratormodus
 Name[pa]=ਪਰਸ਼ਾਸ਼ਕੀ ਮੋਡ ਵਿੱਚ ਸਕਰੀਨ ਡਿਮ ਕਰੋ
 Name[pl]=Przyciemnienie ekranu dla trybu administratora
+Name[pt]=Escurecer o Ecrã no Modo de Administrador
+Name[pt_BR]=Escurecer a tela no modo administrador
 Name[ro]=Împăienjenește ecranul pentru Regimul administrator
 Name[ru]=Затемнение экрана при административной задаче
 Name[si]=පරිපාලක ප්‍රකාරයේදී තිර දීප්තිය අඩු කරන්න