Commit f25948d7 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 684bc806
...@@ -73,7 +73,7 @@ Name[th]=เกมแนวตรรกะ ...@@ -73,7 +73,7 @@ Name[th]=เกมแนวตรรกะ
Name[tr]=Mantık Oyunları Name[tr]=Mantık Oyunları
Name[ug]=لوگىكىلىق ئويۇن Name[ug]=لوگىكىلىق ئويۇن
Name[uk]=Логічні ігри Name[uk]=Логічні ігри
Name[vi]=Trò chơi lô-gíc Name[vi]=Trò chơi luận lí
Name[wa]=Djeus d' lodjike Name[wa]=Djeus d' lodjike
Name[x-test]=xxLogic Gamesxx Name[x-test]=xxLogic Gamesxx
Name[zh_CN]=逻辑游戏 Name[zh_CN]=逻辑游戏
......
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