Commit 5649bec8 authored by Script Kiddy's avatar Script Kiddy

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 c595018a
......@@ -24,6 +24,7 @@ Name[tr]=Kdenlive İşleme Profilleri
Name[uk]=Профілі обробки Kdenlive
Name[x-test]=xxKdenlive Render Profilesxx
Name[zh_CN]=Kdenlive 渲染配置文件
Name[zh_TW]=Kdenlive 繪製設定檔
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive Export Profiles
TargetDir=kdenlive/export
......
......@@ -24,6 +24,7 @@ Name[tr]=Kdenlive Başlık Şablonları
Name[uk]=Шаблони титрів Kdenlive
Name[x-test]=xxKdenlive Title Templatesxx
Name[zh_CN]=Kdenlive 标题模板
Name[zh_TW]=Kdenlive 標題範本
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive Title Templates
TargetDir=kdenlive/titles
......
......@@ -23,6 +23,7 @@ Name[tr]=Kdenlive Geçiş Ekranları
Name[uk]=Перехідні витирання Kdenlive
Name[x-test]=xxKdenlive Transition Wipesxx
Name[zh_CN]=Kdenlive 过渡擦除
Name[zh_TW]=Kdenlive 過渡 Wipes
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Kdenlive FX
TargetDir=kdenlive/lumas/HD
......
......@@ -109,6 +109,7 @@ Comment[tr]=KDE için doğrusal olmayan video düzenleyici
Comment[uk]=Нелінійний редактор відео від KDE
Comment[x-test]=xxNonlinear video editor by KDExx
Comment[zh_CN]=KDE 推出的非线性视频编辑器
Comment[zh_TW]=來自 KDE 的非線性影像編輯器
Type=Application
Exec=kdenlive %U
Icon=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