Commit efac0d32 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 4eb2e058
...@@ -9,6 +9,7 @@ Name[fi]=Kdenliven näppäimistöteemat ...@@ -9,6 +9,7 @@ Name[fi]=Kdenliven näppäimistöteemat
Name[fr]=Raccourcis claviers Kdenlive Name[fr]=Raccourcis claviers Kdenlive
Name[gl]=Esquemas de teclado de Kdenlive Name[gl]=Esquemas de teclado de Kdenlive
Name[it]=Schemi da tastiera di Kdenlive Name[it]=Schemi da tastiera di Kdenlive
Name[ko]=Kdenlive 키보드 단축키 배열
Name[nl]=Toetsenbordschema's van Kdenlive Name[nl]=Toetsenbordschema's van Kdenlive
Name[pt]=Esquemas de Teclado do Kdenlive Name[pt]=Esquemas de Teclado do Kdenlive
Name[pt_BR]=Esquemas de teclado do Kdenlive Name[pt_BR]=Esquemas de teclado do Kdenlive
......
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