Commit f749edd8 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 4f774201
......@@ -16,6 +16,7 @@ Name[pt_BR]=Esquemas de teclado do Kdenlive
Name[sv]=Kdenlive-tangentbordsinställningar
Name[uk]=Схеми клавіатурних скорочень Kdenlive
Name[x-test]=xxKdenlive Keyboard Schemesxx
Name[zh_CN]=Kdenlive 键盘配置方案
Name[zh_TW]=Kdenlive 鍵盤機制
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive Keyboard Schemes
......
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