From cfaf383f8906f561af0dd04ccd7af197ace70f4d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Sep 2020 05:47:09 +0200 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" --- src/desktoptheme/breeze-light/metadata.desktop.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index 530737576..41b8303af 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -19,7 +19,7 @@ Name[hu]=Breeze Light Name[ia]=Brisa legier Name[id]=Breeze Terang Name[it]=Brezza chiaro -Name[ko]=Breeze Light +Name[ko]=밝은 Breeze Name[lt]=Breeze šviesus Name[lv]=Gaišā brīze Name[nl]=Breeze Light @@ -60,7 +60,7 @@ Comment[hu]=Breeze Light a KDE VDG-től Comment[ia]=Brisa legier per le KDE VDG Comment[id]=Breeze Terang oleh KDE VDG Comment[it]=Brezza chiaro del KDE VDG -Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light +Comment[ko]=KDE 시각 디자인 그룹에서 제작한 밝은 Breeze Comment[lt]=Breeze šviesus pagal KDE VDG Comment[nl]=Breeze Light door de KDE VDG Comment[nn]=Breeze lys frå KDE VDG