Commit ec1fded9 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 c307fddd
......@@ -14,7 +14,7 @@ Name[da]=XML-fuldførelse
Name[de]=XML-Vervollständigung
Name[el]=Συμπλήρωση XML
Name[en_GB]=XML Completion
Name[es]=Terminación XML
Name[es]=Completación XML
Name[et]=XML-i lõpetus
Name[eu]=XMLren osaketa
Name[fa]=اعتبارسنجی Kate XML
......
Supports Markdown
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