Commit 8b48e2d4 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 960ae465
......@@ -11,6 +11,7 @@ Name[cs]=Profily renderování Kdenlive
Name[en_GB]=Kdenlive Render Profiles
Name[es]=Perfiles de procesamiento de Kdenlive
Name[fr]=Profils de rendu Kdenlive
Name[it]=Profilo di resa di Kdenlive
Name[nl]=Renderprofielen van Kdenlive
Name[pl]=Profile renderowania Kdenlive
......@@ -11,6 +11,7 @@ Name[cs]=Šablony titulků Kdenlive
Name[en_GB]=Kdenlive Title Templates
Name[es]=Plantillas de título de Kdenlive
Name[fr]=Modèles de titre Kdenlive
Name[it]=Modelli di titolo di Kdenlive
Name[nl]=Titelsjablonen van Kdenlive
Name[pl]=Szablony tytułów Kdenlive
......@@ -10,6 +10,7 @@ Name[ca@valencia]=Cortinetes de transició del Kdenlive
Name[cs]=Přechod stírání Kdenlive
Name[en_GB]=Kdenlive Transition Wipes
Name[es]=Barridos de transición de Kdenlive
Name[fr]=Transitions par balayage de Kdenlive
Name[it]=Wipe di transizione di Kdenlive
Name[nl]=Overgangsvegen van Kdenlive
Name[pl]=Przejścia Kdenlive
......@@ -86,6 +86,7 @@ Comment[cs]=Nelineární editor videa od KDE
Comment[de]=Nichtlinearer Video-Editor von KDE
Comment[en_GB]=Non-linear video editor by KDE
Comment[es]=Editor no lineal de video de KDE
Comment[fr]=Éditeur vidéo non linéaire par KDE
Comment[it]=Editor di video non lineare di KDE
Comment[nl]=Niet-lineaire video-bewerker door KDE
Comment[pl]=Nieliniowy edytor wideo w ramach KDE
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment