From 1e4fbcc5ed98cb79899c33c18708cb0318ebe384 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 23 Jan 2017 05:49:39 +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"
---
 kcmkwin/kwincompositing/kwineffect.knsrc                     | 1 +
 kcmkwin/kwinscripts/kwinscripts.knsrc                        | 1 +
 kcmkwin/kwintabbox/kwinswitcher.knsrc                        | 1 +
 packageplugins/scripts/kwin-packagestructure-scripts.desktop | 5 +++++
 .../kwin-packagestructure-windowswitcher.desktop             | 5 +++++
 plugins/kdecorations/aurorae/src/aurorae.knsrc               | 1 +
 6 files changed, 14 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index be799f313e..21dcde0cae 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
+Name[ko]=창 관리자 효과
 Name[nl]=Effecten van vensterbeheerder
 Name[nn]=Effektar for vindaugshandsamar
 Name[pl]=Efekty zarządzania oknami
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index ab1ca69bea..54411f794a 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
+Name[ko]=창 관리자 스크립트
 Name[nl]=Scripts van vensterbeheerder
 Name[nn]=Skript for vindaugshandsamar
 Name[pl]=Skrypty zarządzania oknami
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 4b66a4a821..312df08216 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
 Name[ia]=Disposition de commutator de gerente de fenestra
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
+Name[ko]=창 관리자 전환기 레이아웃
 Name[nl]=Omschakelende indelingen van vensterbeheerder
 Name[pl]=Układ przełączania zarządzana oknami
 Name[pt]=Disposições da Mudança de Janelas do KWin
diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
index eedf8da881..e72c2423b2 100644
--- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop
+++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
@@ -1,7 +1,12 @@
 [Desktop Entry]
 Name=KWin Script
 Name[ca]=Script del KWin
+Name[ca@valencia]=Script del KWin
+Name[en_GB]=KWin Script
+Name[it]=Script di KWin
+Name[ko]=KWin 스크립트
 Name[nl]=KWin-script
+Name[pl]=Skrypt KWin
 Name[pt]=Programa do KWin
 Name[sv]=Kwin-skript
 Name[uk]=Скрипт KWin
diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
index a8304d65ea..ba1a3b3a26 100644
--- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
+++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
@@ -1,7 +1,12 @@
 [Desktop Entry]
 Name=KWin Window Switcher
 Name[ca]=Commutador de finestres del KWin
+Name[ca@valencia]=Commutador de finestres del KWin
+Name[en_GB]=KWin Window Switcher
+Name[it]=Scambiafinestre di KWin
+Name[ko]=KWin 창 전환기
 Name[nl]=KWin-vensterwisselaar
+Name[pl]=Przełącznik okien KWin
 Name[pt]=Mudança de Janelas do KWin
 Name[sv]=Kwin-fönsterbyte
 Name[uk]=Перемикач вікон KWin
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 90ef67efd9..3cc581e126 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -7,6 +7,7 @@ Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
 Name[ia]=Decorationes de fenestra Aurorae
 Name[it]=Decorazioni delle finestre Aurorae
+Name[ko]=Aurorae 창 장식
 Name[nl]=Aurorea-vensterdecoraties
 Name[pl]=Ozdoby okienne Aurorae
 Name[pt]=Decorações das Janelas do Aurorae