From c98d2ccdac75ea69599150fed275880783189fca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Feb 2019 08:28:05 +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" --- lookandfeel/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 4077aeee2..1685bda31 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -17,7 +17,7 @@ Comment[gl]=Linguaxe de deseño do escritorio para Breeze de KDE VDG Comment[hu]=Breeze asztali designnyelv a KDE VDG-től Comment[id]=Bahasa Desain Desktop Breeze oleh KDE VDG Comment[is]=Breeze skjáborðshönnunarmálið frá KDE VDG -Comment[it]=Linguaggio di progettazione del desktop Brezza del KDE VDG +Comment[it]=Linguaggio di progettazione del desktop Brezza a cura del VDG di KDE Comment[ko]=KDE 시각 디자인 그룹의 Breeze 데스크톱 디자인 언어 Comment[lt]=Breeze darbalaukio dizaino kalba, kurią sukūrė KDE VDG Comment[nb]=Breeze-språk for skrivebordsutforming fra KDE-gruppa for visuell design