From 7e77a497573a8a5e9697788174d0f06224cd5352 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 1 Sep 2016 10:04:17 +0000
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"
---
 kcmkwin/kwindecoration/kwindecoration.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index 100ca72e4d..e84c96f2af 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -30,7 +30,7 @@ Name[fi]=Ikkunoiden kehykset
 Name[fr]=Décorations de fenêtres
 Name[ga]=Maisiúcháin Fhuinneog
 Name[gl]=Decoración da xanela
-Name[he]=קישוטי חלון
+Name[he]=מסגרת חלון
 Name[hi]=विंडो सजावट
 Name[hr]=Ukrasi prozora
 Name[hu]=Ablakdekorációk