From a18f055779d937f9661d2f44e8d6a72d5ac84654 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 25 Jan 2017 05:59:29 +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     | 1 +
 .../windowswitcher/kwin-packagestructure-windowswitcher.desktop  | 1 +
 plugins/kdecorations/aurorae/src/aurorae.knsrc                   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index ed9c54f973..f206e0d512 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -3,6 +3,7 @@ Name=Window Manager Effects
 Name[ca]=Efectes del gestor de finestres
 Name[ca@valencia]=Efectes del gestor de finestres
 Name[de]=Fensterverwaltungs-Effekte
+Name[el]=Εφέ διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
 Name[ia]=Gerente de effectos de fenestra
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index 7d13a5038a..a95dff9be9 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -3,6 +3,7 @@ Name=Window Manager Scripts
 Name[ca]=Scripts del gestor de finestres
 Name[ca@valencia]=Scripts del gestor de finestres
 Name[de]=Fensterverwaltungs-Skripte
+Name[el]=Σενάρια διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
 Name[ia]=Gerente de scripts de fenestra 
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 2636dd47bb..2fa4e6ffbe 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -3,6 +3,7 @@ Name=Window Manager Switching Layouts
 Name[ca]=Disposicions del commutador del gestor de finestres
 Name[ca@valencia]=Disposicions del commutador del gestor de finestres
 Name[de]=Wechsel-Layout für Fensterverwaltung
+Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων
 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
diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
index cfb9799d47..f1bab3f5b7 100644
--- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop
+++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
@@ -2,6 +2,7 @@
 Name=KWin Script
 Name[ca]=Script del KWin
 Name[ca@valencia]=Script del KWin
+Name[el]=Σενάριο KWin
 Name[en_GB]=KWin Script
 Name[it]=Script di KWin
 Name[ko]=KWin 스크립트
diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
index 879f648a49..f40550f170 100644
--- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
+++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
@@ -2,6 +2,7 @@
 Name=KWin Window Switcher
 Name[ca]=Commutador de finestres del KWin
 Name[ca@valencia]=Commutador de finestres del KWin
+Name[el]=Εφαρμογή εναλλαγής παραθύρων Kwin
 Name[en_GB]=KWin Window Switcher
 Name[it]=Scambiafinestre di KWin
 Name[ko]=KWin 창 전환기
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 58c3d5040d..f874d63d6b 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -3,6 +3,7 @@ Name=Aurorae Window Decorations
 Name[ca]=Decoracions de finestra Aurorae
 Name[ca@valencia]=Decoracions de finestra Aurorae
 Name[de]=Aurorae-Fensterdekoration
+Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
 Name[ia]=Decorationes de fenestra Aurorae