Commit c60f151d 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 130fd5fe
......@@ -4,6 +4,7 @@
"Name[ca@valencia]": "No deixis rastre",
"Name[ca]": "No deixis rastre",
"Name[es]": "No rastrear",
"Name[it]": "Non tenere traccia",
"Name[nl]": "Niet volgen",
"Name[pl]": "Nie śledź",
"Name[pt]": "Não Seguir",
......
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