Commit 62d0fa41 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 cdf55f76
......@@ -13,7 +13,7 @@ Name[eu]=Kdenlive trantsizio gortinak
Name[fi]=Kdenliven siirtymäpyyhkäisyt
Name[fr]=Transitions par balayage de Kdenlive
Name[gl]=Borrados de transición de Kdenlive
Name[it]=Wipe di transizione di Kdenlive
Name[it]=Tendine di transizione di Kdenlive
Name[ko]=Kdenlive 트랜지션 전환
Name[nl]=Overgangsvegen van Kdenlive
Name[nn]=Overgangseffektar for Kdenlive
......
......@@ -18,7 +18,7 @@ Name[fr]=Liste de lecture « MLT »
Name[ga]=Seinmliosta MLT
Name[gl]=Lista de reprodución MLT
Name[hu]=MLT lejátszólista
Name[it]=Scaletta MLT
Name[it]=Lista di riproduzione MLT
Name[ja]=MLT プレイリスト
Name[km]=បញ្ជី​ចាក់ MLT
Name[ko]=MLT 재생 목록
......
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