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"

src/kcms/compositing/kwincompositing.json

@@ -59,6 +59,7 @@
         "Name[cs]": "Kompozitor",
         "Name[da]": "Kompositør",
         "Name[de]": "Compositor",
+        "Name[el]": "Συνθέτης",
         "Name[en_GB]": "Compositor",
         "Name[eo]": "Kompostisto",
         "Name[es]": "Compositor",

src/kcms/tabbox/kwinswitcher.knsrc

@@ -5,6 +5,7 @@ Name[bg]=Стилове на превключване на задачи
 Name[ca]=Estils del commutador de tasques
 Name[ca@valencia]=Estils del commutador de tasques
 Name[cs]=Styly přepínače úloh
+Name[el]=Θέματα εναλλάκτη εργασιών
 Name[en_GB]=Task Switcher Styles
 Name[eo]=Stiloj de Task-Ŝanĝilo
 Name[es]=Estilos del selector de tareas

src/plugins/krunner-integration/kwin-runner-windows.desktop

@@ -10,6 +10,7 @@ Name[ca@valencia]=Finestres
 Name[cs]=Okna
 Name[da]=Vinduer
 Name[de]=Fenster
+Name[el]=Παράθυρα
 Name[en_GB]=Windows
 Name[eo]=Vindozo
 Name[es]=Ventanas