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

@@ -3,10 +3,21 @@
         "Authors": [
             {
                 "Email": "wolff@julianwolff.de",
-                "Name": "Julian Wolff"
+                "Name": "Julian Wolff",
+                "Name[sr@ijekavian]": "Јулијан Волф",
+                "Name[sr@ijekavianlatin]": "Julijan Volf",
+                "Name[sr@latin]": "Julijan Volf",
+                "Name[sr]": "Јулијан Волф",
+                "Name[x-test]": "xxJulian Wolffxx"
             }
         ],
         "Copyright": "© 2017 Julian Wolff",
+        "Copyright[sr@ijekavian]": "© 2017, Јулијан Волф",
+        "Copyright[sr@ijekavianlatin]": "© 2017, Julijan Volf",
+        "Copyright[sr@latin]": "© 2017, Julijan Volf",
+        "Copyright[sr]": "© 2017, Јулијан Волф",
+        "Copyright[uk]": "© Julian Wolff, 2017",
+        "Copyright[x-test]": "xx© 2017 Julian Wolffxx",
         "Id": "okular_markdown",
         "License": "GPL",
         "MimeTypes": [
@@ -14,6 +25,16 @@
             "text/x-markdown"
         ],
         "Name": "Markdown Backend",
+        "Name[ca]": "Dorsal de Markdown",
+        "Name[nl]": "Notatie-backend",
+        "Name[pt]": "Infra-Estrutura de Markdown",
+        "Name[sr@ijekavian]": "Позадина за маркдаун",
+        "Name[sr@ijekavianlatin]": "Pozadina za Markdown",
+        "Name[sr@latin]": "Pozadina za Markdown",
+        "Name[sr]": "Позадина за маркдаун",
+        "Name[sv]": "Markdown-gränssnitt",
+        "Name[uk]": "Модуль Markdown",
+        "Name[x-test]": "xxMarkdown Backendxx",
         "ServiceTypes": [
             "okular/Generator"
         ],

generators/markdown/okularApplication_md.desktop

@@ -167,3 +167,13 @@ InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;
 NoDisplay=true
 X-KDE-Keywords=Markdown
+X-KDE-Keywords[ca]=Markdown
+X-KDE-Keywords[nl]=Noteren
+X-KDE-Keywords[pt]=Markdown
+X-KDE-Keywords[sr]=Markdown,маркдаун
+X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
+X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown
+X-KDE-Keywords[sr@latin]=Markdown,Markdown
+X-KDE-Keywords[sv]=Markdown
+X-KDE-Keywords[uk]=Markdown
+X-KDE-Keywords[x-test]=xxMarkdownxx

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

@@ -156,3 +156,13 @@ Categories=Qt;KDE;Graphics;Office;Viewer;
 InitialPreference=2
 NoDisplay=true
 X-KDE-Keywords=Markdown
+X-KDE-Keywords[ca]=Markdown
+X-KDE-Keywords[nl]=Noteren
+X-KDE-Keywords[pt]=Markdown
+X-KDE-Keywords[sr]=Markdown,маркдаун
+X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
+X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown
+X-KDE-Keywords[sr@latin]=Markdown,Markdown
+X-KDE-Keywords[sv]=Markdown
+X-KDE-Keywords[uk]=Markdown
+X-KDE-Keywords[x-test]=xxMarkdownxx