Commit 754c95a6 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 6da30011
......@@ -36,7 +36,7 @@ Name[hr]=(6) Igre
Name[hsb]=(6) Hry
Name[hu]=(6) Játékok
Name[ia]=(6) Jocos
Name[id]=(6) Permainan
Name[id]=(6) Game
Name[is]=(6) Leikir
Name[it]=(6) Giochi
Name[ja]=(6) ゲーム
......
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