Commit e1b5ad68 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 f62bfa10
......@@ -126,6 +126,7 @@ Comment[ca@valencia]=Joc de conquesta del territori
Comment[cs]=Hra na zabírání území
Comment[da]=Spil om at indtage områder
Comment[de]=Eroberungsspiel
Comment[el]=Παιχνίδι κατάληψης περιοχών
Comment[en_GB]=Territory Capture Game
Comment[es]=Juego de conquista de territorios
Comment[et]=Mänguala vallutamise mäng
......
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