From d886ea90041d3e2303b1a16cc424e3625e405644 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 3 Feb 2017 08:02:50 +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"
---
 kwin.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kwin.notifyrc b/kwin.notifyrc
index bd6e95f260..1035cea525 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -147,7 +147,7 @@ Comment[fi]=Toinen sovellus vaati keskeyttämään koostamisen.
 Comment[fr]=Une autre application a demandé la suspension de la composition.
 Comment[fy]=In oare applikaasje hat frege om compositing út te stellen.
 Comment[ga]=Tá feidhmchlár eile ag iarraidh comhshuí a chur ar fionraí.
-Comment[gl]=Outro programa pediu que a suspensión da composición.
+Comment[gl]=Outro aplicativo pediu que a suspensión da composición.
 Comment[he]=יישום אחר ביקש להשהות את השזירה.
 Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja.
 Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte.