Commit 8cbbf8e5 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 7ac30dd8
......@@ -4,8 +4,13 @@
"Name[ca]": "No deixis rastre",
"Name[es]": "No rastrear",
"Name[nl]": "Niet volgen",
"Name[pl]": "Nie śledź",
"Name[pt]": "Não Seguir",
"Name[pt_BR]": "Não rastrear",
"Name[sr@ijekavian]": "Не прати ме",
"Name[sr@ijekavianlatin]": "Ne prati me",
"Name[sr@latin]": "Ne prati me",
"Name[sr]": "Не прати ме",
"Name[uk]": "Вимикання стеження",
"Name[x-test]": "xxDo Not Trackxx",
"ServiceTypes": [
......
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