Commit 6d60d6ac 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 739c4879
......@@ -66,7 +66,6 @@ Name[uk]=Шісен-шо
Name[vi]=Shisen-Sho
Name[wa]=Shisen-Sho
Name[xh]=Shisen-Sho
Name[x-test]=xxShisen-Shoxx
Name[zh_CN]=连连看
Name[zh_TW]=Shisen-Sho
GenericName=Shisen-Sho Mahjongg-like Tile Game
......@@ -128,7 +127,6 @@ GenericName[tr]=Shisen-Sho Mahjongg Benzeri Döşeme Oyunu
GenericName[ug]=Shisen-Sho Mahjongg غا ئوخشاپ قالىدىغان كاھىش ئويۇنى
GenericName[uk]=Шісен-шо, схожа на маджонґ гра з плитками
GenericName[wa]=Djeu d' pîce do djinre di Mahjongg
GenericName[x-test]=xxShisen-Sho Mahjongg-like Tile Gamexx
GenericName[zh_CN]=类似连连看的麻将游戏
GenericName[zh_TW]=四川省麻將牌遊戲
Icon=kshisen
......
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