Commit 4f11d8f3 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 186b18e1
{
"KPlugin": {
"Name": "Send vCards",
"Name[ca@valencia]": "Envia vCard",
"Name[ca@valencia]": "Envia unes quantes vCard",
"Name[ca]": "Envia unes quantes vCard",
"Name[de]": "vCards versenden",
"Name[es]": "Enviar vCards",
......
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