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"

generators/markdown/libokularGenerator_md.json

@@ -35,6 +35,7 @@
         "Name[fr]": "Moteur de markdown",
         "Name[ia]": "Retro-Administration Markdown",
         "Name[it]": "Backend Markdown",
+        "Name[ko]": "Markdown 백엔드",
         "Name[nl]": "Markdown-backend",
         "Name[nn]": "Markdown-motor",
         "Name[pl]": "Silnik Markdown",

generators/markdown/okularApplication_md.desktop

@@ -177,6 +177,7 @@ X-KDE-Keywords[es]=Markdown
 X-KDE-Keywords[fr]=Markdown
 X-KDE-Keywords[ia]=Markdown
 X-KDE-Keywords[it]=Markdown
+X-KDE-Keywords[ko]=Markdown
 X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[nn]=Markdown
 X-KDE-Keywords[pl]=Markdown

generators/markdown/org.kde.mobile.okular_md.desktop

@@ -166,6 +166,7 @@ X-KDE-Keywords[es]=Markdown
 X-KDE-Keywords[fr]=Markdown
 X-KDE-Keywords[ia]=Markdown
 X-KDE-Keywords[it]=Markdown
+X-KDE-Keywords[ko]=Markdown
 X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[nn]=Markdown
 X-KDE-Keywords[pl]=Markdown