From 545f2d77969495552ebe4b77ab4ad001da2c215c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 17 Jan 2021 06:43:41 +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"
---
 plasma_phone_components.notifyrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 79abc9f0..9c8664d5 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -15,6 +15,7 @@ Name[it]=Plasma
 Name[nl]=Plasma
 Name[nn]=Plasma
 Name[pa]=ਪਲਾਜ਼ਮਾ
+Name[pl]=Plazma
 Name[pt]=Plasma
 Name[pt_BR]=Plasma
 Name[sk]=Plasma
@@ -37,6 +38,7 @@ Name[it]=Catturato
 Name[nl]=Opgenomen
 Name[nn]=Opptak
 Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
+Name[pl]=Przechwycono
 Name[pt]=Capturada
 Name[pt_BR]=Capturado
 Name[sl]=Zajeto
@@ -56,6 +58,7 @@ Comment[it]=Catturato
 Comment[nl]=Opgenomen
 Comment[nn]=Opptak
 Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ
+Comment[pl]=Przechwycono
 Comment[pt]=Capturada
 Comment[pt_BR]=Capturado
 Comment[sl]=Zajeto