From cd17339847027d7fbe1bdf7b54f2e54611125931 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Feb 2021 10:38:09 +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"
---
 neochat.notifyrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 6fdf8ab21..2544b1132 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -34,6 +34,7 @@ Comment[en_GB]=A client for matrix, the decentralised communication protocol
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
 Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma
+Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
 Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
 Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol