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

@@ -33,6 +33,7 @@
         "Name[el]": "Σύστημα υποστήριξης markdown",
         "Name[es]": "Motor para Markdown",
         "Name[fr]": "Moteur de markdown",
+        "Name[gl]": "Infraestrutura de Markdown",
         "Name[ia]": "Retro-Administration Markdown",
         "Name[it]": "Backend Markdown",
         "Name[ko]": "Markdown 백엔드",

generators/markdown/okularApplication_md.desktop

@@ -175,6 +175,7 @@ X-KDE-Keywords[el]=Markdown
 X-KDE-Keywords[en_GB]=Markdown
 X-KDE-Keywords[es]=Markdown
 X-KDE-Keywords[fr]=Markdown
+X-KDE-Keywords[gl]=Markdown
 X-KDE-Keywords[ia]=Markdown
 X-KDE-Keywords[it]=Markdown
 X-KDE-Keywords[ko]=Markdown

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

@@ -164,6 +164,7 @@ X-KDE-Keywords[el]=Markdown
 X-KDE-Keywords[en_GB]=Markdown
 X-KDE-Keywords[es]=Markdown
 X-KDE-Keywords[fr]=Markdown
+X-KDE-Keywords[gl]=Markdown
 X-KDE-Keywords[ia]=Markdown
 X-KDE-Keywords[it]=Markdown
 X-KDE-Keywords[ko]=Markdown