Commit 594daec5 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 826019c7
[Desktop Entry]
Name=KTeaTime
Name[ar]=برنامج وقت الشاي KTeaTime
Name[ast]=KTeaTime
Name[be]=KTeaTime
Name[bg]=KTeaTime
Name[bn]=কে-টী-টাইম
......
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