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

@@ -25,9 +25,11 @@
             "text/x-markdown"
         ],
         "Name": "Markdown Backend",
+        "Name[ca@valencia]": "Dorsal de Markdown",
         "Name[ca]": "Dorsal de Markdown",
-        "Name[nl]": "Notatie-backend",
+        "Name[nl]": "Markdown-backend",
         "Name[pt]": "Infra-Estrutura de Markdown",
+        "Name[sk]": "Markdown backend",
         "Name[sr@ijekavian]": "Позадина за маркдаун",
         "Name[sr@ijekavianlatin]": "Pozadina za Markdown",
         "Name[sr@latin]": "Pozadina za Markdown",

generators/markdown/okularApplication_md.desktop

@@ -168,8 +168,10 @@ Categories=Qt;KDE;Graphics;Viewer;
 NoDisplay=true
 X-KDE-Keywords=Markdown
 X-KDE-Keywords[ca]=Markdown
-X-KDE-Keywords[nl]=Noteren
+X-KDE-Keywords[ca@valencia]=Markdown
+X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[pt]=Markdown
+X-KDE-Keywords[sk]=Zrážka
 X-KDE-Keywords[sr]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown
@@ -177,3 +179,4 @@ X-KDE-Keywords[sr@latin]=Markdown,Markdown
 X-KDE-Keywords[sv]=Markdown
 X-KDE-Keywords[uk]=Markdown
 X-KDE-Keywords[x-test]=xxMarkdownxx
+X-KDE-Keywords[zh_CN]=Markdown

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

@@ -157,8 +157,10 @@ InitialPreference=2
 NoDisplay=true
 X-KDE-Keywords=Markdown
 X-KDE-Keywords[ca]=Markdown
-X-KDE-Keywords[nl]=Noteren
+X-KDE-Keywords[ca@valencia]=Markdown
+X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[pt]=Markdown
+X-KDE-Keywords[sk]=Zrážka
 X-KDE-Keywords[sr]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown
@@ -166,3 +168,4 @@ X-KDE-Keywords[sr@latin]=Markdown,Markdown
 X-KDE-Keywords[sv]=Markdown
 X-KDE-Keywords[uk]=Markdown
 X-KDE-Keywords[x-test]=xxMarkdownxx
+X-KDE-Keywords[zh_CN]=Markdown