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"

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"
f9e8e930 · l10n daemon script · be5a4751 · f9e8e930
--- a/src/kcms/compositing/kwincompositing.json
+++ b/src/kcms/compositing/kwincompositing.json
@@ -96,6 +96,7 @@
    "X-KDE-Keywords[fr]": "kwin, fenêtre, gestionnaire, composition, compositeur, effet, effets 3D, effets 2D, paramètres vidéo, effets graphiques, effets de bureau, graphique, latence, vsync, déchirement, vignettes de fenêtres",
    "X-KDE-Keywords[gl]": "kwin,window,xanela,ventá,fiestra,manager,xestor,manexador,compositing,composición,compositor,effect,efecto,3D effects,efectos 3D,2D effects,efectos 2D,video settings,configuración de vídeo,graphical effects,efectos gráficos,desktop effects,efectos de escritorio,graphics,gráficos,latency,latencia,vsync,sincronización vertical,tearing,window thumbnails,miniaturas de xanelas",
    "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[ko]": "창,관리자,컴포지팅,컴포지터,효과,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과,그래픽,주사율,티어링,창 섬네일",
    "X-KDE-Keywords[nl]": "kwin,venster,beheerder,samenstellen,samensteller,effect,3D-effecten,2D-effecten,video-instellingen,grafische effecten,bureaubladeffecten,grafische elementen,vertraging,vsync,schuintrekken,vensterminiaturen",
    "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",