Commit be19b0ee 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 fae0d949
......@@ -53,7 +53,7 @@ GenericName[tr]=MUD istemcisi
GenericName[uk]=Клієнт MUD
GenericName[x-test]=xxMUD clientxx
GenericName[zh_CN]=MUD 客户端
GenericName[zh_TW]=MUD 戶端
GenericName[zh_TW]=MUD 戶端
Comment=MUD client
Comment[bs]=MUD klijent
Comment[ca]=Client de MUD
......@@ -77,5 +77,5 @@ Comment[tr]=MUD istemcisi
Comment[uk]=Клієнт MUD
Comment[x-test]=xxMUD clientxx
Comment[zh_CN]=MUD 客户端
Comment[zh_TW]=MUD 戶端
Comment[zh_TW]=MUD 戶端
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