From efcebd1209c17af86b77ad44d4088c1bc8361253 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 10 Jun 2018 05:27:27 +0200
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"
---
 dialer/src/plasma_dialer.notifyrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dialer/src/plasma_dialer.notifyrc b/dialer/src/plasma_dialer.notifyrc
index a13bc506..e15f30b5 100644
--- a/dialer/src/plasma_dialer.notifyrc
+++ b/dialer/src/plasma_dialer.notifyrc
@@ -73,6 +73,7 @@ Name[cs]=Zvoní
 Name[de]=Es klingelt
 Name[en_GB]=Ringing
 Name[es]=Sonando
+Name[fr]=Sonnerie en cours
 Name[gl]=Chámano
 Name[it]=Sta squillando
 Name[nl]=Bel gaat over
@@ -93,6 +94,7 @@ Comment[cs]=Telefon zvoní
 Comment[de]=Das Telefon klingelt
 Comment[en_GB]=The phone is ringing
 Comment[es]=El teléfono está sonando
+Comment[fr]=Le téléphone est en train de sonner
 Comment[gl]=Está a recibir unha chamada.
 Comment[it]=Il telefono sta squillando
 Comment[nl]=De telefoon gaat over