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"

examples/developerguide/basic/metadata.desktop

@@ -10,6 +10,7 @@ Comment[es]=Aplicación básica
 Comment[fi]=Perussovellus
 Comment[gl]=Programa básico
 Comment[it]=Applicazione di base
+Comment[ko]=기본 앱
 Comment[nl]=Basis app
 Comment[pl]=Podstawowa aplikacja
 Comment[pt]=Aplicação Básica

templates/cpp-plasmoid/src/package/metadata.desktop

@@ -10,6 +10,7 @@ Name[es]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[gl]=%{APPNAME}
 Name[it]=%{APPNAME}
+Name[ko]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
@@ -37,6 +38,7 @@ Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[gl]=o que fai o seu programa en poucas palabras
 Comment[it]=Cosa fa la tua applicazione in poche parole
+Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[pl]=w kilku słowach opis co robi twój program

templates/qml-plasmoid/package/metadata.desktop

@@ -10,6 +10,7 @@ Name[es]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[gl]=%{APPNAME}
 Name[it]=%{APPNAME}
+Name[ko]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
@@ -37,6 +38,7 @@ Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[gl]=o que fai o seu programa en poucas palabras
 Comment[it]=Cosa fa la tua applicazione in poche parole
+Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[pl]=w kilku słowach opis co robi twój program