Commit 39137f43 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 2af59235
Pipeline #4852 passed with stage
in 14 minutes and 1 second
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Esquemes de teclat del Kdenlive
Name[de]=Kdenlive-Tastaturschemata
Name[en_GB]=Kdenlive Keyboard Schemes
Name[es]=Esquemas de teclado de Kdenlive
Name[eu]=Kdenliveren teklatu antolaerak
Name[fi]=Kdenliven näppäimistöteemat
Name[fr]=Raccourcis claviers Kdenlive
Name[gl]=Esquemas de teclado de 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