From a42bc6788cd2f0d49bd34c516a0e217a619b593c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 23 Mar 2022 02:09:30 +0000
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"
---
 app/lattedock.notifyrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 4752bdd69..21beb47da 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -111,7 +111,7 @@ Name=Failed to import
 Name[ar]=فشل استيراد
 Name[az]=İdxal baş tutmadı
 Name[ca]=Ha fallat en importar
-Name[ca@valencia]=Ha fallat en importar
+Name[ca@valencia]=No s'ha pogut importar
 Name[cs]=Nepodařilo se importovat
 Name[de]=Importieren fehlgeschlagen
 Name[el]=Αποτυχία εισαγωγής
@@ -185,7 +185,7 @@ Name=Failed to export
 Name[ar]=فشل تصدير
 Name[az]=İxrac baş tutmadı
 Name[ca]=Ha fallat en exportar
-Name[ca@valencia]=Ha fallat en exportar
+Name[ca@valencia]=No s'ha pogut exportar
 Name[cs]=Export selhal
 Name[de]=Exportieren fehlgeschlagen
 Name[el]=Αποτυχία εξαγωγής
@@ -260,7 +260,7 @@ Name=Failed to remove
 Name[ar]=فشلت إزالة
 Name[az]=Silinmə alınmadı
 Name[ca]=Ha fallat en eliminar
-Name[ca@valencia]=Ha fallat en eliminar
+Name[ca@valencia]=No s'ha pogut eliminar
 Name[cs]=Selhalo odstranění 
 Name[de]=Entfernen fehlgeschlagen
 Name[el]=Αποτυχία αφαίρεσης