Commit 8f4d6136 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 01551e57
{
"KPlugin": {
"Name": "SSH Manager",
"Name[az]": "SSH meneceri",
"Name[ca]": "Gestor de SSH",
"Name[es]": "Gestor de SSH",
"Name[fr]": "Gestionnaire « SSH »",
"Name[nl]": "SSH-beheerder",
"Name[pl]": "Zarządzanie SSH",
"Name[pt]": "Gestor de SSH",
"Name[sl]": "Upravljalnik SSH",
"Name[sv]": "SSH-hanterare",
"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