Commit 2e0b9b40 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 a78e0f5b
Pipeline #101445 skipped
......@@ -2,6 +2,7 @@
Name=Kdenlive Effect Templates
Name[ca]=Plantilles d'efectes del Kdenlive
Name[ca@valencia]=Plantilles d'efectes del Kdenlive
Name[eu]=Kdenlive efektuen txantiloiak
Name[fr]=Modèles d'effets pour Kdenlive
Name[ko]=Kdenlive 효과 템플릿
Name[nl]=Effectsjablonen van 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