Commit 9cf7a59f 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 c5aa11c3
{
"KPlugin": {
"Name": "SSH Manager"
"Name": "SSH Manager",
"Name[ca]": "Gestor de SSH",
"Name[es]": "Gestor de SSH",
"Name[pt]": "Gestor de SSH",
"Name[uk]": "Керування SSH",
"Name[x-test]": "xxSSH Managerxx"
}
}
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