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 · b3e941e736
parent ca12fe50d5
commit b3e941e736
3 changed files with 3 additions and 0 deletions
--- a/generators/markdown/libokularGenerator_md.json
+++ b/generators/markdown/libokularGenerator_md.json
@ -46,6 +46,7 @@
        "Name[uk]": "Модуль Markdown",
        "Name[x-test]": "xxMarkdown Backendxx",
        "Name[zh_CN]": "Markdown 后端",
+        "Name[zh_TW]": "Markdown 後端介面",
        "ServiceTypes": [
            "okular/Generator"
        ],
--- a/generators/markdown/okularApplication_md.desktop
+++ b/generators/markdown/okularApplication_md.desktop
@ -188,3 +188,4 @@ X-KDE-Keywords[sv]=Markdown
 X-KDE-Keywords[uk]=Markdown
 X-KDE-Keywords[x-test]=xxMarkdownxx
 X-KDE-Keywords[zh_CN]=Markdown
+X-KDE-Keywords[zh_TW]=Markdown
--- a/generators/markdown/org.kde.mobile.okular_md.desktop
+++ b/generators/markdown/org.kde.mobile.okular_md.desktop
@ -177,3 +177,4 @@ X-KDE-Keywords[sv]=Markdown
 X-KDE-Keywords[uk]=Markdown
 X-KDE-Keywords[x-test]=xxMarkdownxx
 X-KDE-Keywords[zh_CN]=Markdown
+X-KDE-Keywords[zh_TW]=Markdown