Commit 5c11744f 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 db5793b7
...@@ -485,6 +485,7 @@ Name[tr]=Berabere ...@@ -485,6 +485,7 @@ Name[tr]=Berabere
Name[ug]=سىز Name[ug]=سىز
Name[uk]=Нічия Name[uk]=Нічия
Name[x-test]=xxDrawxx Name[x-test]=xxDrawxx
Name[zh_TW]=發牌 Name[zh_TW]=發牌
Comment=Draw Comment=Draw
Comment[ast]=Dibuxar Comment[ast]=Dibuxar
...@@ -547,6 +548,7 @@ Comment[tr]=Beraberlik ...@@ -547,6 +548,7 @@ Comment[tr]=Beraberlik
Comment[ug]=سىز Comment[ug]=سىز
Comment[uk]=Нічия Comment[uk]=Нічия
Comment[x-test]=xxDrawxx Comment[x-test]=xxDrawxx
Comment[zh_TW]=發牌 Comment[zh_TW]=發牌
Action=None Action=None
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