Commit ed885e12 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 7361ae79
......@@ -6,7 +6,7 @@ Name[bn]=সেইমগেম
Name[br]=Heñvelded
Name[bs]=SameGame
Name[ca]=SameGame
Name[ca@valencia]=Joc iguals
Name[ca@valencia]=SameGame
Name[cs]=Same
Name[cy]=YrUnGêm
Name[da]=Samspil
......
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