Commit b3e941e7 authored by Script Kiddy's avatar Script Kiddy

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"
parent ca12fe50
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
"Name[uk]": "Модуль Markdown", "Name[uk]": "Модуль Markdown",
"Name[x-test]": "xxMarkdown Backendxx", "Name[x-test]": "xxMarkdown Backendxx",
"Name[zh_CN]": "Markdown 后端", "Name[zh_CN]": "Markdown 后端",
"Name[zh_TW]": "Markdown 後端介面",
"ServiceTypes": [ "ServiceTypes": [
"okular/Generator" "okular/Generator"
], ],
......
...@@ -188,3 +188,4 @@ X-KDE-Keywords[sv]=Markdown ...@@ -188,3 +188,4 @@ X-KDE-Keywords[sv]=Markdown
X-KDE-Keywords[uk]=Markdown X-KDE-Keywords[uk]=Markdown
X-KDE-Keywords[x-test]=xxMarkdownxx X-KDE-Keywords[x-test]=xxMarkdownxx
X-KDE-Keywords[zh_CN]=Markdown X-KDE-Keywords[zh_CN]=Markdown
X-KDE-Keywords[zh_TW]=Markdown
...@@ -177,3 +177,4 @@ X-KDE-Keywords[sv]=Markdown ...@@ -177,3 +177,4 @@ X-KDE-Keywords[sv]=Markdown
X-KDE-Keywords[uk]=Markdown X-KDE-Keywords[uk]=Markdown
X-KDE-Keywords[x-test]=xxMarkdownxx X-KDE-Keywords[x-test]=xxMarkdownxx
X-KDE-Keywords[zh_CN]=Markdown X-KDE-Keywords[zh_CN]=Markdown
X-KDE-Keywords[zh_TW]=Markdown
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment