Commit d201971f 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 d91b8063
...@@ -4,6 +4,7 @@ Name[ca]=Esquemes de teclat del Kdenlive ...@@ -4,6 +4,7 @@ Name[ca]=Esquemes de teclat del Kdenlive
Name[ca@valencia]=Esquemes de teclat del Kdenlive Name[ca@valencia]=Esquemes de teclat del Kdenlive
Name[en_GB]=Kdenlive Keyboard Schemes Name[en_GB]=Kdenlive Keyboard Schemes
Name[es]=Esquemas de teclado de Kdenlive Name[es]=Esquemas de teclado de Kdenlive
Name[fr]=Raccourcis claviers Kdenlive
Name[gl]=Esquemas de teclado de Kdenlive Name[gl]=Esquemas de teclado de Kdenlive
Name[nl]=Toetsenbordschema's van Kdenlive Name[nl]=Toetsenbordschema's van 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