Commit 928f46ab 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 503e9abe
......@@ -95,7 +95,7 @@ GenericName[he]=Shisen Sho, חיקוי מה ג'ונג, משחק קלפים
GenericName[hne]=साइसेन-सो महजोंग जइसन टाइल वाले खेल
GenericName[hr]=Shisen-Sho igra s pločicama poput Mahjongga
GenericName[hu]=Shisen-Sho Mahjongg-szerű kockajáték
GenericName[id]=Shisen-Sho Game Ubin Seperti Halnya Mahjongg
GenericName[id]=Shisen-Sho Permainan Ubin Seperti Halnya Mahjongg
GenericName[is]=Shisen-Sho kubbaleikur líkur Mahjongg
GenericName[it]=Shisen-Sho, gioco di tessere simile a Mahjongg
GenericName[ja]=四川省マージャン牌ゲーム
......
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