Commit 1c11cb17 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 b62d9958
{
"KPlugin": {
"Name": "Do Not Track",
"Name[ca]": "No deixis rastre",
"Name[nl]": "Niet volgen",
"Name[pt]": "Não Seguir",
"Name[pt_BR]": "Não rastrear",
"Name[uk]": "Вимикання стеження",
"Name[x-test]": "xxDo Not Trackxx",
"ServiceTypes": [
"MessageViewer/UrlInterceptor"
],
......
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