Commit be5a23dd 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 5d860a11
......@@ -42,7 +42,7 @@ Name[tr]=Düz
Name[ug]=تەكشىلىك
Name[uk]=Проста
Name[x-test]=xxPlainxx
Name[zh_CN]=纯色
Name[zh_CN]=普通
Name[zh_TW]=樸素
Description=Plain Kigo theme based on Default theme by Arturo Silva
Description[bs]=Plain Kigo tema bazirana na Default temi Arturo Silva
......
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