Commit 75604b10 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 1883a066
......@@ -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 后端",
......
......@@ -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
......
......@@ -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
......
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