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

@@ -12,6 +12,7 @@
             }
         ],
         "Copyright": "© 2017 Julian Wolff",
+        "Copyright[ru]": "© Julian Wolff, 2017",
         "Copyright[sr@ijekavian]": "© 2017, Јулијан Волф",
         "Copyright[sr@ijekavianlatin]": "© 2017, Julijan Volf",
         "Copyright[sr@latin]": "© 2017, Julijan Volf",
@@ -38,6 +39,7 @@
         "Name[nn]": "Markdown-motor",
         "Name[pl]": "Silnik Markdown",
         "Name[pt]": "Infra-Estrutura de Markdown",
+        "Name[ru]": "Модуль поддержки формата Markdown",
         "Name[sk]": "Markdown backend",
         "Name[sr@ijekavian]": "Позадина за маркдаун",
         "Name[sr@ijekavianlatin]": "Pozadina za Markdown",

generators/markdown/okularApplication_md.desktop

@@ -180,6 +180,7 @@ X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[nn]=Markdown
 X-KDE-Keywords[pl]=Markdown
 X-KDE-Keywords[pt]=Markdown
+X-KDE-Keywords[ru]=Markdown
 X-KDE-Keywords[sk]=Zrážka
 X-KDE-Keywords[sr]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун

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

@@ -169,6 +169,7 @@ X-KDE-Keywords[nl]=Markdown
 X-KDE-Keywords[nn]=Markdown
 X-KDE-Keywords[pl]=Markdown
 X-KDE-Keywords[pt]=Markdown
+X-KDE-Keywords[ru]=Markdown
 X-KDE-Keywords[sk]=Zrážka
 X-KDE-Keywords[sr]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун