Commit 323903cc 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 ccf1c9cd
......@@ -12,6 +12,7 @@ Name[en_GB]=Kdenlive Render Profiles
Name[es]=Perfiles de procesamiento de Kdenlive
Name[it]=Profilo di resa di Kdenlive
Name[nl]=Renderprofielen van Kdenlive
Name[pl]=Profile renderowania Kdenlive
Name[pt]=Perfis de Visualização do Kdenlive
Name[sv]=Kdenlive-återgivningsprofiler
Name[uk]=Профілі обробки Kdenlive
......
......@@ -12,6 +12,7 @@ Name[en_GB]=Kdenlive Title Templates
Name[es]=Plantillas de título de Kdenlive
Name[it]=Modelli di titolo di Kdenlive
Name[nl]=Titelsjablonen van Kdenlive
Name[pl]=Szablony tytułów Kdenlive
Name[pt]=Perfis de Títulos do Kdenlive
Name[sv]=Kdenlive-titelmallar
Name[uk]=Шаблони титрів Kdenlive
......
......@@ -11,6 +11,7 @@ Name[en_GB]=Kdenlive Transition Wipes
Name[es]=Barridos de transición de Kdenlive
Name[it]=Wipe di transizione di Kdenlive
Name[nl]=Overgangsvegen van Kdenlive
Name[pl]=Przejścia Kdenlive
Name[pt]=Varrimentos de Transição do Kdenlive
Name[sv]=Kdenlive-övergångar
Name[uk]=Перехідні витирання 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