Commit 27e646f1 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 a209b4d3
......@@ -145,6 +145,7 @@ Comment[sr@ijekavian]=Игра одбијајућих лопти
Comment[sr@ijekavianlatin]=Igra odbijajućih lopti
Comment[sr@latin]=Igra odbijajućih lopti
Comment[tr]=Top Zıplatma Oyunu
Comment[uk]=Гра з відбиття м’ячика
Comment[x-test]=xxBall Bouncing Gamexx
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