Commit 1d36cd15 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 48905cf1
......@@ -161,6 +161,7 @@ X-KDE-Keywords[da]=djvu
X-KDE-Keywords[de]=djvu
X-KDE-Keywords[el]=djvu
X-KDE-Keywords[en_GB]=djvu
X-KDE-Keywords[eo]=djvu
X-KDE-Keywords[es]=djvu
X-KDE-Keywords[et]=djvu
X-KDE-Keywords[fi]=djvu
......
......@@ -141,6 +141,7 @@ X-KDE-Keywords[da]=djvu
X-KDE-Keywords[de]=djvu
X-KDE-Keywords[el]=djvu
X-KDE-Keywords[en_GB]=djvu
X-KDE-Keywords[eo]=djvu
X-KDE-Keywords[es]=djvu
X-KDE-Keywords[et]=djvu
X-KDE-Keywords[fi]=djvu
......
......@@ -161,6 +161,7 @@ X-KDE-Keywords[da]=dvi
X-KDE-Keywords[de]=dvi
X-KDE-Keywords[el]=dvi
X-KDE-Keywords[en_GB]=dvi
X-KDE-Keywords[eo]=dvi
X-KDE-Keywords[es]=dvi
X-KDE-Keywords[et]=dvi
X-KDE-Keywords[fi]=dvi
......
......@@ -141,6 +141,7 @@ X-KDE-Keywords[da]=dvi
X-KDE-Keywords[de]=dvi
X-KDE-Keywords[el]=dvi
X-KDE-Keywords[en_GB]=dvi
X-KDE-Keywords[eo]=dvi
X-KDE-Keywords[es]=dvi
X-KDE-Keywords[et]=dvi
X-KDE-Keywords[fi]=dvi
......
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