Commit 766ae443 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 2cbdb954
Pipeline #200933 skipped
......@@ -6,6 +6,7 @@ Name=Shisen-Sho
Name[af]=Shisen-sho
Name[ar]=شي سن
Name[be]=Ші-сен-сёе
Name[bg]=Shisen-Sho
Name[bn]=শিসেন-শো
Name[br]=Shisen-Sho
Name[bs]=Shisen-Sho
......@@ -73,6 +74,7 @@ Name[zh_TW]=Shisen-Sho
GenericName=Shisen-Sho Mahjongg-like Tile Game
GenericName[ar]=شي سن لعبة قراميد مشابهة لما جونغ
GenericName[be]=Варыянт маджонга Шысен-сё
GenericName[bg]=Shisen-Sho е игра с плочки подобна на Mahjongg
GenericName[bn]=শিসেন-শো মাহজং-জাতীয় টালির খেলা
GenericName[br]=Ur c'hoari teol a seurt gant Shisen*Sho Mahjongg
GenericName[bs]=Shisen-Sho Mahjongg igra pločica
......
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