Commit 1b3f7ca7 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 7ca50348
......@@ -5,6 +5,13 @@ Uncompress=archive
[KNewStuff3]
Name=Kdenlive Render Profiles
Name[ca]=Perfils de renderització del Kdenlive
Name[ca@valencia]=Perfils de renderització del Kdenlive
Name[nl]=Renderprofielen van Kdenlive
Name[pt]=Perfis de Visualização do Kdenlive
Name[sv]=Kdenlive-återgivningsprofiler
Name[uk]=Профілі обробки Kdenlive
Name[x-test]=xxKdenlive Render Profilesxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive Export Profiles
TargetDir=kdenlive/export
......
......@@ -5,6 +5,13 @@ Uncompress=archive
[KNewStuff3]
Name=Kdenlive Title Templates
Name[ca]=Plantilles de títol del Kdenlive
Name[ca@valencia]=Plantilles de títol del Kdenlive
Name[nl]=Titelsjablonen van Kdenlive
Name[pt]=Perfis de Títulos do Kdenlive
Name[sv]=Kdenlive-titelmallar
Name[uk]=Шаблони титрів Kdenlive
Name[x-test]=xxKdenlive Title Templatesxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive Title Templates
TargetDir=kdenlive/titles
......
......@@ -5,6 +5,13 @@ Uncompress=archive
[KNewStuff3]
Name=Kdenlive Transition Wipes
Name[ca]=Cortinetes de transició del Kdenlive
Name[ca@valencia]=Cortinetes de transició del Kdenlive
Name[nl]=Overgangsvegen van Kdenlive
Name[pt]=Varrimentos de Transição do Kdenlive
Name[sv]=Kdenlive-övergångar
Name[uk]=Перехідні витирання Kdenlive
Name[x-test]=xxKdenlive Transition Wipesxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive FX
TargetDir=kdenlive/lumas
......
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