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

@@ -27,6 +27,7 @@
         "Name": "Markdown Backend",
         "Name[ca@valencia]": "Dorsal de Markdown",
         "Name[ca]": "Dorsal de Markdown",
+        "Name[es]": "Motor para Markdown",
         "Name[it]": "Backend Markdown",
         "Name[nl]": "Markdown-backend",
         "Name[pt]": "Infra-Estrutura de Markdown",

generators/markdown/okularApplication_md.desktop

@@ -169,6 +169,7 @@ NoDisplay=true
 X-KDE-Keywords=Markdown
 X-KDE-Keywords[ca]=Markdown
 X-KDE-Keywords[ca@valencia]=Markdown
+X-KDE-Keywords[es]=Markdown
 X-KDE-Keywords[it]=Markdown
 X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[pt]=Markdown

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

@@ -158,6 +158,7 @@ NoDisplay=true
 X-KDE-Keywords=Markdown
 X-KDE-Keywords[ca]=Markdown
 X-KDE-Keywords[ca@valencia]=Markdown
+X-KDE-Keywords[es]=Markdown
 X-KDE-Keywords[it]=Markdown
 X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[pt]=Markdown