From 97e4b852e51726c63020bf16c390b87dbfb61fd5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 25 Jul 2016 13:28:09 +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"
---
 effects/cube/cubeslide_config.desktop         | 2 +-
 kcmkwin/kwindecoration/kwindecoration.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop
index d29e5509ac..6224970a58 100644
--- a/effects/cube/cubeslide_config.desktop
+++ b/effects/cube/cubeslide_config.desktop
@@ -10,7 +10,7 @@ Name[ast]=Animación del cubu d'escritoriu
 Name[bg]=Кубична анимация върху работен плот
 Name[bs]=Animacija kocke površi
 Name[ca]=Animació de cub per a l'escriptori
-Name[ca@valencia]=Animació del cub d'escriptori
+Name[ca@valencia]=Animació de cub per a l'escriptori
 Name[cs]=Animace kostky plochy
 Name[csb]=Animacëjô Szescanu pùltu
 Name[da]=Animeret skrivebordsterning
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index cd99e357d3..e9d01bcec1 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