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"
9 years ago · 75604b10ea
parent 1883a06614
commit 75604b10ea
3 changed files with 3 additions and 0 deletions
--- a/generators/markdown/libokularGenerator_md.json
+++ b/generators/markdown/libokularGenerator_md.json
@ -44,6 +44,7 @@
        "Name[sr@latin]": "Pozadina za Markdown",
        "Name[sr]": "Позадина за маркдаун",
        "Name[sv]": "Markdown-gränssnitt",
+        "Name[tr]": "Markdown Arka Ucu",
        "Name[uk]": "Модуль Markdown",
        "Name[x-test]": "xxMarkdown Backendxx",
        "Name[zh_CN]": "Markdown 后端",
--- a/generators/markdown/okularApplication_md.desktop
+++ b/generators/markdown/okularApplication_md.desktop
@ -186,6 +186,7 @@ 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[tr]=Markdown
 X-KDE-Keywords[uk]=Markdown
 X-KDE-Keywords[x-test]=xxMarkdownxx
 X-KDE-Keywords[zh_CN]=Markdown
--- a/generators/markdown/org.kde.mobile.okular_md.desktop
+++ b/generators/markdown/org.kde.mobile.okular_md.desktop
@ -175,6 +175,7 @@ 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[tr]=Markdown
 X-KDE-Keywords[uk]=Markdown
 X-KDE-Keywords[x-test]=xxMarkdownxx
 X-KDE-Keywords[zh_CN]=Markdown