From eced9675222b3797f48234906d3347fe8cfd774e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 17 Nov 2017 05:09:05 +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"
---
 touchscreentest/org.kde.touchtest.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index d15b9bc9..a720cee0 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -22,6 +22,7 @@ GenericName[ca@valencia]=Terminal
 GenericName[cs]=Terminál
 GenericName[de]=Terminal
 GenericName[es]=Terminal
+GenericName[fr]=Terminal
 GenericName[nl]=Terminal
 GenericName[pl]=Terminal
 GenericName[pt]=Terminal