Commit 9d406705 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 193ecf76
......@@ -29,6 +29,7 @@
"Name[ca]": "Dorsal de Markdown",
"Name[cs]": "Podpůrná vrstva Markdown",
"Name[es]": "Motor para Markdown",
"Name[fr]": "Moteur de markdown",
"Name[it]": "Backend Markdown",
"Name[nl]": "Markdown-backend",
"Name[nn]": "Markdown-motor",
......
......@@ -171,6 +171,7 @@ X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown
......
......@@ -160,6 +160,7 @@ X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=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