From 74b784837b7fd7503ff179cbffaa7fc46e591c5f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 29 Jan 2020 05:46:25 +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"
---
 appmenu/appmenu.desktop                                       | 2 +-
 .../plasma-containmentactions-switchdesktop.desktop           | 4 ++--
 runners/windows/plasma-runner-windows.desktop                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appmenu/appmenu.desktop b/appmenu/appmenu.desktop
index ed991bc51..a98dcc37b 100644
--- a/appmenu/appmenu.desktop
+++ b/appmenu/appmenu.desktop
@@ -74,7 +74,7 @@ Comment[is]=Miðlar forritavalmyndum á skjáborðið
 Comment[it]=Trasferisce al desktop i menu delle applicazioni
 Comment[ja]=アプリケーションメニューをデスクトップに転送します
 Comment[kk]=Қолданбаның мәзірін үстел бетіне тапсыру
-Comment[ko]=프로그램 메뉴를 데스크톱으로 보내기
+Comment[ko]=프로그램 메뉴를 바탕 화면으로 보내기
 Comment[lt]=Perkelia programos meniu į darbalaukį
 Comment[mr]=अनुप्रयोग मेन्यूचे डेस्कटॉपवर स्थानान्तरण
 Comment[nb]=Overfører programmets meny til skrivebordet
diff --git a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
index e658fe6d6..ecdb02108 100644
--- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
+++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
@@ -33,7 +33,7 @@ Name[ja]=デスクトップを切り替え
 Name[kk]=Жұмыс үстелді ауыстыру
 Name[km]=ប្ដូរ​ផ្ទៃតុ
 Name[kn]=ಗಣಕತೆರೆಯನ್ನು ಬದಲಾಯಿಸು
-Name[ko]=데스크톱 전환
+Name[ko]=바탕 화면 전환
 Name[lt]=Perjungti darbalaukį
 Name[lv]=Pārslēgt darbvirsmu
 Name[mk]=Смени раб. површина
@@ -100,7 +100,7 @@ Comment[ja]=他の仮想デスクトップに切り替えます
 Comment[kk]=Басқа виртуалды үстелге ауысу
 Comment[km]=ប្ដូរ​ទៅ​ផ្ទៃតុ​និម្មិត​ផ្សេង​ទៀត
 Comment[kn]=ಮತ್ತೊಂದು ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗೆ ಬದಲಾಯಿಸು
-Comment[ko]=다른 가상 데스크톱으로 전환합니다
+Comment[ko]=다른 가상 바탕 화면으로 전환합니다
 Comment[lt]=Perjungti į kitą virtualų darbalaukį
 Comment[lv]=Pārslēgties uz citu virtuālo darbvirsmu
 Comment[mk]=Менување на друга виртуелна раб. површина
diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop
index 9d09a1a6d..c6729df7e 100644
--- a/runners/windows/plasma-runner-windows.desktop
+++ b/runners/windows/plasma-runner-windows.desktop
@@ -100,7 +100,7 @@ Comment[ja]=ウィンドウとデスクトップの一覧表示と切り替え
 Comment[kk]=Бар терезе мен үстелдерді ұсынып оларға ауысу
 Comment[km]=រាយ​​បង្អួច និង​ផ្ទៃតុ​ ហើយ​ប្ដូរ​ពួកវា
 Comment[kn]=ವಿಂಡೊ ಹಾಗು ಗಣಕತೆರೆಗಳನ್ನು ಪಟ್ಟಿಮಾಡು ಹಾಗು ಅವುಗಳನ್ನು ಬದಲಾಯಿಸು
-Comment[ko]=창 및 데스크톱 목록을 보여 주고 전환합니다
+Comment[ko]=창 및 바탕 화면 목록을 보여 주고 전환합니다
 Comment[lt]=Išvardyti langus ir darbalaukius bei perjungti į juos
 Comment[lv]=Parāda logus un darbvirsmas un pārslēdz tos
 Comment[mk]=Приказ на прозорци и раб. површини и преминување меѓу нив