Commit 1f1938a2 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 c147774f
Pipeline #4750 passed with stage
in 14 minutes and 50 seconds
......@@ -12,6 +12,7 @@ Name[id]=Skema Keyboard Kdenlive
Name[it]=Schemi da tastiera di Kdenlive
Name[ko]=Kdenlive 키보드 단축키 배열
Name[nl]=Toetsenbordschema's van Kdenlive
Name[nn]=Tasteoppsett for Kdenline
Name[pl]=Układy klawiatur Kdenlive
Name[pt]=Esquemas de Teclado do Kdenlive
Name[pt_BR]=Esquemas de teclado do Kdenlive
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