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"
8 years ago · daaa084476
parent 553d69dcef
commit daaa084476
3 changed files with 3 additions and 0 deletions
--- a/generators/markdown/libokularGenerator_md.json
+++ b/generators/markdown/libokularGenerator_md.json
@ -43,6 +43,7 @@
        "Name[pt]": "Infra-Estrutura de Markdown",
        "Name[ru]": "Модуль поддержки формата Markdown",
        "Name[sk]": "Markdown backend",
+        "Name[sl]": "Zaledje za Markdown",
        "Name[sr@ijekavian]": "Позадина за маркдаун",
        "Name[sr@ijekavianlatin]": "Pozadina za Markdown",
        "Name[sr@latin]": "Pozadina za Markdown",
--- a/generators/markdown/okularApplication_md.desktop
+++ b/generators/markdown/okularApplication_md.desktop
@ -188,6 +188,7 @@ X-KDE-Keywords[pt]=Markdown
 X-KDE-Keywords[pt_BR]=Markdown
 X-KDE-Keywords[ru]=Markdown
 X-KDE-Keywords[sk]=Zrážka
+X-KDE-Keywords[sl]=Markdown
 X-KDE-Keywords[sr]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown
--- a/generators/markdown/org.kde.mobile.okular_md.desktop
+++ b/generators/markdown/org.kde.mobile.okular_md.desktop
@ -177,6 +177,7 @@ X-KDE-Keywords[pt]=Markdown
 X-KDE-Keywords[pt_BR]=Markdown
 X-KDE-Keywords[ru]=Markdown
 X-KDE-Keywords[sk]=Zrážka
+X-KDE-Keywords[sl]=Markdown
 X-KDE-Keywords[sr]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
 X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown