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

@@ -28,6 +28,7 @@
         "Name[ca@valencia]": "Dorsal de Markdown",
         "Name[ca]": "Dorsal de Markdown",
         "Name[cs]": "Podpůrná vrstva Markdown",
+        "Name[de]": "Anzeigemodul für Markdown",
         "Name[el]": "Σύστημα υποστήριξης markdown",
         "Name[es]": "Motor para Markdown",
         "Name[fr]": "Moteur de markdown",