Commit 7acf7648 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 81c2194a
{
"KPlugin": {
"Description": "TODO",
"Description[ca@valencia]": "PENDENT",
"Description[ca]": "PENDENT",
"Description[ca@valencia]": "Per fer",
"Description[ca]": "Per fer",
"Description[cs]": "Úkoly",
"Description[da]": "TODO",
"Description[de]": " ",
......
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