From c4804df3384f9346c2fd6bc3e07cca872834fbe3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 2 Apr 2019 06:11:23 +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"
---
 menu/desktop/kf5-games-kids.directory | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/menu/desktop/kf5-games-kids.directory b/menu/desktop/kf5-games-kids.directory
index 018190eca..93f04cdff 100644
--- a/menu/desktop/kf5-games-kids.directory
+++ b/menu/desktop/kf5-games-kids.directory
@@ -11,7 +11,7 @@ Name[bn]=বাচ্চাদের খেলা
 Name[bn_IN]=ছোটদের খেলা
 Name[br]=C'hoarioù evit ar Bugale
 Name[bs]=Igre za djecu
-Name[ca]=Jocs per a nens
+Name[ca]=Jocs per a infants
 Name[ca@valencia]=Jocs per a nens
 Name[cs]=Hry pro děti
 Name[csb]=Grë dlô dzecë