From 754e205bd03778a8777b807f4f320ce2d6a4584d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 May 2017 06:01:56 +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"
---
 effects/morphingpopups/package/metadata.desktop | 1 +
 tabbox/kwindesktopswitcher.desktop              | 1 +
 tabbox/kwinwindowswitcher.desktop               | 1 +
 3 files changed, 3 insertions(+)

diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop
index 17e869b5a0..89a47e95bb 100644
--- a/effects/morphingpopups/package/metadata.desktop
+++ b/effects/morphingpopups/package/metadata.desktop
@@ -45,6 +45,7 @@ Name[eu]=Eraldatzen diren gainerakorrak
 Name[fi]=Ponnahdusikkunoiden muodonmuutos
 Name[fr]=Fondu des menus surgissants
 Name[gl]=Xanelas emerxentes cambiantes
+Name[he]=החלקת חלונות קופצים
 Name[it]=Finestre a comparsa che si trasformano
 Name[ko]=변형되는 팝업
 Name[nl]=Morphing popups
diff --git a/tabbox/kwindesktopswitcher.desktop b/tabbox/kwindesktopswitcher.desktop
index 37b4528147..8b98e397be 100644
--- a/tabbox/kwindesktopswitcher.desktop
+++ b/tabbox/kwindesktopswitcher.desktop
@@ -17,6 +17,7 @@ Comment[eu]=KWin leiho-aldatzailearen diseinua
 Comment[fi]=KWinin työpöydänvalitsimen asettelu
 Comment[fr]=Une disposition du sélecteur de bureaux KWin
 Comment[gl]=Disposición do selector de escritorios de KWin
+Comment[he]=פריסת מחליף שולחנות עבודה של KWin
 Comment[hu]=KWin asztalváltó elrendezés
 Comment[ia]=Disposition de commutator de scriptorio de KWin
 Comment[id]=Tata Letak Pengganti Desktop KWin
diff --git a/tabbox/kwinwindowswitcher.desktop b/tabbox/kwinwindowswitcher.desktop
index cfd4c394cf..d7c31199fb 100644
--- a/tabbox/kwinwindowswitcher.desktop
+++ b/tabbox/kwinwindowswitcher.desktop
@@ -17,6 +17,7 @@ Comment[eu]=KWin-eko leiho-kommutadorearen diseinua
 Comment[fi]=KWinin ikkunanvalitsimen asettelu
 Comment[fr]=Disposition du sélecteur de fenêtres de KWin
 Comment[gl]=Disposición do alternador de xanelas de KWin
+Comment[he]=פריסת מחליף חלונות של KWin
 Comment[hu]=KWin ablakváltó elrendezés
 Comment[ia]=Disposition de commutator de fenestra de KWin
 Comment[id]=Tata Letak Pengganti Jendela KWin