Commit 62610f61 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 19d707d9
......@@ -4,6 +4,7 @@ Name[ar]=لاحات «كدينلايڤ» للتّصيير
Name[ca]=Perfils de renderització del Kdenlive
Name[ca@valencia]=Perfils de renderització del Kdenlive
Name[cs]=Profily renderování Kdenlive
Name[da]=Kdenlive renderingsprofiler
Name[el]=Προφίλ αποτύπωσης του Kdenlive
Name[en_GB]=Kdenlive Render Profiles
......@@ -4,6 +4,7 @@ Name[ar]=قوالب «كدينلايڤ» للعناوين
Name[ca]=Plantilles de títol del Kdenlive
Name[ca@valencia]=Plantilles de títol del Kdenlive
Name[cs]=Šablony titulků Kdenlive
Name[da]=Kdenlive titelskabeloner
Name[el]=Πρότυπα τίτλων του Kdenlive
Name[en_GB]=Kdenlive Title Templates
......@@ -87,6 +87,7 @@ Comment[ar]=محرّر فيديوهات غير خطّيّ من كدي
Comment[ca]=Editor de vídeo no lineal, creat per la comunitat KDE
Comment[ca@valencia]=Editor de vídeo no lineal, creat per la comunitat KDE
Comment[cs]=Nelineární editor videa od KDE
Comment[da]=Ikke-lineær videoredigering fra KDE
Comment[de]=Nichtlinearer Video-Editor von KDE
Comment[el]=Μη γραμμικός επεξεργαστής βίντεο από το KDE
Comment[en_GB]=Non-linear video editor by KDE
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