Commit f5a44987 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 943a575a
Pipeline #167196 skipped
......@@ -14,7 +14,7 @@ Name[bn_IN]=খেলনা
Name[br]=C'hoarielloù
Name[bs]=Igračke
Name[ca]=Joguines
Name[ca@valencia]=Joguines
Name[ca@valencia]=Joguets
Name[cs]=Hračky
Name[csb]=Zabôwczi
Name[cy]=Tegannau
......
Supports Markdown
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