From e60c878647a71fa7fecbbf7feae258e8e6ba25c8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 8 Oct 2018 06:07:21 +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/logout/package/metadata.desktop                    | 1 +
 effects/scale/scale_config.desktop                         | 1 +
 effects/showpaint/showpaint_config.desktop                 | 1 +
 packageplugins/effect/kwin-packagestructure-effect.desktop | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index ea8c855c14..740bf77738 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -3,6 +3,7 @@ Name=Logout
 Name[ca]=Sortida
 Name[ca@valencia]=Eixida
 Name[cs]=Odhlášení
+Name[de]=Abmeldung
 Name[en_GB]=Logout
 Name[es]=Cerrar la sesión
 Name[eu]=Saio-ixtea
diff --git a/effects/scale/scale_config.desktop b/effects/scale/scale_config.desktop
index 712e60ed01..7afb3ada66 100644
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@@ -9,6 +9,7 @@ Name=Scale
 Name[ca]=Escala
 Name[ca@valencia]=Escala
 Name[cs]=Měřítko
+Name[de]=Skalieren
 Name[en_GB]=Scale
 Name[es]=Escalar
 Name[eu]=Eskalatu
diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop
index 3b3d2ea9b1..3d53edfbb5 100644
--- a/effects/showpaint/showpaint_config.desktop
+++ b/effects/showpaint/showpaint_config.desktop
@@ -47,6 +47,7 @@ Name[mr]=रंग दर्शवा
 Name[nds]=Klöör wiesen
 Name[ne]=रङ देखाउनुहोस्
 Name[nl]=Intekening tonen
+Name[nn]=Vis oppteikning
 Name[pa]=ਪੇਂਟ ਵੇਖੋ
 Name[pl]=Pokaż rysowane
 Name[pt]=Mostrar a Pintura
diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop
index 837fe9cfd1..156e251bd9 100644
--- a/packageplugins/effect/kwin-packagestructure-effect.desktop
+++ b/packageplugins/effect/kwin-packagestructure-effect.desktop
@@ -2,10 +2,12 @@
 Name=KWin Effect
 Name[ca]=Efecte del KWin
 Name[ca@valencia]=Efecte del KWin
+Name[de]=KWin-Effekt
 Name[es]=Efecto de KWin
 Name[id]=KWin Effect
 Name[it]=Effetto di KWin
 Name[nl]=KWin-effect
+Name[nn]=KWin-effekt
 Name[pt]=Efeito do KWin
 Name[pt_BR]=Efeito do KWin
 Name[ru]=Эффект диспетчера окон