Commit 6c010ac6 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 c80cacb1
......@@ -120,6 +120,7 @@ Comment[pl]=Gra logiczna
Comment[pt]=Jogo de lógica
Comment[pt_BR]=Jogo de lógica
Comment[ru]=Логическая игра
Comment[sk]=Logická hra
Comment[sl]=Logična igra
Comment[sr]=Логичка игра
Comment[sr@ijekavian]=Логичка игра
......
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