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

@@ -114,6 +114,7 @@
     "X-KDE-Keywords[is]": "kwin,gluggi,stjóri,myndsmíði,myndsmiður,brella,3D brellur,2D brellur,myndstillingar,grafískar brellur,skjáborðsbrellur,grafík,biðtími,vsync,rifgalli,gluggasmámyndir",
     "X-KDE-Keywords[it]": "kwin,finestra,gestore,composizione,compositore,effetto,effetti 3D,effetti 2D,impostazioni video,effetti grafici,effetti desktop,grafica,latenza,vsync,tearing,anteprime delle finestre",
     "X-KDE-Keywords[ka]": "kwin,window,manager,compositing,compositor,effect,3D effects,2D effects,video settings,graphical effects,desktop effects,graphics,latency,vsync,tearing,window thumbnails,ფანჯარა,მართვა,კომპოზიტორი,ეფექტები,დაყოვნება",
+    "X-KDE-Keywords[ko]": "창,관리자,컴포지팅,컴포지터,효과,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과,그래픽,주사율,티어링,창 섬네일",
     "X-KDE-Keywords[nn]": "kwin,vindauge,vindaugshandsamar,samansetjing,samansetjar,effekt,3D-effektar,2D-effektar,videoinnstillingar,grafiske effektar,skrivebordseffektar,grafikk,latenstid,vsync,tearing,rifter,miniatyrbilete",
     "X-KDE-Keywords[pl]": "kwin,okno,menadżer,komponowanie,kompozytor,efekt,efekty 3D,efekty 2D,ustawienia obrazu,ustawienia  grafiki,ustawienia pulpitu,grafika,opóźnienie,vsync,cięcie,miniatury okien",
     "X-KDE-Keywords[ru]": "kwin,window,manager,compositing,compositor,effect,3D effects,2D effects,video settings,graphical effects,desktop effects,graphics,latency,vsync,tearing,window thumbnails,окно,диспетчер,графические эффекты,эффекты,композитинг,трёхмерные эффекты,двухмерные эффекты,параметры видео,настройка видео,графика,задержка,запаздывание,разрывы,миниатюры окон",