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"

containmentactions/contextmenu/plasma-containmentactions-contextmenu.json

@@ -54,7 +54,7 @@
         "Description[ia]": "Le menu que normalmente monstra  sur le pression dextere",
         "Description[id]": "Menu yang biasanya tampil saat klik-kanan",
         "Description[it]": "Il menu che normalmente appare al clic destro",
-        "Description[ko]": "오른쪽 단추를 눌렀을 때 나타나는 메뉴",
+        "Description[ko]": "오른쪽 단추를 클릭했을 때 나타나는 메뉴",
         "Description[lt]": "Meniu, kuris įprastai rodomas spustelėjus dešiniuoju pelės mygtuku",
         "Description[nl]": "Het menu dat normaal verschijnt bij rechtsklikken",
         "Description[nn]": "Menyen som vanlegvis vert vist ved høgreklikking",