Commit c885b70b 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 549c8647
......@@ -43,7 +43,7 @@ Name[tr]=Neon
Name[ug]=نېئون
Name[uk]=Неон
Name[x-test]=xxNeonxx
Name[zh_CN]=霓虹灯
Name[zh_CN]=Neon
Name[zh_TW]=Neon
Description=A retro theme with a distinctive touch of early 50s.
Description[bs]=Retro tema sa osjećajem ranih pedesetih.
......
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