Commit dbb801f2 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 910c06e4
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"Name": "Markdown Backend", "Name": "Markdown Backend",
"Name[ca@valencia]": "Dorsal de Markdown", "Name[ca@valencia]": "Dorsal de Markdown",
"Name[ca]": "Dorsal de Markdown", "Name[ca]": "Dorsal de Markdown",
"Name[cs]": "Podpůrná vrstva Markdown",
"Name[es]": "Motor para Markdown", "Name[es]": "Motor para Markdown",
"Name[it]": "Backend Markdown", "Name[it]": "Backend Markdown",
"Name[nl]": "Markdown-backend", "Name[nl]": "Markdown-backend",
......
...@@ -169,6 +169,7 @@ NoDisplay=true ...@@ -169,6 +169,7 @@ NoDisplay=true
X-KDE-Keywords=Markdown X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[it]=Markdown X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown X-KDE-Keywords[nl]=Markdown
......
...@@ -158,6 +158,7 @@ NoDisplay=true ...@@ -158,6 +158,7 @@ NoDisplay=true
X-KDE-Keywords=Markdown X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[it]=Markdown X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown X-KDE-Keywords[nl]=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