Commit 4be86a4b 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 e56e08a7
......@@ -31,6 +31,8 @@
"Name[es]": "Motor para Markdown",
"Name[it]": "Backend Markdown",
"Name[nl]": "Markdown-backend",
"Name[nn]": "Markdown-motor",
"Name[pl]": "Silnik Markdown",
"Name[pt]": "Infra-Estrutura de Markdown",
"Name[sk]": "Markdown backend",
"Name[sr@ijekavian]": "Позадина за маркдаун",
......
......@@ -173,6 +173,8 @@ X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown
X-KDE-Keywords[pl]=Markdown
X-KDE-Keywords[pt]=Markdown
X-KDE-Keywords[sk]=Zrážka
X-KDE-Keywords[sr]=Markdown,маркдаун
......
......@@ -162,6 +162,8 @@ X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown
X-KDE-Keywords[pl]=Markdown
X-KDE-Keywords[pt]=Markdown
X-KDE-Keywords[sk]=Zrážka
X-KDE-Keywords[sr]=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