From 62d0fa414fe026b3227478bf384fcc1263812344 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Dec 2018 05:44:15 +0100 Subject: [PATCH] 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" --- data/kdenlive_wipes.knsrc | 2 +- thumbnailer/mltpreview.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/kdenlive_wipes.knsrc b/data/kdenlive_wipes.knsrc index 03e43bd42..953dbc7f4 100644 --- a/data/kdenlive_wipes.knsrc +++ b/data/kdenlive_wipes.knsrc @@ -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 diff --git a/thumbnailer/mltpreview.desktop b/thumbnailer/mltpreview.desktop index 7c2cc2309..ee12ff206 100644 --- a/thumbnailer/mltpreview.desktop +++ b/thumbnailer/mltpreview.desktop @@ -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 재생 목록 -- GitLab