From 1933626d3669dcdd34a398ee78b1c174bd112d34 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 16 Dec 2020 06:45:25 +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 585ee129..e4d8a8bb 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -7,6 +7,7 @@ Name[cs]=Plasma
 Name[en_GB]=Plasma
 Name[es]=Plasma
 Name[ia]=Plasma
+Name[it]=Plasma
 Name[nl]=Plasma
 Name[nn]=Plasma
 Name[pt]=Plasma
@@ -23,6 +24,7 @@ Name[ca]=Captura
 Name[en_GB]=Captured
 Name[es]=Capturado
 Name[ia]=Capturate
+Name[it]=Catturato
 Name[nl]=Opgenomen
 Name[nn]=Opptak
 Name[pt]=Capturada
@@ -36,6 +38,7 @@ Comment[ca]=Captura
 Comment[en_GB]=Captured
 Comment[es]=Capturado
 Comment[ia]=Capturate
+Comment[it]=Catturato
 Comment[nl]=Opgenomen
 Comment[nn]=Opptak
 Comment[pt]=Capturada